From e0f46517bb8bcbdfa7939477927eb36e9cddb57b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 5 Mar 2009 17:59:22 +0000
Subject: [PATCH] Add a cancel button to the edit story form.

---
 .../root_import_storymanager_editstory.wgpkg  | Bin 995 -> 1004 bytes
 lib/WebGUI/Asset/Story.pm                     |  49 ++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager_editstory.wgpkg
index d2fbf2be73f31119b8da6fb7d67ec6c9b48757c0..296848c229de4a9c45ddcd97a1fe676e8948829a 100644
GIT binary patch
literal 1004
zcmV<I0~7ooiwFP!00000|Ls<7Z`(Ey_UHZzL7z4tjU~&LYu7W7v`OPG4P3-&&@Ed)
zON_;uA_bDNs|@|`B~Oy&*iIH;QBe#b5EIe8@VPtkp4)HKzZ}Qub~}xR+5I-`Zd>ox
zYB>$pbvtdx@w>j)uw2(^=}nu|zf!4?(9i--37g-4UMjJW_lr$%dO>ioKcM<Ei2$`*
z{dT<lFOst-g{ZyzMcsGRzvH#Njrx1O*KSxkoAs}{>c3w<^rtxCpBMTO+EQ_WX4tm+
z)}Mdv!KXy<1Pev5G+#l@Xi_BA(bt3vg~J07v6NCUG2%dAq$P)$F|s{-CD5--fqy$m
zr<BMDhn0}w<t1SuUxJlW31r52BFXkS_^T4=1fy_*X4_J}WLRA22RjNkaioI6C&9UD
zlGp^&G|^`<Vmbq&i9@2`LxloKiB;k1$Wym}e7TL{&-{!YWaHMSOV9gQ=@K~>Tyd2p
zd9-W65P3qv5VOr7XM(56C_K^!gQ#73Q#ej&nYh6X!8FuRtUy;m{&r;>tmg*&l|8&-
z1Bz#ug~Nf;M%N1@tQ#)k2~iXe2hBpL)$WK*4zV!SAz7GBCWx)MkZ6GqQ>8c?T9svh
zSb%Bqeb5A(+=V4oMzO{gP>e+1nsODr*6;?+!hg9J|57x?bolp(DJ&RLgfm2c>Gk$5
z@$}ur=-1a8IB0AmQzo!u9ijI9)Bt2U1^0Ugru5g4<A<=6`Zd9sW}2JuW5MLwH9?^~
zfGRx}OsQWJoH@>xT!b=*^H7OO&6<F;-PR-StW4t=iL53J5t&6)|EVG!|9)>Pi<%%o
zCw=T)0p<S=<VSU|JAL$6^GV)En`N8U-L&fDghf~obs^}n;PDs<%<^u(MiAza7c6X7
z6PW|kS!a_=-$aPbb}=oG!x@Tm{>l4jzYmS9-=CC(vLa?f=pT4UH0qoz-InLKx^3U@
zRp<+f`b2O}(cMY}eG+)f5SRt6vXaU<NzS;^-t)Gx$$dl`D>S7!TDP(U(mf})g~0Ew
z$;>d30`1!<(SyojeVB+bODBdK?gf<~p=SdS-;<tx|77yvbURr@p7LN`X8q3OL*!e0
zgHoDTbptFess(5Edfi^H(`~I)Uf>0hn)}|CT)(RbdbB{ne04#pRLO`hN6b8&JSS_1
zGkp*AdkFGmKyjKdXsqgwSs=1Rjd%D}XjV);*K_C1>F4=N=l6&#Pv5g%B3SUTLO|qs
zCiSqgqr5OH?kX_ET&B`q!wfUzRx;d9%X?LwsB5TSPyugz2)6~^%<89Qn>qH|i*HXc
aCO`Xl&cJg9o-^>j%fNS+C!65_6aWC2;rdem

