From 7ccfcac4436d7babc529e274b095fcae0f61b0cd Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 15 Mar 2013 11:38:07 +0800
Subject: [PATCH] IDEMPIERE-724 Zk: Make iDempiere theme more easily
 customizable. Fixed broken image link.

---
 .../WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java   | 6 +++---
 org.adempiere.ui.zk/calendar_mini.zul                       | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
index e77a985496..1bf590df8b 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
@@ -462,17 +462,17 @@ public class WAcctViewer extends Window implements EventListener<Event>
 		forcePost.setVisible(false);
 
 		// Elaine 2009/07/29
-		bZoom.setImage(ThemeManager.getThemeResource(ThemeManager.getThemeResource("images/Zoom16.png")));
+		bZoom.setImage(ThemeManager.getThemeResource("images/Zoom16.png"));
 		bZoom.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Zoom")));
 		bZoom.setVisible(tabbedPane.getSelectedIndex() == 1);
 		bZoom.addEventListener(Events.ON_CLICK, this);
 		//
 		
-		bQuery.setImage(ThemeManager.getThemeResource(ThemeManager.getThemeResource("images/Refresh16.png")));
+		bQuery.setImage(ThemeManager.getThemeResource("images/Refresh16.png"));
 		bQuery.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Refresh")));
 		bQuery.addEventListener(Events.ON_CLICK, this);
 
-		bExport.setImage(ThemeManager.getThemeResource(ThemeManager.getThemeResource("images/Export16.png")));
+		bExport.setImage(ThemeManager.getThemeResource("images/Export16.png"));
 		bExport.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Export")));
 		bExport.addEventListener(Events.ON_CLICK, this);
 		bExport.setVisible(false);
diff --git a/org.adempiere.ui.zk/calendar_mini.zul b/org.adempiere.ui.zk/calendar_mini.zul
index aca1bc225a..c4e7f5e73e 100644
--- a/org.adempiere.ui.zk/calendar_mini.zul
+++ b/org.adempiere.ui.zk/calendar_mini.zul
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?component name="divarrow" macro-uri="divarrow.zul"?>
 <zk>
+<zscript><![CDATA[
+	var calendarIcon = org.adempiere.webui.theme.ThemeManager.getThemeResource("images/Calendar16.png");
+]]></zscript>
 <style src="calendar.css"/>
 <calendars firstDayOfWeek="Monday" model="${cm}" mold="month" id="cal">
 	<toolbar sclass="calendar-toolbar">
@@ -13,7 +16,7 @@
 				    <separator orient="vertical" spacing="2px"/>
 					<label id="lblDate"/>
 					<toolbarbutton id="btnRefresh" label="Refresh" class="refresh"/>
-					<toolbarbutton id="btnCal" image="/images/Calendar16.png"/>
+					<toolbarbutton id="btnCal" image="${calendarIcon}"/>
 				</div>
 			</hbox>
 		</div>