From 452ea9c6985d2c259a802fbe75b4878f1a608e64 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Sun, 1 Jun 2014 15:19:02 +0200
Subject: [PATCH] =?UTF-8?q?Kdy=C5=BE=20nen=C3=AD=20vybran=C3=A1=20sestava,?=
 =?UTF-8?q?=20tak=20je=20zak=C3=A1zan=C3=A9=20tla=C4=8D=C3=ADtko=20"Tisk".?=
 =?UTF-8?q?=20Sjednocen=C3=AD=20vzhledu=20dialog=C5=AF=20tisku.=20closes?=
 =?UTF-8?q?=20#82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isspst/ui/reporting/ReportDialogVM.java      |   2 +-
 src/main/webapp/app/reporting/report.zul         |   5 +++--
 src/main/webapp/app/reporting/reportDialog.zul   |   5 +++--
 src/main/webapp/img/print-button.png             | Bin 0 -> 3429 bytes
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 src/main/webapp/img/print-button.png

diff --git a/src/main/java/info/bukova/isspst/ui/reporting/ReportDialogVM.java b/src/main/java/info/bukova/isspst/ui/reporting/ReportDialogVM.java
index ba37c19a..9e525e3b 100644
--- a/src/main/java/info/bukova/isspst/ui/reporting/ReportDialogVM.java
+++ b/src/main/java/info/bukova/isspst/ui/reporting/ReportDialogVM.java
@@ -46,7 +46,7 @@ public class ReportDialogVM {
 		return selected;
 	}
 
-	@NotifyChange("optionsForm")
+	@NotifyChange({"optionsForm", "selected"})
 	public void setSelected(Report selected) {
 		this.selected = selected;
 		reportDefinition.setReport(selected);
diff --git a/src/main/webapp/app/reporting/report.zul b/src/main/webapp/app/reporting/report.zul
index b8710f9e..2e44cbac 100644
--- a/src/main/webapp/app/reporting/report.zul
+++ b/src/main/webapp/app/reporting/report.zul
@@ -1,10 +1,11 @@
 <?page title="${labels.ReportReport}" contentType="text/html;charset=UTF-8"?>
 <zk>
-<window title="${labels.ReportReport}" border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
+<window border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.reporting.ReportVM')">
+	<caption src="/img/print.png" zclass="form-caption" label="${labels.ReportReport}" />
 	<toolbar>
 		<toolbarbutton image="/img/send.png" tooltiptext="${labels.ReportSend}"/>
 	</toolbar>
-	<iframe width="800px" height="680px" src="/api/report.pdf"/>
+	<iframe width="800px" height="660px" src="/api/report.pdf"/>
 </window>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/app/reporting/reportDialog.zul b/src/main/webapp/app/reporting/reportDialog.zul
index 6017a6b2..6a38a10c 100644
--- a/src/main/webapp/app/reporting/reportDialog.zul
+++ b/src/main/webapp/app/reporting/reportDialog.zul
@@ -1,8 +1,9 @@
 <?page title="${labels.ReportReports}" contentType="text/html;charset=UTF-8"?>
 <zk>
-<window id="reportDialog" title="${labels.ReportReports}" border="normal" apply="org.zkoss.bind.BindComposer"
+<window id="reportDialog" border="normal" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.reporting.ReportDialogVM')"
 	closable="true" width="550px">
+	<caption src="/img/print.png" zclass="form-caption" label="${labels.ReportReports}" />
 	
 	<hbox>
 	<listbox model="@load(vm.reports)" width="250px" height="350px" selectedItem="@bind(vm.selected)">
@@ -15,7 +16,7 @@
 	<include src="@load(vm.optionsForm)"/>
 	</hbox>
 	<hbox>
-		<button label="${labels.ReportPrint}" onClick="@command('print', window=reportDialog)"/> <button label="${labels.ButtonStorno}" onClick="reportDialog.detach()"/>
+		<button image="/img/print-button.png" label="${labels.ReportPrint}" onClick="@command('print', window=reportDialog)" sclass="nicebutton" disabled="@bind(empty vm.selected)"/> <button image="~./zul/img/misc/drag-disallow.png" label="${labels.ButtonStorno}" onClick="reportDialog.detach()" sclass="nicebutton"/>
 	</hbox>
 	
 </window>
diff --git a/src/main/webapp/img/print-button.png b/src/main/webapp/img/print-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb62812e194c446392ef7ad6cad7574dad42433e
GIT binary patch
literal 3429
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
Hu0mjfI~#j1

literal 0
HcmV?d00001