literal 995
zcmV<9104JxiwFP!00000|Ls;$Z`(Kw&hvhS;io&GXkt5QmMmAG-P$$4R%B?pVq5PD
z#a0t7ieyM~GWW3meiUuTZkl$*T@Bnr1SA4Xiu_1Q{J7t!f3;ezZnx8D*!`f5yVr)@
zS+7>Z^Sn;G)oOcQtKq<3D`+@yr2ds?Lli&@C1+y(xW7bGr5_jD;9y~JxIdx#e-a^T
zNH;9}?*#kbwG=N35o{mib>CM1ju*5y>K`0<e#3!m*1zhi|9<_@U&6!Ruiz27+DJvF
z)OGsKw?FsrQ><i6m0?uduc&4<Inn0iM=X`0(GiM7!Z{wX;!sfnlH=4KasziQfLCVF
zz8fbK&h(5%rBKk-6%&zM;i*<B(5aBIW)J<)A4ZWgN}@5DK9tIppz0DH>@eEIktmLz
zl$55)7B-NkjXqrv0U1zD8Zm<(N)$wEYI0L2fw}wo{cg7SBG36zI`ThX1;M9Mm+6s`
zMw&FvqOAnO^cjmHDmH_hDw)K?=mZ?2s9jn!bP@9+af4e%c?3|L5UQa6xOOep3k&|*
zJ-ikJPN!5vhXVtLZk9wjw^A*}%y4=*Xy!styC=3eq{^O-*b<G93FU`>4TYgf5W}P(
z{I_0j?}|>|Uk-nN1C~$&PUx73iZ^3Doq|j7hN8@<qfN>wpba@Cs_#ssnY{tPgJ$lr
z*q;KRlL?yNJF>O7!JwbQQs~zNXOaS0(C325v}=OGWr$UJE|@~UCOC7NuB3`|2Ir{~
z6`C~xX?y-N?yOE03!>7RFwEF=#^Go3bo~0>mM3b0gsttlcLkOIJCKb&p~;dSC&ox<
z9{;LQ+-qQ`(8#j})-3uXw6U^<GBKlynM=h_m0XO7q9SXvmCkG*b54J5ISLg6QE3ZF
z?Cp$*={AbPu6#}wS>w<8WxtONtKT0NoqWxRmPtR#hym)1r93}4@VkNUd8Nmk8$L6d
zabvd>VLwE|u*~6LODv^&&f;@vz<SmmHc5wRdx}hWhPL7o+3tef<$_MzuUG{ZPmph2
z62pYBtg`rmiezj#;89R9Q9#Nlek48p{@M8Bhlj~x`hyJTMb__)98ABXw<O_NRV#s1
ztA##$y>749>H3w*E4pMFIPP6RvfGLPoKC{|`hrx_F_WvIun#25NyWK<djR)7%#wk{
zX(Gd~>rX|f(%6i)*fnIDj~nApU&QM6ZFu$d*pI{a^Wn|7mrhFrOkboLri3l!#UX85
zfidPHm2L$y4sQ>V;dT7rb?Fgm2rnpyH#)}Kf^TO1=eu@*{Q2tVOU$P`8@mkbGO)|Q
RE(7&s;2$F%%pL#~006td^U44K

diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
index e78dd4bfa..cd077ed55 100644
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@@ -212,28 +212,28 @@ sub getEditForm {
     my $url     = $isNew ? $archive->getUrl : $self->getUrl;
     my $title   = $self->getTitle;
     my $var     = {
-        formHeader    => WebGUI::Form::formHeader($session, {action => $url})
-                       . WebGUI::Form::hidden($session, { name => 'func',    value => 'editSave' })
-                       . WebGUI::Form::hidden($session, { name => 'proceed', value => 'showConfirmation' }),
-        formFooter    => WebGUI::Form::formFooter($session),
-        formTitle     => $i18n->get('editing','Asset_WikiPage').' '.$title,
-        titleForm     => WebGUI::Form::text($session, {
-                            name  => 'title',
-                            value => $form->get('title')    || $self->get('title'),
-                         } ),
-        subTitleForm  => WebGUI::Form::text($session, {
-                            name  => 'subtitle',
-                            value => $form->get('subtitle') || $self->get('subtitle')
-                         } ),
-        bylineForm    => WebGUI::Form::text($session, {
-                            name  => 'byline',
-                            value => $form->get('byline')   || $self->get('byline')
-                         } ),
-        locationForm  => WebGUI::Form::text($session, {
-                            name  => 'location',
-                            value => $form->get('location') || $self->get('location')
-                         } ),
-        keywordsForm  => WebGUI::Form::text($session, {
+        formHeader     => WebGUI::Form::formHeader($session, {action => $url})
+                        . WebGUI::Form::hidden($session, { name => 'func',    value => 'editSave' })
+                        . WebGUI::Form::hidden($session, { name => 'proceed', value => 'showConfirmation' }),
+        formFooter     => WebGUI::Form::formFooter($session),
+        formTitle      => $i18n->get('editing','Asset_WikiPage').' '.$title,
+        titleForm      => WebGUI::Form::text($session, {
+                             name  => 'title',
+                             value => $form->get('title')    || $self->get('title'),
+                          } ),
+        subTitleForm   => WebGUI::Form::text($session, {
+                             name  => 'subtitle',
+                             value => $form->get('subtitle') || $self->get('subtitle')
+                          } ),
+        bylineForm     => WebGUI::Form::text($session, {
+                             name  => 'byline',
+                             value => $form->get('byline')   || $self->get('byline')
+                          } ),
+        locationForm   => WebGUI::Form::text($session, {
+                             name  => 'location',
+                             value => $form->get('location') || $self->get('location')
+                          } ),
+        keywordsForm   => WebGUI::Form::text($session, {
                             name  => 'keywords',
                             value => $form->get('keywords') || WebGUI::Keyword->new($session)->getKeywordsForAsset({ asset => $self })
                          } ),
@@ -258,6 +258,11 @@ sub getEditForm {
                             name  => 'saveAndPreview',
                             value => $i18n->get('save and preview'),
                           }),
+        cancelButton   => WebGUI::Form::button($session, {
+                            name   => 'cancel',
+                            value  => $i18n->get('cancel','WebGUI'),
+                            extras => q|onclick="history.go(-1);" class="backwardButton"|,
+                          }),
         saveAndAddButton  => WebGUI::Form::submit($session, {
                             name  => 'saveAndAddPhoto',
                             value => $i18n->get('save and add another photo'),