From 97ed0f39fd28481c7a1c4cb7bf3bc9fded155671 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 27 Jun 2011 21:46:27 +0000
Subject: [PATCH] NIHVIVO-2280: Styled buttons for adding an account and
 deleting an account.

---
 webapp/web/images/addNewAccount.png           | Bin 0 -> 1886 bytes
 webapp/web/images/addNewAccountOver.png       | Bin 0 -> 1739 bytes
 .../body/accounts/userAccounts-list.ftl       |  38 +-----------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 create mode 100644 webapp/web/images/addNewAccount.png
 create mode 100644 webapp/web/images/addNewAccountOver.png

diff --git a/webapp/web/images/addNewAccount.png b/webapp/web/images/addNewAccount.png
new file mode 100644
index 0000000000000000000000000000000000000000..71bf2b2065c1a26b840acc0a561fec576a88e386
GIT binary patch
literal 1886
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
Y0BbiFTXCX3%m4rY07*qoM6N<$g8FZ5!vFvP

literal 0
HcmV?d00001

diff --git a/webapp/web/images/addNewAccountOver.png b/webapp/web/images/addNewAccountOver.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b2459e45352db63bd14cd8c251af11dd013fc3f
GIT binary patch
literal 1739
zcmV;+1~mDJP)<h;3K|Lk000e1NJLTq006H50018d0ssI29y$tF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&ZAnByRCwC#TU&1vM-<-K9eaHVPH+e$
z4T-o!1qvz#+NM!e3H7QzL0>9Wed$Y|`iJ`3A3#-!r-~vWwM`3E3jq{yPeSZaNE{o-
z@ojhKbarQF_F^Z1ZJe~s$l0vNJG=2Y-<<C|XC?>$mW!o}S8pxk3x;VSMFB<ONBcKD
zQJfz4@Zt^Zo3%L@6xq7aP|&2@o3?c$SQ{T4`0&J$p@9^7Tqu73^X0l}dgG)AUcIJc
z{PoB0Y9~KE`(&-`zyN^{2;!|1A?*2$I*SdmZE0*k%}()q+#*n1TUQrW3gT*UWY>uk
zK2mA#CEJ!a=0x@i0Yc37hbskan1lj=xD;V?iv8oDf`Ax_I-lQdh884U+2zLEiV&ib
zk-OD)c*7zXfFZ$!f&&Hxh)+s(X@&!83)7@4%1Jf|TE;;_h|K|EV!H`A5C{Us5%zmJ
z0J-tRMo(z`&b~xnTpvg#@}>3F@_MadJi{%}<1a5cY6C2|o<)HV9fV*7kRS+tbUp{*
z1mPTclBlZa)WrDYq5Zp3ec}NYA@?3F|8nDQHeYP5BJDq+^DiP>H;@6`-EQ>f(Lhl!
zH#b0wAj>+zjTDN~pNM~X`t6aO{h<eFs(NU24}JYMd;h|<*<cW1JOsV;sw9c$ssMrO
zW5yixNSVSpLrC#gnuPD%Ic@)>67g?7dw)kvXP=l>edX!xN`0j-K0KJ3(9|gHeD95e
z$(Vj_`sz!Fa1s*Tv!vrzHz@duQrHoU;KM<1Aio@`=&RH32q@52ZLH?<f3DY-`;&W9
zi4iRtW&N20dl#2iuiTjryQbGnAt`1v4axHb@J$<<Q+SyJRS>ATK*7#W9vFKq9Uut9
ztk&uU0JC9~En@mV`sl>rnYmoeF#KHAZt)7W9SLP?nch2jgNXQk^U~M=Aj}6%Wd+gm
z*2H+|0a(?Ms?mERq%oQhEgp@&xqtNXojE@;0fC(1TPqZTMr~nPOhU_3z^`Yl;zWyN
zEHXBfW*@9oax@ZXYGkdtM4XUdkw&SKHLMCD2G$aKWCzytgCj$~-=0(aIs|%*1*sc0
zFb0GKp=V^wYEv#Gz+(phf;ijLR6-1xUHE}0L{(Ia7=$!vPrXsPzjQ&RVMZZ(q<<ux
z8BQM`NXCWc00p+fH!`YhW{j3O9=3Sxf$$Nm&P1^zD${Y@BZ8XowCO=s!z>FiL9+~p
zEF$8DF34US51nMCNQQ>zu%t*Un7J?~bq_vFX4(a79x}?+x=$0N37AwXP+l<1ie0``
zv}hzrdjPCtY&T6fZ9=Km0YW7Y)XNzTGBj*vQ?4U<-oVU-3AB<FfrTz5w_2>!8wn>u
z9NYH=6$(^8me#X#k1m;{8jJQH82KQs4^osww0Hz3>1B)g0wEB1y!6j@WR8GSF!1Fh
zXr(*^^WRulntXj9Jx#=Rxz#7L#%floifKrQ>uLYkzwSK@?v{`ma$CuUZ~+LpXaG;_
zdCQj0R3`i)+IMm0)~Shctg2$XN$NC@peIhfq2Yhh?Bb*O$N4T)o}_?$2`PoJkLPV(
zbi{%vM3RYonTIgz^3(G9%hx}j%7{BsQiw%&T2`GZ2^t<mf4NpaH+>DHZ~hC>0({6|
zIfcs<BnXobaOlaUn|G6O{gccQcDw%M*yQ1FL(f>N)V}-a*OgMawQ}v<T#!T&($p>N
z@1%KdFd)wU7t9#J&lL&>M_^hz4n2S6Ms}reX7c#pj%4%Qug~YsO<!FtSHiA=o-bwt
zNH{#(lHjKOEZ?K~1SU<HM++6<OW6K?ke!)dIyyFdcy!O$P#SBfP_E|k#hJNWcD2~@
zp`-&%Ct2oY=myU<;Hf$!GEA|-9(?=ldHINMp621#BxGh`iN2mcOu_c}@~>`eXrfLC
zE@rbMCd8>cF$(de7ozk;944_hRg$&?KFHXxeYgU#MF`(sS=ZSJxhvX==n8p}uQ8C$
zn3%}<x{YuF-Xf;YtrQkGhH=#}1$-b_pMd7oO*zZ|Cqlx{1NPfQG=h)q-SfwT#SJb8
z)V-Y}sE5%(?sj>$knsJF4D<5Q(cSpW)bX3y$K^&Nm{qu|+(hx#wcG!%Tql!xaSx$R
zAtBqwfdPDLS2SHn>H3+ej4dLb6iYu&Uz=I{XT5H0QnqP3F_5L8?I<bvE~j`jk{KU9
hJC)fzkos4E0RYQ_d~UgK9v%Py002ovPDHLkV1l%<HXr~1

literal 0
HcmV?d00001

diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index cd155e0c5..87fcc51f9 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -4,44 +4,8 @@
 
 <#import "userAccounts-accountsNav.ftl" as p>
 
-<form method="POST" action="${formUrls.list}" class="customForm" role="">
-
-    <#--current page: <input type="text" name="pageIndex" value="${page.current}" />
-    <br />-->
-
-    <#--sort order:
-    <!-- Manolo: I don't know the right way to handle these links in the column headers. --> 
-    <#--<#assign directions = ["ASC", "DESC"]>
-    <select name="orderDirection" >
-      <#list directions as direction>
-        <option value="${direction}" <#if orderDirection = direction>selected</#if> >${direction}</option>
-      </#list>
-    </select> 
-    <!-- When orderDirection changes, 
-            set pageIndex to 1 
-            submit the form (submit action is "list") --> 
-    <#--<br />        -->
-    
-
-    <#--sort field:
-    <!-- Manolo: I don't know the right way to handle these links in the column headers. --> 
-    <#--<#assign fields = ["email", "firstName", "lastName", "status", "count"]>
-    <select name="orderField" >
-      <#list fields as field>
-        <option value="${field}" <#if orderField = field>selected</#if> >${field}</option>
-      </#list>
-    </select> -->
-    
-    <!-- When orderField changes, 
-            set pageIndex to 1
-            set orderDirection to "ASC" 
-            submit the form (submit action is "list") --> 
-   <!-- <br />
-    <input type="submit" name="list" value="Refresh page" />--> 
-</form>
-
 <form method="POST" action="${formUrls.add}" class="customForm" role="">
-    <h3>Account  | <input type="submit" class="submit" value="Add new account" /></h3>
+    <h3>Account  | <input type="submit" class="submit add-account" value="Add new account" /></h3>
 </form>
 
 <#if newUserAccount?? >