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 6a699e01b1..5c5f109cf2 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 = "Adempiere ZK webUI"; + public static final String APP_NAME = "Posterita Ajax UI"; 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 ad54a57600..a63e8c6b0e 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,7 +35,6 @@ 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; @@ -52,9 +51,9 @@ import org.zkoss.zul.Iframe; */ public class Desktop extends Window implements MenuListener { - private static final long serialVersionUID = 9056511175189603883L; - - private static final CLogger logger = CLogger.getCLogger(Desktop.class); + private static final long serialVersionUID = 1L; + + private static final CLogger logger = CLogger.getCLogger(Desktop.class); private HeaderPanel pnlHead; @@ -97,8 +96,7 @@ public class Desktop extends Window implements MenuListener hbox.appendChild(pnlSide); hbox.appendChild(pnlMain); - String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); - showURL(homeURL, "Home", false); + showURL("http://www.posterita.org/", "Home", false); verticalBox.appendChild(pnlHead); verticalBox.appendChild(hbox); @@ -111,7 +109,7 @@ public class Desktop extends Window implements MenuListener } /** - * Retrieves the Client website url + * Retrives 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 7132cba05c..b4e5bbe976 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,7 +19,6 @@ 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; @@ -37,7 +36,7 @@ import org.zkoss.zul.Separator; public class HeaderPanel extends Panel implements EventListener { - private static final long serialVersionUID = -4293371180738797244L; + private static final long serialVersionUID = 1L; private Image image = new Image(); private SideUserPanel pnlSideUser; @@ -65,9 +64,8 @@ public class HeaderPanel extends Panel implements EventListener left.setStyle("text-align:center"); right.appendChild(pnlSideUser); - - String homeURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/logo_ad.png"); - image.setSrc(homeURL); + + image.setSrc("/images/PosteritaAjaxUILogo.jpg"); image.addEventListener(Events.ON_CLICK, this); left.appendChild(image); @@ -86,8 +84,7 @@ public class HeaderPanel extends Panel implements EventListener return; if (event.getTarget() == image){ - String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); - SessionManager.getAppDesktop().showURL(homeURL, true); + SessionManager.getAppDesktop().showURL("http://www.posterita.org/", true); } } diff --git a/extension/posterita/webui/images/logo_ad.png b/extension/posterita/webui/images/logo_ad.png deleted file mode 100644 index a79ccb61ef..0000000000 Binary files a/extension/posterita/webui/images/logo_ad.png and /dev/null differ diff --git a/lib/adempiereAll.xml b/lib/adempiereAll.xml index 01a3a8e17a..8b2db78324 100644 --- a/lib/adempiereAll.xml +++ b/lib/adempiereAll.xml @@ -48,10 +48,4 @@ /posterita - - - webui.war - /webui - - diff --git a/serverRoot/src/web/adempiere.html b/serverRoot/src/web/adempiere.html index 539843b503..2d46c0446a 100644 --- a/serverRoot/src/web/adempiere.html +++ b/serverRoot/src/web/adempiere.html @@ -166,18 +166,7 @@ Start Adempiere via RUN_Adempiere -

Adempiere ZK webUI (beta) - contributed by Posterita

- - - - - - -

Web Application

- - - -

Adempiere old UI HTML (alpha) (alternative)

+

Adempiere Web Application Login (alternative)

@@ -261,4 +250,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 a028c8043a..58a4879c32 100644 --- a/utils_dev/build.xml +++ b/utils_dev/build.xml @@ -30,7 +30,6 @@ - @@ -47,11 +46,10 @@ - - + + - - + @@ -175,4 +173,4 @@ - \ No newline at end of file +