From f71ef30358a8a11401275916a403b03f6e9f83bb Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 8 Jul 2010 16:18:14 +0000
Subject: [PATCH] Added styles, icons, and improved login and password change

---
 webapp/web/images/iconAlert.png               | Bin 1478 -> 1178 bytes
 webapp/web/images/iconConfirmation.png        | Bin 0 -> 1240 bytes
 .../body/login/forcedPasswordChange.ftl       |   6 ++----
 .../templates/freemarker/body/login/login.ftl |   6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 webapp/web/images/iconConfirmation.png

diff --git a/webapp/web/images/iconAlert.png b/webapp/web/images/iconAlert.png
index 27803e2fbfb38737de616958f4e735e55f5aaca4..af1a2a22853540e256b30cdc1baa33baa9b7a358 100644
GIT binary patch
delta 1156
zcmV-~1bh3&3z`WbiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzee*`>9
zL_t(|+N@SfY+FSXy)*CU#EE~2<3w%ZCe5dIXhEey0xAKes4YU3S|nDWRG^4T6`~tp
z%Yp?97A*J(1geC(03jAgAS5a^5`+ekU7>Q*24c639ml^s*YWdvejo0P<J3)FvPs6W
zo;>sBo;&BBd&cCwcoeo8mhFJ$f7m^gkVh0zj0%+ObsVRxn^qFnZs98lQJ_G!*#F^;
zB#3ScjssA)tvy~@nurF2XQLtC!9bfw76<`cf~rx6duk<>EUHuaiuM&H@P|ODD~RZp
zHEuZn_}<?4kMu_(-QG4JJg~F=4#CfOZ+Em>ub-RCmR_AnEnY5G^><}~f9AFYs9Uzw
zp-7*eiVaSV_JqJju)1wGPG#tbZeer`uPFGWAPWK<?(Y$Yy8Y*VNh~}upIdoZ7U|8_
zn6x!>4F37qLnD(1Ft}k_V6FuR+X5x_D0oktfwrfQ1M#$T9&P+$J)l#O;mo1ocq|h7
z*|4mEO((#@AuZ(1ld-`!f1*J@)J*e1JutY?>4(7NJ3xH_KDTn|W6-9r;7L6EH%mmK
z0-THw4wZHNQd(U-B?;76KLOIv_t>8B2V<CdYw%{piHwv;(t{ev@}^=k5EKPGJ3Meq
zq;!HM%>mdkJ7oF%k%8WByGe<gtXkI`$Mv;3(iIK*U?d#4h)MI~e^EqMhPwQ(gxWor
zg#$YoY&TNP6c$HGKg9u16Y+f^|0rA7jbY(Q`}|(;d6XA8fFcU9kk>=49cJGgjB<}C
zLZD4K$N{h*eeII?P$TV>CTuuX*S-ctgec5UoZX4vP#MxqDG{4R&aR@j>{1E1@tKwl
zTHP#i0PMW~%9;TJf1%rNTx+U^xaqdpv+h=F`aJJsMEiSDtrQMKLS3#KutRNi1y+Ch
z4#em%*!NX164!x<u13tLfs$5(QnmJbv&i}R{K~IY!vt5U;+(D5z+Acqw4)Q8x(-&U
zfI9_O0A}g8a-||NbA<!oB?9?M^|PDH1qc1ZMRyiZe-M1He_a51WE{NDp9at2CmZg%
zF*wV<T7!Qw`EQW&%(@pLZ`0Qn(wEty=mz4TP1KDRPcU4$XLY=mOlMV1|A>Kc(4*l1
zrv@pSMu3+_!=W%ciQUvKZgMmY%yfzux;Fb8XfspX1Deuf!I}1F?`B{onVAqN`HRgR
zzi<&q>z#~uf57-yB=qBpv7!B5MdIewY!6Ne<J~eFZn~yAc2%+jXYVY*)!V7JaO#t0
zEjQiCvMAh`TP_~EUo*aZW`F;QeO-ReEAtl{Et^{~s)q$&^X$oJonBbXTu<lT#^2v>
z6bh&4;X+ZhtQ+4ZvW0ZETp7TS5mXwdpiv(J8aC!qT6q;IS;}0!edp^`sr<Sq2!C!2
z&M0yfGX_NGcD|U)m45iQpgxEHD31CRX-vSh*&*;>#WHGrMl;MQ)O~{8&0CHC1sDM0
WYRbAY9<);c0000<MNUMnLSTZ8Tqw5y

delta 1459
zcmV;k1x)&y3C0T{iBL{Q4GJ0x0000DNk~Le0000W0000V2nGNE0ESl2jFBNHe+6hs
zL_t(|+Qe7eOB`1i|K_%{v$t_CuGXZx`p~pgBW+^6^kN8BEC`A%*yg2>`~d-Jo&wrp
zUP4I3KOltoCWS(g2FZh@4YZZkm=LwPTB=yDQM0bQ?(FXD%=9}u<LrhS<Ep^}hdF2F
zob&y@-*-DhX_^Md*=RWCcI*Jyf7}U0QTyJgD2j-W4^>r_>gwtq;#eCQ8Oh6@#QapQ
z599-2Wo4xcK{VrjI+;v<9}b7_3=R%PJ3Bj5`2b)KLfiE8^pBdd-6~qP$uSTGdsW)$
zY-nj|=}4tgv)8U&OT0E87#|<MDDZTv-@XBME(Ufs27X}`cus2)1fiq7f4x1>-QCT-
z764^sWfaG8-@0wvKx=6LRYd|6JR}WXTNJ12S5Bw%lM5FvcyHXeLFes+uWADW0~c*p
zI!LshUkt;aV~fCB82Gd{01k@`0`GDrlF2W4o}ac_tr6TJ9T@|qrKOa`V(Ib<TN$l?
zxc?VS&u+k2=o#Gm`R~lTe<JHDajbLcbh@UovC(_|`gQuq0HF4loPrt@m>5#8Kq8qo
zza>&Q)>PoBD7dV$4WpyYZnwYfa5#h`0r2S2BRA4|%R^X2;Y8aP;|a|79_|@=^MNeO
zHPzMCzAIO*Foy<!!aH1oD)JNwJ6%wbH>;fJ;B-(3g4Z^|$tO58e?zO+>wWjci4(%1
z0E~@|5$!L#`RAq(Lbu<OJ-5KY<}jl|Axx1>`9AtX4Q9!ry;yj)lhAaBlb2EZm@WW?
z6Jfz(o4F=XWHp$<Z^<yQu}KiMS;E4Xe!ssW7!2AD1b}Fdo`1Q3Th}!-;+}MWK{nT9
z#)=FOU&O#$!0$2?e=3hjUU&zY__(&Vw&d#7t8Cr?ur{FfDUo=$POoB`p~%gF)k35F
zS+LS^fbD+(QXBY9&Vb>R4G@(OF+~gdLM8fwJud)HpFYjl-oq}NT7#O_nK0;f@EDGp
z{{qBj0n(Bo9BYw^r9eqSQQ`qmigXG=oX3bbi7asY2EZ^(e@6iy6FCh-Pmbw5wTU)f
zL#mPH=nTAJU4m1^vMyLnW`yd`RE7mciGnBj2at&H`F!tTigxY`02Z7wq`y;4{Epfo
zwefkhE$K^`byjsCiUf8ZGE8j8C0)3(BRpjSa!bDgtx6@B7aCnISK#*T+uWYDpuD^s
zWmDgY)B<o?e^mEu&2T=`301f=xC}oHhckN~Jm%omC3lXQkdaKWN&}<Cz!QH6>yD--
zG{wWJsw%V@Y`m0#{{H?_1n_ksHEA4{)3q$!bIaK}GrLOOr3?lVS#v15FZi|wfK9I#
zqbV9Z9#7fbyLT<S0;sI4B-(#2!aQ(lG)K5>diT!Zf9Fs0=DvzInXCzNg{wOt65!do
zPr~ve1W}1MDEqD^zy+jx7&>WaY$O*gmjOKz&R4Kd>a#;!N<;ZcO&7ZJ-CQS|ta0)Z
zsgz#qrDx8ZadvfeZ4wV+ce!j1N7)kaX-|O3v8DOUq+ESm<~80cId(VAB)>3z?);2I
z7P&79e}O=NJ$v>nwJU&VH2RCxT6k}sZfN#s<LHQ+dfbyvAse*eXyi#5`GLYYqh!JD
zbet;`56{JBkZh+Fj;1%z#No-wNvXB9RsG+k6vIy&8XA(?+S<OMg~Ih^`dl+^5O5&{
zhiF(&B#vR0@T}i3xeYHYEJVy~yW6#VbaYg}f5h<?sp&WkVz=QsQql4SqT!jUaWz{)
z;ZN4q*2eq#`Xar(z1mB!<x^8riAW?8s;{qK#!IG%3rV><2!M=l<3&~qg+f~s6BAo=
zb8`tId`|{;T2D_8xdqcYiwFOUV_8<4nVC^;-n^;p`Db(-?LPqq0IX#mD7;{E;s5{u
N2>?k&PDHLkV1fpSw!HuV

diff --git a/webapp/web/images/iconConfirmation.png b/webapp/web/images/iconConfirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3993988a0a79bacc708e7aa77061c200bc8f570
GIT binary patch
literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$dPzh<RCwBqR%>jNRTzH0eqX<@>*!dw
zcB9V0wrq{;0<-fHq5_Kv5SJ)kKoe&07KkxQbU(aAe&`=Bk;K~{kf`B@CK$t_f(B$E
z5^!uxwr+(D4HI+>%G!0Mwf%baJ?Eo0_7ynENt$!c_dL)0yyv`crF1$CVXFY$k>axw
z0`8P#G$}G1sTAT-6_e=%CTMpQBBChrIU7>Zodj%>g3UEm*jVR)tK0&~qyR}Gji|uP
zEM_OCaKh`umn32z5he6sgn1D#)oE;S*5iYYX4Kou0fT{-(%R%73EGSi<b`SA#3&A5
znZc_>GJ1V9g#-jHNqBc<2e!90YJiDk@$eamkvvdiz_DS>xX1B4k^GQPV#rr6iFkX>
z3T$8Q)PQdU&IS_@i}UZ$c{gmXR(y*jR_CA52-1A6z0ZYr?x@ogW$d^q0f~qwwcOm_
z4s$~t<s^ZsLV_epYiqD$SrZIu9Je%51TGpRwAwl$iwe|hDSn_G^(AJ!!E>1*5G1Vc
zSc(>daBIpLc$@&%H@=T;9evokycZQF2cjg-S_ZT<;#m@1n<c2Kz@{4e%{|Z9qSCpp
zh8{e)q=&CHSFXd$u3sn;nPWJYpxkJ}6U=%}aC<de>^9`9XDU-V(L@PgRc$vOZThHS
z{c?Dm@{r=Wuv%y?q-3YA5!kJ;=YuEdw?zJ$q*8807My%`Rj<RQrMnBj$Nh)!)z~wH
zm*6*4Bvji%I4J@%Cn!;J*Oe(S8We0<_B~#|X8?;WtsIz5XT@E3uJs!tSF+&egM-*L
zvVm-iKooNC!(zq)B2WyOg^a(V!G!MSooKT^j76o*c*%8ufbYd^3mWi3+jlS<ty%C(
z;WOAd@;I)>=Sb8IYEdkn^W7qs($(wA9<VC4*ycJ&Rz+y9I=dcF|HT*Xjqv{W4-`=+
zS8>ExMdQ5wAc8Ck=3P+rVYmA!1Y?)7hfPvh0eCp>r!!Ata&Al)oN^7{94?UYAx<#m
z#W-7JBoeK-uN=nbryhbodVYS9O-1qbST{Vr<0#Ro#jG%fB18~CKV>}42`+lkOHuF$
zG{wNVz$tt(v<A~*PwoxSJ=x>gjG@av!(61$v%2*6MWiEP^s=kNA>%6cjQ$0mn3pIP
z`c&vFKKrAKtmx-!d&ghFv8laWfZky0sTsljCk~PNleu!eMPTY*d!!RP7B9*ros-kU
zDmPWaK{sl`e-s8Gck2pDH%(clvOR+6z%W+Q^%=|+JK9Yq@M+%w_6M%g!90aViX<5G
z;k554S11%|j|}|GBrxQ`o758q=l26@d4T|){^>XBP64t=&VjK9B#Y2(z06j2_VhX6
z*WdA8GKr7%8;<rWW@mhOY+oOC4NuT*qjw=2wZ!EsXOXZqwik{9M@}Me@Hk$iLig5n
zh&nwv_itjY&5oXydaQETAk))_qG+!@LZEXYDihQ2k}W@mL->#!II9<;Q1ow0nl~bu
zK3ZWiV|AGs?PP_S6R7YKL4QKU5!&}aEMDIK7hnK!Zm*#XI`xMD0000<MNUMnLSTZV
C#YbBJ

literal 0
HcmV?d00001

diff --git a/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl b/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl
index 16029de3c..85d4a7c4b 100644
--- a/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl
+++ b/webapp/web/templates/freemarker/body/login/forcedPasswordChange.ftl
@@ -1,8 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
+<#-- Log in template for accessing site admin -->
 
-<h2>Forced password change</h2>
 
 ${stylesheets.addFromTheme("/login.css")}
 
@@ -10,7 +9,7 @@ ${stylesheets.addFromTheme("/login.css")}
        <h2>Create Your New Password</h2>
        
        <#if errorMessage??>
-           <div id="errorAlert"><img src="${alertImageUrl}" width="32" height="31" alert="Error alert icon"/>
+           <div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/>
                   <p>${errorMessage}</p>
            </div>
        </#if>
@@ -20,7 +19,6 @@ ${stylesheets.addFromTheme("/login.css")}
               <input type="password" name="newPassword"  />
               <label for="confirmPassword">Confirm Password</label>
               <input type="password" name="confirmPassword"  />
-              <br />
               <input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/>
        </form>
 </div>
diff --git a/webapp/web/templates/freemarker/body/login/login.ftl b/webapp/web/templates/freemarker/body/login/login.ftl
index 65dc398ee..19823b8b7 100644
--- a/webapp/web/templates/freemarker/body/login/login.ftl
+++ b/webapp/web/templates/freemarker/body/login/login.ftl
@@ -1,10 +1,11 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
+<#-- Log in template for accessing site admin -->
 
 ${stylesheets.addFromTheme("/login.css")}
 
 <div id="formLogin" class="pageBodyGroup">
+
        <h2>Log in</h2>
        
        <#if infoMessage??>
@@ -12,7 +13,7 @@ ${stylesheets.addFromTheme("/login.css")}
        </#if>
        
        <#if errorMessage??>
-           <div id="errorAlert"><img src="${alertImageUrl}" width="32" height="31" alert="Error alert icon"/>
+           <div id="errorAlert"><img src="${alertImageUrl}" width="24" height="24" alert="Error alert icon"/>
                   <p>${errorMessage}</p>
            </div>
        </#if>
@@ -22,7 +23,6 @@ ${stylesheets.addFromTheme("/login.css")}
               <input name="loginName" type="text" value="${loginName}"  />
               <label for="loginPassword">Password</label>
               <input type="password" name="loginPassword"  />
-              <br />
               <input name="loginForm"  type="submit" class="submit" value="Log in"/>
        </form>
 </div>