From 2816caa523b3e171c6c4eb9b2825e2b4ff87952d Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Thu, 3 Dec 2009 14:30:48 +0100 Subject: [PATCH] ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18: Login page revamped --- ...lplanner-webapp-spring-security-config.xml | 4 +- .../src/main/webapp/common/css/login.css | 92 ++++++++++++++++++ .../src/main/webapp/common/css/login_v01.css | 46 --------- .../src/main/webapp/common/img/fondo.gif | Bin 0 -> 3295 bytes .../src/main/webapp/common/img/logo_login.gif | Bin 0 -> 7074 bytes .../main/webapp/common/img/logos_login.gif | Bin 10341 -> 6150 bytes .../layout/{login_v01.zul => login.zul} | 65 ++++++++----- 7 files changed, 133 insertions(+), 74 deletions(-) create mode 100644 navalplanner-webapp/src/main/webapp/common/css/login.css delete mode 100644 navalplanner-webapp/src/main/webapp/common/css/login_v01.css create mode 100644 navalplanner-webapp/src/main/webapp/common/img/fondo.gif create mode 100644 navalplanner-webapp/src/main/webapp/common/img/logo_login.gif rename navalplanner-webapp/src/main/webapp/common/layout/{login_v01.zul => login.zul} (53%) diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml index ce4a5df81..c86f0087b 100644 --- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml +++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml @@ -17,14 +17,14 @@ - + - + diff --git a/navalplanner-webapp/src/main/webapp/common/css/login.css b/navalplanner-webapp/src/main/webapp/common/css/login.css new file mode 100644 index 000000000..1261f03ae --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/common/css/login.css @@ -0,0 +1,92 @@ +/* CSS Document */ +body { + background-image: url(../img/fondo.gif); + margin-top: 40px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.identificacion { + font-family: Arial, Helvetica, sans-serif; + font-size: 18px; + color: #0081C3; + text-decoration: none; + padding-top: 20px; + text-align: left; + padding-bottom: 5px; +} + +.entrar { + cursor: hand; + background-color: #E4F3D9; /* green0 (normal background) */ + color: #58A758; /* green3 (text) */ + border: 1px solid #439e32; /* green4 (border) */ + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + font-size:12px; + font-family: Arial, Helvetica, sans-serif; + margin-top:15px; + padding-top: 2px; + padding-bottom: 2px; +} + +.entrar:hover { + background-color: #C3EAAF; /* green1 (hover background) */ +} +.entrar:active { + background-color: #A1D586; /* green2 (active background)*/ + border-top: 2px solid #3f5917; + border-left: 2px solid #3f5917; +} + +.usuario_clave { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #333333; + text-decoration: none; + padding-top: 5px; + text-align: left; +} + +.campotexto { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #666666; + text-decoration: none; + border: 1px solid #CCCCCC; + padding-left: 4px; +} +.fondo_identificacion { + background-image: url(../img/degradado_azul.gif); + background-repeat: repeat-x; +} + +.authentication { + padding-top:10px; +} + +.ayuda { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight: bold; + color: #009900; + text-decoration: none; + padding-bottom: 5px; + display: block; +} + +a.ayuda:hover { + text-decoration: underline; +} + +.login_ERROR { + color: #ee0000; + border: solid 1px #ee0000; + background-color: #eecccc; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + padding: 15px; + margin: 10px; + margin-top: 30px; + width: 300px; +} \ No newline at end of file diff --git a/navalplanner-webapp/src/main/webapp/common/css/login_v01.css b/navalplanner-webapp/src/main/webapp/common/css/login_v01.css deleted file mode 100644 index f4d87e63a..000000000 --- a/navalplanner-webapp/src/main/webapp/common/css/login_v01.css +++ /dev/null @@ -1,46 +0,0 @@ -@charset "utf-8"; -body { - -} - - -.identificacion { - font-family: Arial, Helvetica, sans-serif; - font-size: 18px; - color: #0081C3; - text-decoration: none; - padding-top: 20px; - text-align: center; - padding-bottom: 5px; -} - -.entrar { - color:#333333; - font-size:12px; - font-family: Tahoma, Arial, Helvetica, sans-serif; - border: 1px solid #0081C3; - background-color: #C2E1F3; - width: 150px; - background-image: url(../img/flechitas.gif); - height: 25px; -} -.usuario_clave { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #333333; - text-decoration: none; - padding-top: 5px; - text-align: center; -} -.campotexto { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #666666; - text-decoration: none; - border: 1px solid #CCCCCC; - padding-left: 4px; -} -.fondo_identificacion { - background-image: url(../img/degradado_azul.gif); - background-repeat: repeat-x; -} diff --git a/navalplanner-webapp/src/main/webapp/common/img/fondo.gif b/navalplanner-webapp/src/main/webapp/common/img/fondo.gif new file mode 100644 index 0000000000000000000000000000000000000000..b780d38e02070ee7f45e694ae8bc8d9f941a17a9 GIT binary patch literal 3295 zcmdUv`#;o){>KM{Nf|>fBh*kzQdt}(y11rnj5cjfQj^`*5APq|zdT>>*W>+qho3x-K6LqeNV}mD z0s%o#rPVX}iuV(o(KTuRl87hQw9oQss}h|akg9b{Lgl(tEmmrK7KE!J)!>SlGRwv~7?y5)$0H9c<6(}_0Y^hYG6DxJYs}crBKE;vG zauu^Y`R5gJ4^!AaD^Tn7EQzXPmOsIk3KiN7$f8imk*aB5Br{w&gCk?C%T`1x>YU*7 z28bzKlc?9F8kShqG{uvtb?r0!DUNJatXh+()@5p$N=ISv80+$}H7S$7Ap@9Nm(ft}fiu}U}mMZ%SBOt^Bju4h5iH7{HdDL331UKMj>8j(t?(}Qxg zeugJsmuaYTLfRMcJYU(rB&IO<9W#86RI?&h=|SNAIF~0^E44u5ByV-YBLEm&5sk7W zdJxp=!TJeK-=avN){nDfD`F*6ppdDxpO-~yytTwPgo<9KsDDu`P-@3nQl>yT!IDD$_sdxg z{r@FA{@eeX2?z{?m~O#)2a<9KP-Ay%TzzE_VUtaY|F!z1;QQOqHjWg_>R|KaU0Ju$ z*gpb)v)%V9#!XUXvMGfpx)t;{Ios_3k5PQp$X`mtYZ96+gjv9eU>1vgfB8yuR%GP;l1HG9on3vnKQr?4K^Z_TJ5- zb7z? z-pS5ues3V&vDEzg2#e{0bXnzoEwy<1NDbp?5eHH<+nxnJ$qMx2ubDc2CG2?gbK%_I zdPb&7<9?$Wm6g$4k$I-U>N;_#7maIRw+N*Gn)y_wqFg-eaX{2AA+2 zn$=j`%uI)jrC~Gf)v|WnzrChTX zbY*b&EbxmmsyE?xh<(gS(!ZQ0A!Xw>ncePI$@kNfm|8=tf z9zLO{ksRo!cI7&gx1J$;+yj}0Fa%3r(8q?hkEyu=WZExE@X4j2-x_wn8xXFJ2%rd$H4 zozNtLVHfoKU}~39wMh6OPIg1onS`L`bZK{Q@ia5M`5~gm$aIUS54!VI@_x|wRQiV#5tAm-I2HvL-p$P9sC@IwY-g3(43Mx+mJuG$X-SkzDBb2^}df4dTk>*UpVXx*> z(vjm^-!zVeH9Mx#k6{)!k3<_q-X06BD1yRIJ|jTkiF1|4Rxvn2ulY&T64^F+1y8a~ zTfnASrSAj@X;%2=$0jyt+;6^CnHfQ0GicOBzoi(+6NP#4jo4665wyTo`k?{8=v+#zu6HSu-(@2RyMc8h#tWAZ@m10)8PQ7 zJM`@sy)SsnrKZDwWIqYvyzYm$!@E+2t->yPK|6O!N%P-y0fvIu?W)BXYWQ^ryCA~; z3P30LyAaUul?OpU6_>4nBF&U?!+YH73V<G6EN5n~o(r@lc!3u!FXijgagbQRe>|2y#joF{0EyMS`}T zz1HUuwwrO(&BfS!)0idWh)n#}I#I7{#OeE(UKi`fusl;Y1FM6OY^(0tUU%H-{J88Y z*W%0J;HL!};Et}Frq#c=yMp5-d=VQ?)+}fA6 z6ji10!g*~?-~LXKRI zda%vVUN!zAWSDy9`T3YClZlr>O|MRuzlwPjF;REuNB6UjIcM!D!M4YpIMKgdpQxOy zH25m-hB@ps2}x}-z>(|rGw+{kmHfjbn_3sYu#ME(`3D^5nv@{jMmkJwdjGuE;F3{! zE^;KO!Mrx;%Kq}$eu@0uosavR*x0FWR+|ibqVd+(@W#dz-=?Y}qVPDcc2DU|MuzlDMW}3>2l9a&q)hmQO-_{c)DfmtgZi3W8!%bB{SfBB0pbT_)oE z)32AU>QvUw1-I^pUr4a5Q1zjIx|MhGQG!!lY_9`eT#%8OfS7Ye?7n6ID^4=p;dAH{ zDmG4m28K;)x)@Qs#{ry+wwOzEQgjShv0V_9=zcurCpwmXUpp|vTj`R zb}%WUDwG{cpZF8(BW$Ub7fTOoDl{96iRxiX`v@e=s zRNW4MC=b)VY)4o11pwlr!uHiY81-NrAStD{uldo{vtxTBa6IQY|_~xftED1E?CnbV^F-y0rjMJyO^ydx6n& z;y?|9-l=G&>jfF0cG04%UDb~PB;}xvjp@=%(E&vps23G>=~x(0GrRG6>0N-54gy*b zgdp*TXgo9)Z-T?aO7UhC{1yftuEHab1S>SbI+kFIBOpr&+b9G_24TC3fI<>o(8OJ_ z#N9ZeTPe|rxB!y?;F4YU z`}g$qy58rVUrjF6%+LQ$DewQcZ>+AaF8)RL^XJcNYHD2b-h(Gz%+Ak;J^VN^F+Mgn zHZ(LeJ3BivGV=QM>x%Bt*k}E}=VpMzrOnOFr%L-fJ3GIP|2q7ruf4rpE|+h-{;sE| zr?zjTzrP<4R=gh?DQN6J^SrJ9$CPSZ#h!nf&OGb+_G@~na52U2{JOrmxk*4+Sy)&o zsv5|w?Jh4bf70=_c}O|&d%FAkud(UheRFDx!L)d znVE>keL?qH>IQ$_{xH=3?Z@x=*-xVrw;TI)FH}@?eVd<~KT$fQpZG#PG#2@+6A_gE zo}C^4J*$~m8S$w5NXhWr{PgSI@BAli>#x--l)qkn9tGkmfatQZ>Dk5s<+hvefrwHd z;t3E{8dLglett6QN&mBsv52PwCrkP!XJ)%bf3|!ZKmNEIhIX+3Jb2)Jt7&d-CZ_buUk$w{pLFYshoZVoUB+_m|wJo zg}KE!|KIq}EiBCZw=Skz#OG%hvo6dpKFDG?yD&dH`yVp|`M00V-+q1gs+^jd`uzDb zc=8$k)GI%eOt<2K+DnGsl7QOc{cl2{Y~-?0)6M#9 zn=n%9fQQ&BYg4xK!IhqBR>FppJppf<^&SN`h_!t`95UV(`k~PNl={zGk}%8c6z!#r zZI46W7y2H>(T&T)S|qiP)c@J_B)F-td&R#`%^X6~rD`X`hZTcKHsM~BU*b#Q&jwT+e4X?M)P zih0R@+#HCp`%|-v)5iq@?2>V$Yjjb{nDk_TVR(Cve54}oP}VE)F$qFFaSF7h&~GQ~tPC8nI~%YZd1td7kNd|crR_IUjh((ze=SXY%qIReI1jC+IZ9MOI&4*S+LBvYNGjWQ^y%@3X2G@N; zFU=i815VpK>1lgEe|vz}H)dbb&DyV9%lp&fG8+%-ITgOO<`AQ}XMK^IS9V~K#LxR9 z{R`crT-It`va|^MK;H#v-&6}}a?NLWY_Ihd6>Tf8D)iWSZ^4*;E5_|gn6Fj$8%^Jw zJc0X@Xl&k-awA-!x zo9;e0T`*}j)++sV56u04)>$<;B^s9a#WmgFvsbx7kCbC1=Gqd$+(! z`b~xEc&hd8T=MpiM&8dlINPrGyya(ZehN^x^5NdU1#d+j?8mmmx8NtrINWrgB@y&eFA+0!M0~PdN^^J5}Zen%VLY>yJ_| znN_BV0}c0#C&e3FIOfGs>G10nVBW#fL}G*5^_K8W^g&TH0t@IhNq0 zpr7F+=!I@p+ok-A>?7hVv9l+MGMy~>LgC@qe9b+EmGtvMf?ZuX(_UE>F3v3#x$0>( z6k%4|ao|=p-qMevEh}p5&tvWX^|+l``R{^Hc@ptZuXPmbHHIRBe7T3*SIeDnT4Jg% z7sHJ9dX2;crc+(@LfB3i3>tyQeFKMaYwAeJaNfoG(~=S(>NT#zIbzNb>!vV9hOMhQ>!kt%v zcf`b#i(`_oqa_rh%jL-S68y5aUiiJ`|LR%03BhJ5X#FT%tBqf6R2q@yUL-&_1!OQK zQU9<%ahc{GGOa2xPD8vr#M{Be>?Hf#z8bxl?wW1P7&Ok4bIU>=8c*UrOtnsQRNEZm zh?6}{3r+3CMiZSk{wZ2`xd8|2tjcsywaLA+#4eu*+a~B9@uq`yLeRtS%{seoqHQw= zd)_b3V=It~iuHiCgdysD?m4^6a;Sk&Y1s#+oUz&mzY)}$n*aieUmj6HsC+#di8Grj zS2sZ`)j}1-15zR4t03uTK4$GV^rlvFAVU{%iX~5`DX)t&42=+y?e?Lqe|A}2&LagS z06MQT<2OaxBYz=0%_B8^HWj&PA@Fj{76H6$nN0H?4639N@a7|`)Nnf%#y$pTef>f5 z8csKm#)(tE=LH|ozoRYY#ObQ&3hZ1#RJm@4C6|9rN1Uta1>gX=*zV|vcu6z?dLmcQ zt}STgnon%UGIKodUxtPP{nKkq3o+vrvpB;+kd2t(h*&Saj!LY_H~O7H4Cz9A1{1M_!s= zO*oSqx7tH*NgzMLxKs%*1I%y|*UgwNR{Dy*avi#%;Ixm*d9TnG)`>8e5KYdx@EAi% zU}%!M7Dqtk=#iocpuygdw5JjKv6}qK++qPu?e37pC-BX|N1}^XR=JwK@}$j4SIHUy z_Jk#9qG6TvQ_D-LR;PkABI2d0Qf}j4441^~_vDfe73~AY>w_$Vt|i-zLr9{?0S5zVd^-$syac0iT_}va-2=anR_YgK zAfY9>I`)DjmX9dOqzJpxQ>g?Ct<=DAK~)0}v!q0d_vPqf+-iatF`&RfLmvxsU^^!q z%`UUiU^*+wR*{vk-YHk}*O;YWp_2;UN)KHcLI>Vq7;HtH!m~D&^cYuJ8hU3w~E(7l!Ttqr7tgD6Hi<=!^^S$~Q#y zU=gNbQ*2}6($owhE287n^{@Ou5 zJ-d$-)jDFhQ3dbI=+^WwOwyDoVth?1DDI(oe`7`9`l(%NStX9D0h7q3J15=mMOuSb zx$!NPjS(!FK{$9`Ps^VN>ez6wqepfV zYPFqo)K4Ar{U#%Blts5HTu<$Y5*Cu$xQJ3fpz%!ua`DjuY?0m)nt)KiQInu>i~wrZ zBU9LT%{OW}V&dPxMvF#RETd#ksQWAj9&!jh=J*rr_@`nx_Kl{OfL6q%{Etg9mSZ+3 z;455GTmR~pB7E_c{r(X~tDT6N0_-~!M|3>>AsYTiiT8gBnkWel=#lm(U>(+Grv;+m zLp%;6fOmMr1$#yo9DX&R<7z-Gmne{~%JB-BaZy{(!<%BM5q$DQ|JltS$%Y(avH+rR z2;Oq|lnh(H0N@f7@Ma}tJqNIpt~3*q@FHA-0Gn8Zm!2b(itU*$K!TKuUk)H#%1Nbr zxESvwB5vlWu^${fB3nF2`^m*k1F;eo`O{5OngD-N71uK_NpDJy^`J&1$NpHtVA0!Goqi$VOu9hvQ=atlmr@psojTk$q-sA_*|dl z!w2`F`Qf2A^28Xd@Lbw0q*#WFy^MP-fM3d?Ch5Ub(-glUCy5M6W2GE0K&S%jze>PZ zE=cDf6=HI<7~d&FhI6TT9*yngr~ z4-ks>m?@z(4C)~{&WA(xUnIULox2kD%e;XRQrrN_8s#E8l({^THJ|wK5pk{JNP%+I zwSCcOGe&xQtpp%X$tVUBF6IT$l(fJZq^6_P5WZhOo4A`x*&u?KEAM?jK-?sUo0ZpI zN-0({H+9X|F}7YbDB z<+w*m(qZ+St!~(@aZr~EIGF-?m__HDu&w}qsLC5P++^Yf47D~Zb9uVXfvRu6Q zkszHcbOT6OB?mSE1Y0)te{3k6qS=13q6#EGj)6xfwISFqVtR zo?_ZsE@7QDeX|HVf?{e!*gZU~h5}%h8?~U+VgMf{#&8YDr)03df*8i2QpK1kB`sau zs7tUfltWv|heM=Te;y%@MMzS<99v-1GP%H@2z!%p%@9RKW)KRASA<#R)2Oxsb-gZn<28&Z@o6+?*~#I)OC`C1S=c?+|;_ z`cx(&F`?gry?+soM1#wC0EZRZAw@QHV^74vZldgFrRJX}fct_wWm@|^YoW6;=%9(~s_Zx-4SJ9vSpxL6o*@Gj{tx z^_N+sm}k}V3E27ptz{8!)BNVdX>9t~KrF_V4Z(C;im8G#% zfu^&v;=~4Uf=e?BfKjpc1PY|zXoXaO3F(LR-5(7+Kcu&QgaSW;Y;*^gW^lMI{T9Q0 ztj#^}qd_O#nM{qnZQ(1R<2eFZ!t(9!p z5%qQBL3lbY+!Gm2t@ccQ=p=_K3?4}UPzwMj6ja876d*_eT`o;a3a|ihlnbhfK~)*} zjsuaU08>oT;?dr*z+asdeIAAYK$o;Z0t#kmcab>|u&nEsn8ZN4M%kb~7o6KeV~7+J zN-&)Tj*U>?0SdB$Iw1p9xHJ~fg#wBlY>)|n9{`X5fbV1=LrfY~f`c2{7%T{t0;ben zJrD^*k-G})GWJ7N4}{JJNdtcx%K?W9R;`#o-M$(Vv{+4qvREL4ebzxqI>7P$Bt^Wt zDRclL2!K%*NaBF1D5#^PG89yOsltZeOJ;#KENJHCXG?B3S;=Q{K~0<^qe4t6AVEPJ-WMG~H-ihZSRjD|5m?aNOU12?i~C_4 zbde*_k_&>Yt{qBh`k5~h0dQ#}hFAs=O{-ZMYWG2yTnBZS$O5IW0}bAtV^eN(p+PVG zLKfa(&laN_$RQ;qZ+-LuE-{3Qv?#SU+$GVaG?G~HT|pg1K^35z$!^mXgA(4b7U#P} zG}MnkzX0f;e?T3v;(j`yBks)($LPohb-3WD0ML>vp}=7R@ALP2AWJ$#y$Cq0f^67r zZ3r}kfD$h4>pxwErV3#==9jGN=RJ@q1GTs`@&cg19>Ly9Z`01uF)K*U;P&+@2z`?j z18H9*PuJ+E?h4T-hYjKi6!%eSAM&JL8(89HzF}Gg{H~;`aKP^z$hK^Pd1R2uA1fTC zE-~xfzjc@-A09tEC^Usq1wbkb%DxA%l%R_AvzC;mj}97{jDfEdTH>*_qg1k-esM3T zO9L5zGX1a4ugDjYcuK+>Zk)`?7R?7+MIV5x6i@2h`pQ+5kTZ=%AKhP*pydvvKG~*XI!$lzR~%Q=y_! z3W1H$z1R%`s7`Q+BTE>E5JxqfIbtyGISE;XurlJn)sfv9 z!IBq6oIFE+qNe%&w?0-u=XHbKJgio2ud;t=nZph}rM`NF3yJCDImH6OI1&>IEfVMc zWlYldaYlt|x^>0Sr zJ=y(zzVk)(*EX}`I`?m!n)so4XGyZo*@@GsEk4edR@VF5u1fG)K~l>!U#YgAp;-vy zgqH#}G~>KhX4ze4IbI1b=*H!QiL(l?5B2F?wEOlxzTx@z_B)}@s$Q4x+s&A0HEg8s zIrhM1e0z}jbM3L8=6az8UfAoQg&;m2g4q}%;ScxMPZi8V(u5$!5Xc}0JonrZYMavd zV%fI7u@`AofK$Ivn2alJ;nFkenccJIFK0^gy_zPt2@%`3)aD%ZNlTXuEIs&6aPH#wG zUDr)~vK#^}ZYBgKEf1n{!(&#ahPbL7_uF^D`q#%lZkzh3B@u zO@`8fD~cRmnKt>x1STzgch7Zx{NPG7<_wRRyzFEsFMaLF%wCb%Y-1e#Lb2xiO>Wvd zPVB$>C8s(oq%aJpb&##7&eLue=&Kl=Y^+M&J8N%GKFthc44AHRf409cJA9p1s3fdf zbMp=2Sx2qIc@K&-IdX9&VI5mMU~_;}Gmv$8`)_&JlaBDEdk^)ztM0oXFAE*jWfH#x zKb`rNJv4YX0(ty(psV=$7fIvqBh^cz*9H0(wzWsRT@~`|`T=nx^GEIK$=RbvZ)F7R nk#AWucdXfa=jo`H-O+PVAOE;^`gr@nr*p?Y9euTd1+4!+t*9W@ literal 0 HcmV?d00001 diff --git a/navalplanner-webapp/src/main/webapp/common/img/logos_login.gif b/navalplanner-webapp/src/main/webapp/common/img/logos_login.gif index 4000862199751ddfc2719cdc368dc8a73de3ab73..158c5172452117b763ea8fa51746d0f3d81c86a3 100644 GIT binary patch literal 6150 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 OciVr6?Kd<8IQ|cA$K;p* literal 10341 zcmWled00&C|HsdqZRX5Ur<#(4nfB5$tPds?eOf%CWObH>J zqGX>)PgzfjXY5l*_9@GgeGrQ1=Xd{cU)O#A_qjgr_w{+b?|VvgRPcoKe#RW&8vwLl zx~#l-`udHV6Y6@(_5QJw0VI znN`KZ6Zh|?rKR!KEnTo+!JW5*bzL9t+_@tZ3OAKiJb3Wn@R6emg(5vY9ax_Efk9y zy8qw-Ytwy>GOzpogN|1(XU&?`|Kr!IFGE0n$Ft|pYwmv3-u%ETyKlGc(W56%?{?iI zFTH(a`u^bIqaQzio_O5whK zCrK{Qt#|Hr?XRm>s5F|Q;)I#As%vU{pFLM;iZ*W2wzXeAak6nw^}bt%j!9ur|FoQz zL`ZMmy0vF-b=SS_Gv_ZvN@I5H+P!_pu8z(-m;co_{nHGr$U1gRcks{=?Ut?AuHWeC zefH|r>o;%So;=kQ6#PG<>D|9qu3cyboOFe&qKGtx;+i!g5oxA`2*Z1bP z8s5LJ>A1dSOU1yz;JK#{Ts?h;ehxi-`n0E~XJByf+qZB3y?TA9%aC?-|In|W%r%SN zy?gg<=*O$quZM64H*bZ5F!2A&^Z&R1_XNNi25z(Lr8=s$fMw;8s@GMw z72=LDRnmrpS*Iw|JyoZ9I7UfNWpP?wC`D?jBA#x#;oLQ-|*zC)!Fz@7gl@ zWbUJ0ZQ8Y_cS#XRt8$w&fN;Qk>F3vv#|6ZVu^aW?)1oO$l*YZk)RcC;`Qx?G$t+Ky z=vCQ^DN|i6s59Z}XSb;E6#*lJpI_Xr$3z}};RSv7beXOZiFT*nUE8v)sHLF#s>OY} z;O}jTKbn?Z&rpq|%Kk$gdJOxv)Si3Z{AEf;muIo4tzgnCW81=E=ea*me{o*ib?3%Q z;qHNNrdWnL<@T@v^w}Np8*6xy!Q{mr6XF`g%8r!phY4u5oz^dg zSW<_ueEB)g%cguKpO;4|O;fZMk5lGunh@6;mk!&~yBEtsf}FO*qM%E8Xz=|P;Ry)` zU6!hMXNo60s%q)pp7~X_fa?H*VeFVqIdxUs+Lo8pws*}EV94DG3u!heIl`^M&uQP1 zppQ4i-G*LqOoe?o#|tz9ZjwB|`_Sk-d%;DAXn`pT_3a;SdA=7Z3sa7Rc8kNH94Qsf zC}*iOL9KbBLJJ|D2w?V!qU+4DwjJz7Y0*y2SSO+yFwf$vVj5cl$XjCTRHD7*zx5po zNx7~Swi+SJz?svD)^=vte#HjFC&f?3bk4pFO8~9{!Pc|xNT9JmIPNhq`^-gK8*KL2 z>VKn~FI(St%i730<(3X{nuDAamMr8A;9AYf!aSGe9;y#-4XPmBgH#DuJvetgwYMg7 z`bp1tF5JJk*1MQwE#xmJIm}Xdl%*rf;Z0eiWqT{k(O(yH#_pFyaJbxd31?bQbVRWs z+qloN4_5*;0*o;Aa?EsaFl=P5Zgt6tifIMdWeWeZ)y$tHY#m`La56nxG;K|%Bv#xM zASmF}X`eEOXVVIWkyw#~i(e4FTKYvz!M<+Ls#!*Y6*MjQdf<$OjkjJo@V3gsINdV9 z2cY?0-C=f~B1Uvw59VcLc&VsT8!~KFi~lB3iP(&5Yh`U~W=bhP7gY7;NSVpdPZ0VY9sJ{(POB4A^+3 zSl~(jy<4v`m&R`tWI3>EgEcOvEnqjfLx5Y{KJJ%YSjzz5wD1eR78+p<6ZQhQG zKxL|Ogp~=haG_9z6NNO|vO)-o49MNcv2r8D0QpbT1ce}>^5UmXgTiiYnSjogV5*rK z%;_3@O)6zAl0l1c6`#Oa-Yz=j&fPVLVl6PjTZVha0=yh!D-4VAH6r0Wu2Gq6?#mc+ zCzq1}*REDsFcjU6fQ5+OBaNe7&a>vCkJ46Imc|Rvc-UXi>7N z&&WS113hBWHv~MtXcI!wk(WM_3B!run5VSOeUUFdv9h=Hs7~P|_GOQE6OP<%Y_D4& zDUEkySV0PC+_vPBMDBA=olH5tp_*3_>d40kg-@rhG%84b{L zL}ODbyj0=Fn0;HWJY}O=&JWL!cnh^>T{u`o#0dbLW3i4e+1g|g4tM+FE81&W$#{V+ z%@zLZ@_g8~x;v7;liZw=mobA+w2AUvc+>lp;HPl4`4|Cvnv6adBW@K(d@N2p8z$hJ zJdfwamnaNM1p7HzlKz$%F9ME$OZdangSWfaD13HJ zxz3z0bwZFx=qqZ9fwSj_(H3wAyWN&kPY1^Oa)WXmc&$XMcdp<;63nnYMZxYBBxh9V zP6n^&s8@(^6W$Gsh!I5Dm9}nB+(~E5pBh=UdhrHXfWoT$aK!jS@r<$dX@VA0>nEk5 zMA3iI%5N&{^M{QQi`}3N0`_%YnB~7YT+~NX9mTNHv92752>jHFH#~yODVq zD1$r0Z zSjMiz#rG`Pdui}E3GNatswSB^G=2 zP#_qmC77!KEG9#vB?H~bz@8u2;sxI+ut+^-v5oM@c6_^>r5Le?N=pBHo1gyqZoJ!?}_EEd5JhC6Tj(;$9`VmQKJ`l2a%!GtvdeC~kwC zhUj;rr?Qm+{hJaUKH=IcI0~{8e=2%be~`x&)5#K zy+q4@=;6pM$qTgTPI61eml8{h4fibm=B1k%XkGvT++Vh0q$AAn8KBB6k}$7I1seL*DD3uPi(QE>RjIFn~RM1d@ zv3Q>2Uyo;0$eg1P6C+SwTyB&%$be=8;6zOUec4tV1$u=> z!UcdOz)|c6yy(zvI>1ZE22DI0Ao|Y%FnIV1To!;g8^E{87V@0YqHp+HIb@KGaY0z;aZhGsgwsx=v^Vz*t7Gyy@S#05T2e6pB?$n=ffz^S}Ux%ly;Z zk#+Uxd;|Dr8?tK$T9gR}W@4Eq!ItIY!NTB3Cwzs7F;j+z-vPHmP}P4`o5S~Qy$wP+ z0f21R^4nkv9a>IFaaVlX!1!4a`;^Zr9!yBeA;C<4#@IuUnH>B1HTpsH&Kx`{w04j8 zi0zp!7R!u`KdJ5i^eo^m1HV?_AkHn##QS8}6_OX|h*=xzR<#Mf-_pm1n7nz@8#F4ID!h?-5XmeI_G6y;6=v*hqbfH4GsCfyqQ-?r}##VGEe z@=%Kj33Qh1(*mcB{#UfX?PQE+0OZb?y%sp|9oSDUb=d~AnGhZ>0flA<#7BHgNSguR z9+<%+U>gCCd+)GfA&SwVi$vr+6L?k3DL2*4aK~waan1y;z&*DST+HCrtOdmRV5@P3 z=ZLzu6E;|;*JUpnwdgcX8PT84_&o}~CSyOQxaddB(tz;={#!+yKmWvUn(~?PSdA&0 zrQk{ovoRr7ZzzPTp*k7fOTl(6!aRrYXdQF1krf4+Z!$qs1mLD&ohH(fl_+51M%F6X zj_<4SH>>TJw;W%%X7uoyhG$~)!v;={yxvV-l0#s-aCXUMG=7Ac-T>!c2I@&>xe@3h zxh)hn{UIDL^4=!ry*B7_?pP=9tpXh;WcJKZ(PWev3SkJx>etl9+@BcLN-2 z9Tr2g%ReJQS}erPTyDT(wCu8BrIZ5L$Ebo@3Nr`HCQ)$9I9{$i>V%AY_91rL$gPvj zP0*ijpr8r^BEi`wf2XJ){?m-u6=&~X@g61}9ox$qDMl(LxQGv*hFeb`+b}xQ?u>NK zUQ`I2A~`GN9JvhGOENG4Vrg3Rya`L-nl%8Ntt7VB z2%IqR4hrC03O1v#`dYZqfY}wB*Whex5$A|#)6b9dviyKqTC_wC9Nd1IpNiWIdv4&j z9v^jN1@oiXJnftufYX8_56H`2j=zn>){evTjh=gK*dWC|pkvQ7VwVJXyAE@upyNhp zua2|J6YwO@rBP5d;MqHlec6Ovsev2i9B39pLUDD*#)C#oNc|p}$OSFB)O4wx#$Gyd zJn;re71lxg8+Rn_9C>-#(7&UToI=H?BP}spgijEio{~^rRHcU+^cfz1TlDC=BxfKA z#v>rG6+39mS#Ls)km);g*qu7gynnceG4%$C9iZ5`2Bb=hz9F$)M%2>)H+D5$Am9=hlhY$3=5*4i9l#UZH1YjPs`GTpBC&=X#1)t)#d+ zWXwt8ojo+RN6x*Ma;$33OAVA{0Y@(2NWExNGX>=W z+(Hx3Zki2P;Ygt$%Jdh09s5lsnf2j zYL=91p<^{phwoXL(`e5eez1VkbrkQO*7$wRttq>1*{{Vt76kNY{o*%C&u52$4fW-^ z`fUa?bKzr=6z>(B${}7NzAw=R-kq;whXzsP4tl^3fK2F+2xOX2@>f{&uo!2Fou+wX z5h8>m$cUmj92|WKnX&26923|#0L%wowQ86C4xl0c@(tm-J-9g0P&bES)-Gl5>f>@` zuQ`-z0bRt~{(6D`8<7}Jv_WRbUW-KV*Z%TA!Q1hNcpM#IH79CkzO)6gTFrS_|j$-bYfn#N>>IM5-Kf!Hs^K^>mtmVuExM4VI zqXjV0^64_ve<^!eNOUX>I807zbpLejHzo{|sFeUm2qb|xobsNvVn4f0xMQ8qgDc}A+HB#qVydGa>Kohl~yY^9La4TfNjW8U@ zl(Xj2@TjdQTLykZp@uf-gwBk+?yEV49@ZuDMxf9#bB^|tjUWR|hnx4HsUmbejes9v z7YZ2fflG-`Idbfp09d3=LKWs?O>zG3;Xm`e91k#66=*K;Y5AA&(@3OWhiPuhos57L z0XlwT%orBI!KS0HqCgvfePug-UG!~m_O~~iMx{N$|CMu0W7+$0OMt@27K?2p^rccC z4dGfavV@@=yEg!{u1g>95Ls%w>aAGC>b(`FCT0>@WMuh8bRxSVT1T6E&dOm2cWg0A z?Cd#vvi;MAyv-uEmzVf}ww0gsKq{ARIjkYmX9lH(wK?-nyE@Bwk~;hfUma^#zr(Ph z-J=HcDyyt1P&K(MI6|f5D~tTqbM_m<{c;t4d2EAca5Zjiu{f1{ap$8-wbRF^v(#_p zX1!Hu*^VVCpY)&RU*ER}azdGDSieNSxZD^Gy~{ zi>)49D&Chosl-M0cw9A0Qv7Az(BPL3|2=*B`=g){P&k0X*TUjpQHHC9WQ>QdW`o0= z`N$7TwqzvY5$m`gw2@}ArqNQ;@+Cd822H$9DguyZ0?a3b$LRpRM#!vjyNt@3U^u4s((LHjHq(atWJo&GhX26_5YDYjo}+hT($T%9ixWow5Jx zKXGSfrdO3uN_y?~SC%niOdT;8Q8gs&Tw zNEeQt&LACoN?f!!SB&&cs;Z%c@(CMmF&v4C- z&)i`!4FW)ERkwpMGbq}TYsvpkmoyZaWsV#-#yHHt)B&?v8Qx=v0&JQG18PV=*7E{P zjZ#!whq>?SH$>bM5rrO=68M7jY15I;AMEBx<-FX1u9jjSrsP((@oiE+s*t?kjtKkskO@&XGxAh_u6cdQWHm-qh)pzc`lZrP;&&A9 zb>Kaak%%X*5$5XI51L7{I)cXsdiafHVZ2VU#;#Gxlcvxevvt)r*#(y2l?6XzjIg?r zWF@huRrjOgeUGGLqbSDs0NSkM`LsXQTHW}crmR?X1ho0?ks9`h`v0dR>q|srKpw61 zo|riz$fPn`O9Qce0%=u!f!pklNSqYR&cVUMlN4rbc%OBZ6bhW#fw22)Y|lv{x6@iQ zV=ZWV%^>+)+CW-9P$D^`dQ>N^B%HDs`^aZsN>|5bU0y842lue*iSzs+z=8xMG_Vb{ z7#0vakXiGx0@9JtRN8fo4zyT`nk{it!SfHnHuMfMKt-@-P_8!iBKA1L3U;4JG0BVM zB7Od@_Ie_$v6Yc$BFv~1y_MNEbhb*dM=WKronodVq@%DrTRgIVmTYvN#N0)uce^O> z^flDM?$ZkVCdoGkTxV3JOAk6J^H~n89!snU^o9ir)a^MOm7hKG@v6(wm)@~$D;4Zc zi;)w~Z`@Q}t@27K(@yWB!cMRv!}2WH!F{9^Fc3Me++xGLA_x9?efx;@t!Q#~Souo5 z%A1rZ5c)QMC0TD-CsDX)!Q%}&m3!Ss&Ky2vdpuF?R?=HMr&Bp>(XG^25!^SgB?78Y`w1w1Amp;#|hIaO|Ek0c6(eK?D?b>=^3UK|a(UX*yQ zHr^H`4l!*k??z7x3|KD%UCuiLYM`xR7Yjl96l|M;iz6XlxHR0y4F}ou#Swe)i(ZGy z(4agAUX4-hS=WJ${;kLdua*>sKJs4uMF7pxhTHQ$G8ca}0x#vQ7ZOCuwWAqqCcv18 zeoeRkuQ_c@u!sCh6P(U^WVNU&y;*Sc5wtj%mSDR#UmC;6@tOMD>Ne7#l``dkb{ z`TC8%KNqEJUI1M*`N~}x&z)^47Nb6_{J;90L&kl<-!1;t-PVmMW8_TE%G!A1L&4_v zMH)-{WAv1abxX__{_&T(yA3!!#X>4pjGmw;1BDDMQcN+Qt_o~={4@P8Te9oa*N>KO z-4z{ck!LIqG*!&a?zm9}`Vim9BQlgL$s$j5I0b3C{9R~_o))mjpGWrH@j@~$PPnW!M^V*>wBi@tpKu)I_Zgla_H3x~b2Y1?bwD zlmF<=e|?`%gip2`ZeSWeFu**W%bha^aXJ$U`-?{O;nbHKi{TA($7w?O45gZKCl%X-ScvRo5pZ$~taMd&2vV6_ZGsojNGgy(s zLNFF1{V=(?wU8|bVzhAj3c&0P%p^9&_rd26shHWoWRBU|Zu^(PX79AB7&%!sl@%ig zmXS!T6q;HOEXzLU)2yaq$oaMvG4;U90dTqiPN;8sR>Wi$A(J0!m~yh~@P+RWL%~;y z@nXPr?L`Y)vUi-eek$ZcD1GE8W)L2hpLZ28Tuq>mMED}ctN~Wc0AM90-}}1_FBB_; z`QR-4g3682KaOdaDS z)WZ`gV3a}Sq6?ZTLq}17v(`FTuZkNup~?s1*8eY=}$M#iZiqwQ@*IZ0FFB_OqU+zmVGNe$l4#~uss1cT% zRMWI%lHfNzG3J_(WC{pMQO}YBu|Q#*4B-vxYo<=wKPPto;V?e{T<|6=+5r3I1D;02 zilqolEV33WVWWb5B|OV*OF$9gE!Y`AO1A<9;X2eshy4y4^C{+B1I!U9=Ld(iXN_1z z6i%cR4kBPUH9UInHS=xl1?&_u*}#Y$fa8gJ744KOEtv62<#!Nb%c0nm{Uxu_Wpedu zlY;jV&e1W{*_t?(SB^<>$XI_k2Ab!lN$yj5_aUR`0+k7}Ax15v$fW?VxDSji8hxfh zGu;-MD`N?1IJg-d4IrbsRc()^kt-CF00#GljQ3b(_D+WPL3c~Ielp}$D{FK%vP|ooOa`e=Y zf1DJV2B4$5tr>l1;CgkO9BB=c9cOD|2mCVhaFbS*k^%%jP<_vo8(I%M4bjZCqo@~G+$ z`GeOT%%zlq6TVcWO=GN+rRqDr6P|(7RKjAyFD%a%zS-r-q4MwL(L3xam1e~P~fM@Ywykj zy$NU%(IH~4(?dg6n!w6`X1|#W?;+U7h?H8@C>i7J-OkHf4l$Yt+$`O~J7SfgFt-SZ z!Zl{^6YOl$N32h`bqO)2=We+(S%2nKs$-$;lk_p~d#0Yb;Lr^Ib^C(wJQ(EXJvJ`G zd2U8$uV!>NIS%)O+zLI2jB)2PJnQz9JyMJ$G@idQL}r=4`fg-cX8KRc42a7N3!Ix7 zv@~=4`pn=>nG^P8h8)ZM-}%gmH#0+@WKMdYIr&$n*epvjCM(Q4D|}K`L|j(n+^ndj USyR?$NjGIh?|J@%#{&NMf3%yCA^-pY diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul similarity index 53% rename from navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul rename to navalplanner-webapp/src/main/webapp/common/layout/login.zul index b16f6b679..4b44cf195 100644 --- a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul +++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul @@ -17,40 +17,39 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> - - +
- + + - + - + - + - ${i18n:_('AUTHENTICATE')} + + ${i18n:_('Access to the system')} + +
+ ${i18n:_('Help')} +
+
- - - ${i18n:_('Incorrect authentication')} -
- ]]> - - - + - + + @@ -58,35 +57,44 @@ ${i18n:_('User')} - - + +
- +
${i18n:_('Password')} - +
- +
- - + +
+ + + + ${i18n:_('Incorrect authentication')} + + ]]> + +
- + @@ -94,7 +102,12 @@ - +
+
+
+ + +