From bcc66cb6cb1b5d60060fd817b6fd53c54fde5847 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 16 Sep 2008 19:01:27 +0000
Subject: [PATCH] RFE: Add a cancel button to the edit profile screen

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../default_edit_profile_template.wgpkg          | Bin 0 -> 1182 bytes
 lib/WebGUI/Operation/Profile.pm                  |  10 +++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index acf7de02e..3f1f89b9c 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -56,6 +56,7 @@
  - rfe: Added sort order to Folder assets
  - rfe: Added canEdit and canAddFile template vars to Folder assets
  - rfe: Add logged-in time to Login History
+ - rfe: cancel button (for edit profile screen)
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg b/docs/upgrades/packages-7.6.0/default_edit_profile_template.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..84b43704bb4b716a7828eeb4aecff050daed9982
GIT binary patch
literal 1182
zcmV;P1Y!FhiwFP!000001MOFBZ`(Ey_UHZzL7z8UQv3oNZh>S;ngDI$<z)%l3;`|C
zHW!%`NGgdt^uO<TqGZvLGZd(YeTY89mhX6P&%?V*yS4i#2!cVc*J{CM&=2r4>~>o%
zuX=)37zX_=$ipaVd0{Y!1}zVc?EcA>CK5s;8HpEkyT4pfskVzTxu8f6(s)Jj|0Ob*
z1mXH`-+piZr3C*;p@Q|k!P|Igz`xfEx*Pa+!vWy`pHy*I__u#j@pf$H?{{zseWisY
zbLx8|@2mL%9`o_%FDT8V$f(qeDx-iWP{s3ONr|S(!O95yJs<V0EG0@GJ!e9K!aknl
zd79QW;O1%c>1X*gWokha#{#EMH;gCZ39Sc?Os%-c6l=6gpS2_>lq6SV-l!m+IF;9M
zp-+>Bz;l`6uL+%zJk|F!Vfr3wFk>mb*L0bsChU45L@BDRt;vA~4ZKj*pI+#wGj+m}
zgmUz<DVj*3g<fSvVcewWQsmibas&YtXCudM6`KKLyof%GO(^$|M0yER5ccYd>6CsL
zcR+T>?|30+GtXw%UQ(ri2OtCx*QZ~K#~n1yW;Hv;PpLT*a@k%01XO~?OG||utAKJc
zO{rIDrb1+{DVowH<ywIX(rc`Z-GXTlXyU~{H}(F`*T#~;p2|Dldn75FbMv#v;58Ph
z%7}T7?)>%nrc^P&7=WG&xmv42-bwie-!TY?qe$>&*rkEC5f$gwk=MgE?hdJnCCfAu
z{6*-c&jwI1Qd^&PN~Scm%C%VQuCPLfM3Y(xwg6<UZaA;;#qq83sfMdpX+v2}wJT_h
z@@1h@bKOX^f3w>$hAT&PG8#&(6E7jM8Wx3(H)JwmSG2P>dbdmlClzA#DjJ<v0c$Sl
zQNd%2Q!UU<3R{3)wE`Cz*$5wa%ZfW$CRvd4$6~hZt{-ZkOLI_dz<<dq__rv<gvSL#
zUj%P%E|$A&T23>W38Ar>03Zo_tXM_jSma!v<GoQOvBr6M3(Cul0GAfsLluz>cT!es
zo1(DVw(S!N4&t)!KmsOGTW{nYdL4HlKG1S{Gvf;?nZB0ku@uV*k<iVshr1mf+t?Xd
z7Ty1bPCs6sjz;@tzKlj!O|vIuoZ8Xt<G^WH=A1}y>i)JMe7<FHYcnJ;w!>lqdS>8w
zlVSpTjZxUi^arEGupYQBA6RxKG@CJKh|t~|5@*UdF%&2!n{yuL>m~bUW&NJJX_$<1
z9Q1xhdBXVIISqp&$HDi5Ib}q`ihzf<05KY!Tz&r3SP-T@iTI(c@aE=YCgVX03dZ`T
zunrJ<9}Wk@VQ&z*RFU+NDJUj%3R{;b3VXv4{)2MTXKF&?hl(POOfAIIDL;l@R+P_O
zMmX>g8f{#dKZhL<(d$?ybZ`%;??IHua+T>xvolTRc1Jp4!Nv7s^6UQe;{4|J%c9@=
zxVmsbW9o9HV4=YRG$dYDc4O%T8sW;hg-F=ootlMFcW>D15BpAC0D8EeHroC9>Ui<I
wM{m>Fm)o-}`urdj``x#D^7nV&cf6v%nSZOmTLs=Ku#*b>14U}3-~bc=0K(!zrT_o{

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index 901f50e9f..ae2f4437b 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -225,12 +225,16 @@ sub www_editProfile {
 				});
 		}
 		push(@array, {
-			'profile.form.category' => $category->getLabel,
-                        'profile.form.category.loop' => \@temp
-			});
+            'profile.form.category' => $category->getLabel,
+            'profile.form.category.loop' => \@temp
+        });
 	}
 	$vars->{'profile.form.elements'} = \@array;
 	$vars->{'profile.form.submit'} = WebGUI::Form::submit($session,{});
+	$vars->{'profile.form.cancel'} = WebGUI::Form::button($session,{
+        value => $i18n->get('cancel'),
+        extras=>q|onclick="history.go(-1);" class="backwardButton"|,
+    });
 	$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions($session);
 	return $session->style->userStyle(WebGUI::Asset::Template->new($session, $session->setting->get('editUserProfileTemplate'))->process($vars));
 }