From 65e42f6d4392a9863a2f2c0e88e90558ddd7fbf6 Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Fri, 25 Jul 2014 20:15:34 +0200 Subject: [PATCH] =?UTF-8?q?Stylov=C3=A1n=C3=AD=20vzhledu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/locales/zk-label.properties | 3 + src/main/webapp/admin/index.zhtml | 11 -- src/main/webapp/app/info.zul | 106 ++++++++++-------- src/main/webapp/app/mainMenu.zul | 5 + src/main/webapp/img/house-016.png | Bin 0 -> 585 bytes src/main/webapp/img/house-032.png | Bin 0 -> 2390 bytes src/main/webapp/img/lock-032.png | Bin 0 -> 2085 bytes src/main/webapp/img/material.png | Bin 3453 -> 0 bytes src/main/webapp/img/painting-016.png | Bin 0 -> 816 bytes src/main/webapp/img/painting-032.png | Bin 0 -> 2077 bytes src/main/webapp/img/palet-024.png | Bin 0 -> 1456 bytes src/main/webapp/img/palet-032.png | Bin 0 -> 2231 bytes src/main/webapp/img/pickup-024.png | Bin 0 -> 1108 bytes src/main/webapp/img/pickup-032.png | Bin 0 -> 1724 bytes src/main/webapp/img/unlock-016.png | Bin 0 -> 893 bytes src/main/webapp/lists/buildings/building.zul | 84 +++++++++----- .../webapp/lists/buildings/buildingForm.zul | 89 +++++++++++---- src/main/webapp/lists/material/material.zul | 68 ++++++++--- .../webapp/lists/material/materialForm.zul | 39 +++++-- src/main/webapp/lists/service/service.zul | 62 +++++++--- src/main/webapp/lists/service/serviceForm.zul | 32 +++++- src/main/webapp/login.zhtml | 27 +++-- src/main/webapp/login.zul | 54 +++++---- .../requirements/selectitems/selectItems.zul | 4 +- 24 files changed, 395 insertions(+), 189 deletions(-) delete mode 100644 src/main/webapp/admin/index.zhtml create mode 100644 src/main/webapp/img/house-016.png create mode 100644 src/main/webapp/img/house-032.png create mode 100644 src/main/webapp/img/lock-032.png delete mode 100644 src/main/webapp/img/material.png create mode 100644 src/main/webapp/img/painting-016.png create mode 100644 src/main/webapp/img/painting-032.png create mode 100644 src/main/webapp/img/palet-024.png create mode 100644 src/main/webapp/img/palet-032.png create mode 100644 src/main/webapp/img/pickup-024.png create mode 100644 src/main/webapp/img/pickup-032.png create mode 100644 src/main/webapp/img/unlock-016.png diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index d2d55f7e..9f0ab6e5 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -218,7 +218,10 @@ Permissions=Práva NumberSeries=Číselné řady User=Uživatel ChangePassword=Změnit heslo +Login=Přihlásit +Loggingin=Přihlášení Logout=Odhlásit +WrongNameOrPassword=Špatné jméno nebo heslo DateFormat=dd. MM. yyyy diff --git a/src/main/webapp/admin/index.zhtml b/src/main/webapp/admin/index.zhtml deleted file mode 100644 index be965415..00000000 --- a/src/main/webapp/admin/index.zhtml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - -Objednávky - - - administrace - - \ No newline at end of file diff --git a/src/main/webapp/app/info.zul b/src/main/webapp/app/info.zul index 5be89c4e..b1a6f57b 100644 --- a/src/main/webapp/app/info.zul +++ b/src/main/webapp/app/info.zul @@ -1,47 +1,65 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul index ed19343c..18e917dc 100644 --- a/src/main/webapp/app/mainMenu.zul +++ b/src/main/webapp/app/mainMenu.zul @@ -29,6 +29,7 @@ label="${labels.CurrentRequirements}" href="/trips/requirement" /> @@ -37,10 +38,12 @@ @@ -49,6 +52,7 @@ href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}" /> @@ -97,6 +101,7 @@ label="${labels.ChangePassword}…" onClick="@command('passwd')" /> diff --git a/src/main/webapp/img/house-016.png b/src/main/webapp/img/house-016.png new file mode 100644 index 0000000000000000000000000000000000000000..00bc7859cb71106f15a48b9e82dfc7a50fabc06d GIT binary patch literal 585 zcmV-P0=E5$P)zT9H7z%u~82Zba%HHmuG68G= zmzKSRN!84Y#}1tn18IfA!^fyzVEX@`;m_Z{42+D73?RtN%!Cpq$OgRq@R8xf$+M`@h!23G7-j$n zfHd!&+rh|~(LMJ+I~ywlJ1Y>gu|a881~w>-EWZ2X8L$B`&ERxEiUHFWE(hBV(+mOt X_+9VkEO~c)00000NkvXXu0mjf-DDL> literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/house-032.png b/src/main/webapp/img/house-032.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c14f0af78433b9e57fb3cddacdbf2ff53b81fa GIT binary patch literal 2390 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 IM6N<$g5w>KrT_o{ literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/lock-032.png b/src/main/webapp/img/lock-032.png new file mode 100644 index 0000000000000000000000000000000000000000..0751daa1e5ecc10ebf2c64717e80fff1ea54c33d GIT binary patch literal 2085 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 diff --git a/src/main/webapp/img/painting-016.png b/src/main/webapp/img/painting-016.png new file mode 100644 index 0000000000000000000000000000000000000000..015c48829821eb2923c7c015559f6bbe9bc354da GIT binary patch literal 816 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 Hu0mjf!&&PX literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/palet-024.png b/src/main/webapp/img/palet-024.png new file mode 100644 index 0000000000000000000000000000000000000000..4f70b384b8f6cecea2d4dbee74f909d673c91025 GIT binary patch literal 1456 zcmV;h1yA~kP)A7%6~}+~zK?nH<|`gY@z|aW6s1)fftXI}+D!1QsD+4dR((lSz*Ym5E zWqo=6{Q1`W{5XmtyWP0r2ko7cK{J^SMs1CH+7VgbL4#h$00V5CS1U2#pYu zC=_(sn)WTJ)@#Q8&bG6vwO&=4Y8V8+Sguxg#sDV3^s!T=jGK}5)`$4PK8e;0`Z0-0 zFbqkOq=+J$cDKb|E5P>?3?m|c#FTDU6ort*IEhXRL_Lh6%fMFv65wXzJ-fR8Cf(j1 zN`p!?rjh5|+%L)JGGsFeg+k1I_mn|vynaLwD55ANn{__P<@39NADqkOatoGa-6oR+ zKx12$#xx{KDWuF0MjkhA{*E{fhoCAXj9Pg81f>#^SPwNex_{7GFRs*TiyCC2lG^}G zfbH$Tbkmw_-bP5U4YSSCLAa%3$zwU!*UJ7a33f~ z%>R|Nvue@Hg49$b_7W* zh~t=7pXP(JmEgG_KBWJA;=X&HdgY}b{l9~DciHg*4M?ORP+AcT_Gz{@@PZyzN@6<_ z1lW!w@e=$&f{>CZ(nNlj+D?zP^$^1lm7iU7K5Pe{JrDeL2+#@5Y*u2J8dKY3(@)at zEYR^j$1o&X3$)f~px2F%QUZcF)`WqgY;6(r)BNOOhUqDntDo-6I7vJJtrV+=?U0S*KqQJ z6j_X50=;X~4Q z(C?qMEMsnY>H3_Mvb43+l`p>V1OD;P|IpswCrC^_tL>nI4&RzB@OY)gY$=0f8*J_d zWTy&T{$q##Hq2)PhuGgf`iS@6eUmE-S3aoB9({VUkjC$I`1jIHGR0ZkV40MY;(?06 z#YY?(ZO!t=fQ%i{HS?@hTfB44dh}2LfCtZbDHlTuQKT> zYAqWhD=vhPf$x>2lag8~gp_QzBXk7Em4Y~? z)f4=sHc2k6DQ0`rHU~`QlzMM*Z((U|@J<{j{@nm1Ahp)c>e|iSVj)+}=5i-g94RTK zjD<~{C{z;T#W}20iYd3rv>p3e>)u-*`)~jKy7v~a2(<1dksMvXJWv51G7R}`t+nH( ztQj}$96M6Tl^-qNa=+M;Vb>^CN?DH^_5PI`TkYQi9|NnvJ`mmwzy^*1_X0-%XOznW zS-=HSV-)P@>(GJ*n1~x+peD09qF#8`lx1K-zV=7|+0000< KMNUMnLSTZgE52O- literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/palet-032.png b/src/main/webapp/img/palet-032.png new file mode 100644 index 0000000000000000000000000000000000000000..a19c177f2c80614192c9d8ae1eefb8babb62d49e GIT binary patch literal 2231 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 Sju_Jb0000^Y9 z4OYz%b8PKl1_s8q0G|+7pkQNjQ%-)qprG*Cb7w_FMB6&rMMcF*%1R503fnt7+B-Uc z3L2Ukfg(UgVR2D$X-Ru~dsc3CKyYAvV}pZ}6HqoWIVr!OASNyrsHUg47f8avF{f=? zp4qoQx9@o2*!|L}?YVRFBj@(#&Ydq@x`F7WTiYXFt4+TBFa15Y`UeLDh6Vvm2o4Vk zkBW%sx*wGg9n*V1arTRp%#^gu^t9}>^aU@nan@cOp%Bw3Xsw%4Ls%vU%YwPOj z8|v$u8-OlpowKm5>O}9HxqZtIPna}u^5n@=r%#(YW9qb-)28h>Jbn7~IdkXCnLBsx zym|9)eP43-%aX@`R;*mHY4hgITQ+Y4f*sp-@4R~8z=1=D4jn#nSAVfNe=>$ab~{qWJVS8w0G|M=<4?>~S3{aY-pGXbcTG0EHA zrBP_tx_>~?M5Q)pl2@Fhikw>qDxJK5oX*{^7xo+j^)tZ-{HF9}Of0lXbM8-4` zFK5;#tCcHf&Zr1J^<*JaQQ^d#J25$&qFe!tZeky|%$ZY?svEkZA)u_*IXT(6cAZs= zzCe7WXl}lIY^bC@m)HcIHKis7CRfVW=uTnzXz6^KyT@nETHjvoQ->`YnQ9LH+&ImQ zkI$@ZC2l`aC#5JNMC9x#c zD!C{XNHG{07#ipr80i`sgculF8JSrbnd=&uSs56V+OzwhXvob^$xN#RYA~?W1tOpZ eL!dfSD+3c<5NWXT(rqoE1_n=8KbLh*2~7YbRD#_A literal 0 HcmV?d00001 diff --git a/src/main/webapp/lists/buildings/building.zul b/src/main/webapp/lists/buildings/building.zul index c1693c99..ad062fc3 100644 --- a/src/main/webapp/lists/buildings/building.zul +++ b/src/main/webapp/lists/buildings/building.zul @@ -1,23 +1,47 @@ - - + + - - + - - - + + + - - +
- +
@@ -27,7 +51,11 @@
- +
@@ -37,7 +65,11 @@
- +
@@ -45,7 +77,6 @@
- - - \ No newline at end of file diff --git a/src/main/webapp/lists/buildings/buildingForm.zul b/src/main/webapp/lists/buildings/buildingForm.zul index 7dfea89f..d5fcd9e0 100644 --- a/src/main/webapp/lists/buildings/buildingForm.zul +++ b/src/main/webapp/lists/buildings/buildingForm.zul @@ -1,53 +1,102 @@ - - + + - + ${labels.BuildingsFormCode} : - + ${labels.BuildingsFormName} : - + ${labels.BuildingsFormDescription} : - + -