From 6c8e1d4d0a057c070ff62d07c218042007856506 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 10 Apr 2015 13:19:44 +0700
Subject: [PATCH] IDEMPIERE-2569:ZK7 - Unexpected token in DSP/CSS

---
 org.adempiere.ui.zk/theme.zs                  | 13 ++++++++++++
 .../default/css/fragment/adwindow.css.dsp     |  2 +-
 .../default/css/fragment/menu-tree.css.dsp    | 20 +++++++++++--------
 .../theme/default/css/fragment/tree.css.dsp   |  4 ++--
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/org.adempiere.ui.zk/theme.zs b/org.adempiere.ui.zk/theme.zs
index d12e7895bc..8c59083bfa 100644
--- a/org.adempiere.ui.zk/theme.zs
+++ b/org.adempiere.ui.zk/theme.zs
@@ -3,3 +3,16 @@ var themeStyleSheet = ThemeManager.getStyleSheet();
 var themeStyleSheetByBrowser = ThemeManager.getStyleSheetByBrowser();
 var browserIcon = ThemeManager.getBrowserIcon();
 var themePreference = ThemeManager.getPreference();
+var fontSizeM = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeM");
+var fontSizeS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeS");
+var fontSizeXS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeXS");
+var fontSizeMS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeMS");
+var fontFamilyC = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontFamilyC");
+
+if (fontFamilyC != null){
+   fontFamilyC = "font-family:" + fontFamilyC + ";";
+}
+
+if (fontSizeM != null){
+    fontSizeM = "font-size:" + fontSizeM + ";";  
+}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp
index e6f6aded3b..56899e6bc2 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp
@@ -134,7 +134,7 @@
 
 .adwindow-detailpane-toolbar .z-toolbar-body .docstatus-normal .z-label,
 .adwindow-detailpane-toolbar .z-toolbar-body .docstatus-error .z-label {
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')};
+	${fontSizeM};
 }
 
 .adwindow-detailpane-message {
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp
index 8b32add3f8..07f925098b 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp
@@ -2,8 +2,8 @@
 <%@ taglib uri="http://www.idempiere.org/dsp/web/util" prefix="u" %>
 .menu-treecell-cnt {
 	border: 0; margin: 0; padding: 0;
-	font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')};
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; 
+	${fontFamilyC};
+	${fontSizeM}; 
 	font-weight: normal;
     overflow-x: hidden;
     white-space: nowrap;
@@ -14,15 +14,16 @@
 div.z-tree-body td.menu-tree-cell {
 	cursor: pointer;
 	padding: 0 2px;
-   	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')};
+   	${fontSizeM};
    	font-weight: normal;
    	overflow: visible;
 }
 
 div.menu-tree-cell-cnt {
 	border: 0; margin: 0; padding: 0;
-	font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')};
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal;
+	${fontFamilyC};
+	${fontSizeM}; 
+	font-weight: normal;
     white-space:nowrap
 }
 
@@ -38,15 +39,18 @@ td.menu-tree-cell-disd a:visited, td.menu-tree-cell-disd a:hover {
 
 div.z-dottree-body td.menu-tree-cell {
 	cursor: pointer; padding: 0 2px;
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible;
+	${fontSizeM}; 
+	font-weight: normal; overflow: visible;
 }
 
 div.z-filetree-body td.menu-tree-cell {
 	cursor: pointer; padding: 0 2px;
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible;
+	${fontSizeM}; 
+	font-weight: normal; overflow: visible;
 }
 
 div.z-vfiletree-body td.menu-tree-cell {
 	cursor: pointer; padding: 0 2px;
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible;
+	${fontSizeM}; 
+	font-weight: normal; overflow: visible;
 }
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
index fc6d3f63a8..910bb93092 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
@@ -1,7 +1,7 @@
 <%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
 .z-treecell-content {
-	font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')};
-	font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')};
+	${fontFamilyC};
+	${fontSizeM};
 }
 
 .z-treecell-content {