From 5916c3a3e3a868c86ccc46836b450254b511b532 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 7 Mar 2008 00:54:09 +0000 Subject: [PATCH] Revert revision 4757 - integrate again changes of revisions: 4434 - [ 1884762 ] FR - Make main logo and link for Home configurable 4438 - Deploy Adempiere ZK webUI by default With the agreement of Posterita team https://sourceforge.net/forum/message.php?msg_id=4820393 --- .../src/org/adempiere/webui/AdempiereWebUI.java | 2 +- .../WEB-INF/src/org/adempiere/webui/Desktop.java | 12 +++++++----- .../org/adempiere/webui/panel/HeaderPanel.java | 11 +++++++---- extension/posterita/webui/images/logo_ad.png | Bin 0 -> 9060 bytes lib/adempiereAll.xml | 6 ++++++ serverRoot/src/web/adempiere.html | 15 +++++++++++++-- utils_dev/build.xml | 10 ++++++---- 7 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 extension/posterita/webui/images/logo_ad.png diff --git a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index 5c5f109cf2..6a699e01b1 100644 --- a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -43,7 +43,7 @@ public class AdempiereWebUI extends Window implements EventListener { private static final long serialVersionUID = 1L; - public static final String APP_NAME = "Posterita Ajax UI"; + public static final String APP_NAME = "Adempiere ZK webUI"; public static final String UID = "0.2"; diff --git a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/Desktop.java b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/Desktop.java index a63e8c6b0e..ad54a57600 100644 --- a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/Desktop.java +++ b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/Desktop.java @@ -35,6 +35,7 @@ import org.adempiere.webui.window.ADWindow; import org.compiere.model.MClient; import org.compiere.model.MMenu; import org.compiere.model.MQuery; +import org.compiere.model.MSysConfig; import org.compiere.util.CCache; import org.compiere.util.CLogger; import org.compiere.util.Env; @@ -51,9 +52,9 @@ import org.zkoss.zul.Iframe; */ public class Desktop extends Window implements MenuListener { - private static final long serialVersionUID = 1L; - - private static final CLogger logger = CLogger.getCLogger(Desktop.class); + private static final long serialVersionUID = 9056511175189603883L; + + private static final CLogger logger = CLogger.getCLogger(Desktop.class); private HeaderPanel pnlHead; @@ -96,7 +97,8 @@ public class Desktop extends Window implements MenuListener hbox.appendChild(pnlSide); hbox.appendChild(pnlMain); - showURL("http://www.posterita.org/", "Home", false); + String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); + showURL(homeURL, "Home", false); verticalBox.appendChild(pnlHead); verticalBox.appendChild(hbox); @@ -109,7 +111,7 @@ public class Desktop extends Window implements MenuListener } /** - * Retrives the Client website url + * Retrieves the Client website url * @return website url */ private String getClientWebsiteURL() diff --git a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java index b4e5bbe976..7132cba05c 100644 --- a/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java +++ b/extension/posterita/webui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java @@ -19,6 +19,7 @@ package org.adempiere.webui.panel; import org.adempiere.webui.component.Panel; import org.adempiere.webui.session.SessionManager; +import org.compiere.model.MSysConfig; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; @@ -36,7 +37,7 @@ import org.zkoss.zul.Separator; public class HeaderPanel extends Panel implements EventListener { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -4293371180738797244L; private Image image = new Image(); private SideUserPanel pnlSideUser; @@ -64,8 +65,9 @@ public class HeaderPanel extends Panel implements EventListener left.setStyle("text-align:center"); right.appendChild(pnlSideUser); - - image.setSrc("/images/PosteritaAjaxUILogo.jpg"); + + String homeURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/logo_ad.png"); + image.setSrc(homeURL); image.addEventListener(Events.ON_CLICK, this); left.appendChild(image); @@ -84,7 +86,8 @@ public class HeaderPanel extends Panel implements EventListener return; if (event.getTarget() == image){ - SessionManager.getAppDesktop().showURL("http://www.posterita.org/", true); + String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); + SessionManager.getAppDesktop().showURL(homeURL, true); } } diff --git a/extension/posterita/webui/images/logo_ad.png b/extension/posterita/webui/images/logo_ad.png new file mode 100644 index 0000000000000000000000000000000000000000..a79ccb61ef134cffe1b16e0ee477f2d40dc097d6 GIT binary patch literal 9060 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/posterita + + + webui.war + /webui + + diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html index 2d46c0446a..539843b503 100644 --- a/serverRoot/src/web/adempiere.html +++ b/serverRoot/src/web/adempiere.html @@ -166,7 +166,18 @@ Start Adempiere via RUN_Adempiere -

Adempiere Web Application Login (alternative)

+

Adempiere ZK webUI (beta) - contributed by Posterita

+ + + + + + +

Web Application

+ + + +

Adempiere old UI HTML (alpha) (alternative)

@@ -250,4 +261,4 @@ Start Adempiere via RUN_Adempiere

 

- + \ No newline at end of file diff --git a/utils_dev/build.xml b/utils_dev/build.xml index 58a4879c32..a028c8043a 100644 --- a/utils_dev/build.xml +++ b/utils_dev/build.xml @@ -30,6 +30,7 @@ + @@ -46,10 +47,11 @@ - - + + - + + @@ -173,4 +175,4 @@ - + \ No newline at end of file