- added ZK_LOGO_LARGE and ZK_LOGO_SMALL ( deprecated WEBUI_LOGOURL )
- added ZK_BROWSER_TITLE
This commit is contained in:
Heng Sin Low 2009-05-07 10:05:59 +00:00
parent a619628e8d
commit b362b9a8f1
4 changed files with 87 additions and 79 deletions
zkwebui/WEB-INF/src/org/adempiere/webui

View File

@ -57,7 +57,9 @@ public class HeaderPanel extends Panel implements EventListener
UserPanel userPanel = new UserPanel(); UserPanel userPanel = new UserPanel();
String logoURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/AD10030.png"); String logoURL = MSysConfig.getValue("ZK_LOGO_SMALL", null);
if (logoURL == null || logoURL.trim().length() == 0)
logoURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/AD10030.png");
image.setSrc(logoURL); image.setSrc(logoURL);
image.addEventListener(Events.ON_CLICK, this); image.addEventListener(Events.ON_CLICK, this);
image.setStyle("cursor: pointer;"); image.setStyle("cursor: pointer;");

View File

@ -31,6 +31,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.window.LoginWindow; import org.adempiere.webui.window.LoginWindow;
import org.compiere.model.MSysConfig;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
@ -97,7 +98,7 @@ public class LoginPanel extends Window implements EventListener
Row logo = new Row(); Row logo = new Row();
logo.setSpans("2"); logo.setSpans("2");
Image image = new Image(); Image image = new Image();
image.setSrc("images/logo.png"); image.setSrc(MSysConfig.getValue("ZK_LOGO_LARGE", "images/logo.png"));
logo.appendChild(image); logo.appendChild(image);
Row rowUser = new Row(); Row rowUser = new Row();
rowUser.setId("rowUser"); rowUser.setId("rowUser");

View File

@ -29,6 +29,7 @@ import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.window.LoginWindow; import org.adempiere.webui.window.LoginWindow;
import org.compiere.db.CConnection; import org.compiere.db.CConnection;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSysConfig;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
import org.compiere.util.Language; import org.compiere.util.Language;
@ -103,7 +104,7 @@ public class RolePanel extends Window implements EventListener
Row logo = new Row(); Row logo = new Row();
logo.setSpans("2"); logo.setSpans("2");
Image image = new Image(); Image image = new Image();
image.setSrc("images/logo.png"); image.setSrc(MSysConfig.getValue("ZK_LOGO_LARGE", "images/logo.png"));
logo.appendChild(image); logo.appendChild(image);
Row rowRole = new Row(); Row rowRole = new Row();

View File

@ -30,6 +30,7 @@ import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.model.MSysConfig;
import org.compiere.model.MUser; import org.compiere.model.MUser;
import org.compiere.util.CLogErrorBuffer; import org.compiere.util.CLogErrorBuffer;
import org.compiere.util.CLogMgt; import org.compiere.util.CLogMgt;
@ -76,7 +77,7 @@ public class AboutWindow extends Window implements EventListener {
this.setWidth("500px"); this.setWidth("500px");
this.setHeight("450px"); this.setHeight("450px");
this.setPosition("center"); this.setPosition("center");
this.setTitle("ADempiere Zk Web Client"); this.setTitle(MSysConfig.getValue("ZK_BROWSER_TITLE", "Adempiere"));
this.setClosable(true); this.setClosable(true);
this.setSizable(true); this.setSizable(true);
@ -301,7 +302,10 @@ public class AboutWindow extends Window implements EventListener {
vbox.setAlign("center"); vbox.setAlign("center");
vbox.setPack("center"); vbox.setPack("center");
vbox.setParent(tabPanel); vbox.setParent(tabPanel);
Image image = new Image("images/AD10030.png"); String logoURL = MSysConfig.getValue("ZK_LOGO_SMALL", null);
if (logoURL == null || logoURL.trim().length() == 0)
logoURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/AD10030.png");
Image image = new Image(logoURL);
image.setParent(vbox); image.setParent(vbox);
Text text = new Text(Adempiere.getSubtitle()); Text text = new Text(Adempiere.getSubtitle());