From 916636c30faf7f58974e8c3d13b956d82eb6cf28 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Tue, 25 Jun 2013 19:01:20 +0800 Subject: [PATCH] IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable - Added theme preference for trademark text for standard report footer. --- org.adempiere.base/src/org/compiere/Adempiere.java | 2 +- .../WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java | 3 +++ .../src/org/adempiere/webui/theme/ThemeManager.java | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index 6c461f5eb5..88ba345365 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -92,7 +92,7 @@ public final class Adempiere /** Subtitle */ static public final String SUB_TITLE = "Smart Suite ERP, CRM and SCM"; - static public final String ADEMPIERE_R = "iDempiere\u00AE"; + static public String ADEMPIERE_R = "iDempiere\u00AE"; static public final String COPYRIGHT = "\u00A9 1999-2013 iDempiere\u00AE"; static private String s_ImplementationVersion = null; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index f124b7d105..5cd19bab29 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -41,6 +41,7 @@ import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.util.BrowserToken; import org.adempiere.webui.util.UserPreference; +import org.compiere.Adempiere; import org.compiere.model.MRole; import org.compiere.model.MSession; import org.compiere.model.MSysConfig; @@ -132,6 +133,8 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb { this.getPage().setTitle(ThemeManager.getBrowserTitle()); + Adempiere.ADEMPIERE_R = ThemeManager.getStandardReportFooterTrademarkText(); + SessionManager.setSessionApplication(this); Session session = Executions.getCurrent().getDesktop().getSession(); @SuppressWarnings("unchecked") diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java index 79f40475ec..6deae8622e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java @@ -16,6 +16,7 @@ package org.adempiere.webui.theme; import java.io.IOException; import org.adempiere.webui.AdempiereWebUI; +import org.compiere.Adempiere; import org.compiere.model.MClientInfo; import org.compiere.model.MImage; import org.compiere.model.MSysConfig; @@ -144,4 +145,12 @@ public final class ThemeManager { return null; } } + + /** + * @return trademark text for standard report footer + */ + public static String getStandardReportFooterTrademarkText() { + String s = Env.getContext(Env.getCtx(), "#ZK_STANDARD_REPORT_FOOTER_TRADEMARK_TEXT"); + return Util.isEmpty(s) ? Adempiere.ADEMPIERE_R : s; + } }