From 27d7a73e539344412ee3d70325a98ef68a5c1b4a Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 27 Nov 2008 02:33:08 +0000
Subject: [PATCH] Internationalize a Thingy template Add a link from the manage
 screen back to the default view.

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../templates_thingy-default.wgpkg               | Bin 0 -> 1220 bytes
 lib/WebGUI/Asset/Wobject/Thingy.pm               |   5 +++--
 lib/WebGUI/Help/Asset_Thingy.pm                  |   1 +
 lib/WebGUI/i18n/English/Asset_Thingy.pm          |  10 ++++++++++
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/packages-7.6.5/templates_thingy-default.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 307791612..068f5013a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed #9157: another typ-o in i18n
  - fixed #9112: Thingy View Thing screen doesn't preserve newlines
  - fixed #9155: purpose of "headblock" duplicates "extra head tags"
+ - fixed: Improve Thingy navigation.
 
 7.6.4
  - Survey now will show progress and time limit.
diff --git a/docs/upgrades/packages-7.6.5/templates_thingy-default.wgpkg b/docs/upgrades/packages-7.6.5/templates_thingy-default.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..108b1312ca0c0e1aadae28b9844f06a0e9d3be43
GIT binary patch
literal 1220
zcmV;#1Uvg5iwFP!00000|Ls<7Pa8Q9&gcG$)qXgEM3c>X3AyO#(Lz)Ts13(emuuwg
z4vCwMz1R*RJ@voecy<$S(!lj3INb+~#DeGT@iU$o7Yk3nf*@$t>xF{-Hfr=O*YNAD
zR!}J8s@8&PrCKX^<#G@-3Lcs~{hDdR6haGS%*EvXcry)3-!Ha@!$pUq?*pp;ClR4W
zx^dC(TK0GGi<aV%fTHh)%{P9x<-d;U-pGHgQmYp{Wb^6QQ{}(-^w1w8!e1}22z_m&
zVk7XqmiNb>d$g4(nSe4JwB02&s~IzG-rOZp8Hf%^BxZ3;CRQ9OU?_RLutt8>UkR|v
z4Egty*)ZmM43QHGm|t-b$vIgCPM{Y;CYpaA2kwkwC%~c}8<Es+YqN;KGm8X%?)wH6
zN}<+$ztdNJ(Ko;FsRixLRJ`-Kw4<anrF5%g#$1dRFAYqS7(wc6qlo6a2fGK>zFi{k
z9fwTL1*l8x3EgP(s2GB_HXXi<;F`^1<D4+9!DJ44grbKSuuPV#>~y)lP|`?yzD<_6
zKH*UWVsn3_<Sgk%Zz66;RIWI8OK>D;NBq_cF|``0n~zc`E9%+?K@Iq|r$K8jMe&xY
zB8#S6oQsUzzG)|&R1bw-D1}in)}3}K$u!!f%uD(|<z(eJ;u@)6^tg$^c^p?(n2ePm
zAQysmI&GaWvC`607RR7a&--bJxAMUI+!Y3tU<P5ccxTE4-g1u;uDzHIA>KQ*IT)lz
z-aWuXqesL&uKW;i(4pdqb?<QJ$&8%B8vNWo21AP<i54<pb4ghB_IOL?ZSoBL5YzUr
zHuJ^`t}(-oMHWTmZGd;S)At>dww7McjFAF8ZLo+&DTNt>eLv4(-?uEX6};_%Z#m5W
zRnQ>|C!UdM;Dwi!l4t$w{UZRI5h`Fjd>8{$t)Vnyn~)s!2sHQKgZDMPK!aGy<@HA6
zeA=@b(pQQl*hOtNTpp+ptZjA?*Zokc^1fD8G8mj69SsH@CFkb?(rt(}*p1#?<`Cz@
zkv|G)E0d590B=zjuS&k2Z2K8lI!WNUJCd425QBkCwqA7!3qc_w%jZTQDzUUma}2CA
zO#svGuukZ`*+}!`dKnjEP~2Rq_^p!D3#LG%4KFuI@Noy(g!8GpZh7-Kk2I}*9Wyc7
zHp{3}p0R1#h_7IHeA#Was0doEUN%OYGdnWh%ZOidoOyOEmMfKJvtBKi8%`<f)xTi^
zNT=yU)aq#SC><ak)$GD)=m}5Gq`?RwwK`JH9iD63H`p*v5tp4MwtO%j`PWQPtL3aL
z3A1##CLkibAI@$HV%D=w`9WL>Q#c_><sOz=t&`sS)9*Rs`c#IKCHZSl46ZX8$Zzf}
z`J|C-f4{lEUvE}&XHsy>?F>6wzDBm?0!J-&o7HV`r`BUR?~1olO;cKO!3ACiEQ>HD
zWHUh^LbXWD#TK82jj|WO<lWV$+VA1~?hFp$^xg5ruzqrr<DBb{3ypJ|&Xzk9W|tmh
z+wx22UDB9;kI_SIors_w1l30H%AFVUhozLk`yxI?H%F7p53lZ;7q=BS{!qT@9s2gM
i`0d5F$9RiA`*>#HnSo~po*DS>82B67y&UfV6aWA}i(K;n

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index e1f2aeafe..2b17c3925 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2805,9 +2805,10 @@ sub www_manage {
     my $var = $self->get;
     my $url = $self->getUrl;
     
-    $var->{canEditThings} = $self->canEdit;
+    $var->{canEditThings}  = $self->canEdit;
     $var->{"addThing_url"} = $session->url->append($url, 'func=editThing;thingId=new');
-    $var->{"manage_url"} = $session->url->append($url, 'func=manage');
+    $var->{"manage_url"}   = $session->url->append($url, 'func=manage');
+    $var->{"view_url"}     = $session->url->page;
 
     #Get things in this Thingy
     $things = $self->getThings;
diff --git a/lib/WebGUI/Help/Asset_Thingy.pm b/lib/WebGUI/Help/Asset_Thingy.pm
index f54af9999..9e00e92fa 100644
--- a/lib/WebGUI/Help/Asset_Thingy.pm
+++ b/lib/WebGUI/Help/Asset_Thingy.pm
@@ -14,6 +14,7 @@ our $HELP = {
             },
         ],
          variables => [
+            { 'name' => 'view_url' },
             {   'name'      => 'things_loop',
                 'variables' => [
                     { 'name' => 'thing_editIcon' },
diff --git a/lib/WebGUI/i18n/English/Asset_Thingy.pm b/lib/WebGUI/i18n/English/Asset_Thingy.pm
index 8c34c7df3..d86bd2808 100644
--- a/lib/WebGUI/i18n/English/Asset_Thingy.pm
+++ b/lib/WebGUI/i18n/English/Asset_Thingy.pm
@@ -1002,6 +1002,16 @@ search has been done.|,
         message => q|Error: You must assign fields to your new Thing.|,
         lastUpdated => 1219424285,
     },
+
+    'back to thingy default view' => {
+        message => q|Back to Thingy default view|,
+        lastUpdated => 1227736916,
+    },
+
+    'view_url' => {
+        message => q|The URL that will take the user back to the Thingy default view.|,
+        lastUpdated => 1227737813,
+    },
 };
 
 1;