From b352a24255e33ae26f03842ee7069ee4c8a26fda Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Fri, 3 Oct 2014 14:23:19 +0200
Subject: [PATCH] =?UTF-8?q?Upraveno=20form=C3=A1tov=C3=A1n=C3=AD=20data=20?=
 =?UTF-8?q?a=20=C4=8Dasu=20v=20panelu=20stavu=20schv=C3=A1len=C3=AD=20po?=
 =?UTF-8?q?=C5=BEadavku.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/locales/zk-label.properties    |   1 +
 src/main/webapp/img/approve-016.png               | Bin 0 -> 740 bytes
 src/main/webapp/img/approve.png                   | Bin 0 -> 903 bytes
 src/main/webapp/main/approveStatus.zul            |   8 ++++++--
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/main/webapp/img/approve-016.png
 create mode 100644 src/main/webapp/img/approve.png

diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index 93e135cc..1770af3b 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -304,6 +304,7 @@ LoginViaGoogle=Přihlásit účtem Google
 
 
 DateFormat=dd. MM. yyyy
+DateTimeFormat=dd. MM. yyyy, HH:MM:ss
 
 AddItem=Přidat položku
 SelectGroup=Vybrat skupinu...
diff --git a/src/main/webapp/img/approve-016.png b/src/main/webapp/img/approve-016.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a07d675ab441468ea77b05ffab080c4472e45a
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vr0}BZzvwyMW0007mNkl<ZILn<<T}V@57=FI*oNewL
z-P~9+W10mmso8GqLK2}xYAl<YKY=9lV_Ecf5klA9Xc5#^1pQEC)RHVoOYNr1A_&C_
zOJ^)-BWWdbJD#(1zOM_(u!z#<>bZEI=Y4qJ2UrG<e8^qk1k1$H$y_@aFA$e1JpN`C
zvey|%Oe)6+A)`x5P&WkhRs#E8+RK$hrq5&+ee{3DJrifqTM4v{*vh|-YXg~C^0c5L
zEB;U6i9tU$U7P2v&u!~N-BK)gT~hYHviSi3^<imYxaq$0uSU&%*`;;&q^X@Zti1WL
z+z9|R!vKBIltz8n+R*YaPYO3CP<Q*+i$b?@elBU$6gI>RUL;z{3%gr70{|Y&T2KJc
zHRPw1<hxxrv)3e}#=>XRq;9XhBcBFAn3~}bL?oe;!~O54IRIR)h|Kq(>XPi1@(?x2
zU~0-3;2NEv0&+wv0@RFRY9gFzAgM2`qyK<%zNIH0-3_tDMcRHbYe%6sf52qdF{>pw
z2PYtaKukPGSV5-7K0g|0PuKo_8#<pr!tklNCo@r_&CQF|&7K<KU%8E!xVLh@J3vw~
zjFPE>-MM#xb3+IJG#EUYM%4uydfKB`$45R^MaQONg>nh;xwl{@rl#J$p4i*pHEw+0
z1K1*^iz9?WA^3bgIGs+Its)vWc95*q5JO!>S2~}y@(qX30sv)YWi${75K$E2a5&)g
zdQn|n4H66n5s5@h@pxQPRn@BNx|K0*(e(_214Z~I#zm0}giw_bGA9UvVzF2hm&=v*
zcs!b@swy&>OolO*lx2C=Y&KKI7}a%yX43qV;9`Ul$^}7Slv1W?8q+k58-~GDRmBf!
Wd;HNda4y^c0000<MNUMnLSTaYxkl#z

literal 0
HcmV?d00001

diff --git a/src/main/webapp/img/approve.png b/src/main/webapp/img/approve.png
new file mode 100644
index 0000000000000000000000000000000000000000..e155d419f8e8af7602b16dc3b252fb3c45c5d170
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0009{Nkl<ZIE}TF
zTWDNW6o&t`&t*=WWRkgcl14(~TOvv-L48qVkP@UpQNcz;5WGMX?VDI>l0wA?L99<&
z6R1S7#rmKfwWO3nGfAr{t)Ul~bSi0+PAq9=oZHEnbN0mt$&i|aiWwK|r?vLC*ZSAL
zNhyW@BlKDWE7Hd7@)W4n9rve$y9g@JY6*QS9oZ&a`6)n|nt|WG(&{fPRF0JY5T#bV
z^HNQ~?_YjI%jb%RvMKSfuTlGA&$bD%>E(T%dX46mt{hmJ5zpTfVYfA9eg<sP72jRk
zPvbWa?=Q^DH;ECfCbsWj_hN2S;K8#`vQ+Mu51gEMSGa(G3;V4>iymCb|0lb>GuEXq
zET<26w(1uipqb#ldM$o<XJLG$rn<c6zV#2ka5Nmg8+6yvaAZDz^%$?HelS2Y0jAR@
zhj!c?UtL!P3y%9;&pH0=*TJnDL7y27JXYb(6lv&T2A~-L6fV_KV6SC1+)-QASUC9E
z3ei69xEFVh_&?HN9NB(v{Q5$EmSqZ8yP(V6Mg#hEi>l4IMOBtA>-(xN<NULUs>V+b
z2cu+p7X!^k%=J8YWhJDCJP1tpq0#UYtspfr;1szk-;%HY_(pknz3Hm2fB$N3(aEY;
zSSjE(huRQnY0?6%dZ=M5YpM$~(k+5+Y6#W0z^{c+%!tt^?t5`$BiYutqUYnrmpeK;
zMq1jUx`c!$mmw4f0GP~z6biqdnYtjCjmHza7fb&d3;;Vm3_kThXV*8K4|W9Ds!y+!
z#Hr+orOb_6kDlC9N^b<cLyFZg_FnF%^XJcXpB|e?R{kVJ>)H^lYePCU%de*vUb-6;
z0JNc@p>-4D_gL;idSdk4<<s-|Lg69BSzzqs@x9I0dcHjNLxQHKr;$pfC>#zW7!0nt
zPm`0A7#tkbW@cveVzFqtu4@V*Oev+IlrjJqR!G%v*^cfTr_@==!HGx^kw-)xW6WcW
zxu$8le!t&sZ*TVo1_p%gc^+)r2IriF5KJkxax?(Clv1~EgU_D86#n)-DWwR20w9%A
zQYpoR5R7w9wrx|XR9b&|i9~{u$t33H<|v!Zl5N{?9ESkFvMlBE`4EXjR4f)#@pv4)
dy}fH7e*vRkj;PLrsv-aY002ovPDHLkV1i7Pv7G<_

literal 0
HcmV?d00001

diff --git a/src/main/webapp/main/approveStatus.zul b/src/main/webapp/main/approveStatus.zul
index 093c02b8..8776a7c9 100644
--- a/src/main/webapp/main/approveStatus.zul
+++ b/src/main/webapp/main/approveStatus.zul
@@ -2,7 +2,11 @@
 <zk>
 
 	<label value="Stav schválení: "/>
-	<button label="Schválit" onClick="@command('approve')" disabled="@load(not vm.canApprove)"/>
+	<button label="Schválit" 
+		image="/img/approve-016.png"
+		onClick="@command('approve')" 
+		disabled="@load(not vm.canApprove)"
+		sclass="nicebutton"/>
 	<vbox children="@load(vm.dataBean.workflow)">
 		<template name="children">
 			<grid model="@load(vm.dataBean.authorization)">
@@ -14,7 +18,7 @@
 					<template name="model" var="auth">
 						<row visible="@load(auth.role eq each.role)">
 							<label value="@load(auth.approver.fullName)"/>
-							<label value="@load(auth.authDate)"/>
+							<label value="@load(auth.authDate) @converter('formatedDate', format=labels.DateTimeFormat)"/>
 						</row>
 					</template>
 				</rows>