midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert revisions 4434 and 4438 

4434 - [ 1884762 ] FR - Make main logo and link for Home configurable
4438 - Deploy Adempiere ZK webUI by default
This commit is contained in:
Carlos Ruiz 2008-02-22 04:32:26 +00:00
parent f1a8f5c7cb
commit 59d084daed
7 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extension/posterita/webui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -43,7 +43,7 @@ public class AdempiereWebUI extends Window implements EventListener
{ {
private static final long serialVersionUID = 1L; 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"; public static final String UID = "0.2";

8
extension/posterita/webui/WEB-INF/src/org/adempiere/webui/Desktop.java
View File

@ -35,7 +35,6 @@ import org.adempiere.webui.window.ADWindow;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MMenu; import org.compiere.model.MMenu;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MSysConfig;
import org.compiere.util.CCache; import org.compiere.util.CCache;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -52,7 +51,7 @@ import org.zkoss.zul.Iframe;
*/ */
public class Desktop extends Window implements MenuListener public class Desktop extends Window implements MenuListener
{ {
private static final long serialVersionUID = 9056511175189603883L; private static final long serialVersionUID = 1L;
private static final CLogger logger = CLogger.getCLogger(Desktop.class); private static final CLogger logger = CLogger.getCLogger(Desktop.class);
@ -97,8 +96,7 @@ public class Desktop extends Window implements MenuListener
hbox.appendChild(pnlSide); hbox.appendChild(pnlSide);
hbox.appendChild(pnlMain); hbox.appendChild(pnlMain);
String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); showURL("http://www.posterita.org/", "Home", false);
showURL(homeURL, "Home", false);
verticalBox.appendChild(pnlHead); verticalBox.appendChild(pnlHead);
verticalBox.appendChild(hbox); 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 * @return website url
*/ */
private String getClientWebsiteURL() private String getClientWebsiteURL()

9
extension/posterita/webui/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
View File

@ -19,7 +19,6 @@ package org.adempiere.webui.panel;
import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.Panel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.compiere.model.MSysConfig;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
@ -37,7 +36,7 @@ import org.zkoss.zul.Separator;
public class HeaderPanel extends Panel implements EventListener 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 Image image = new Image();
private SideUserPanel pnlSideUser; private SideUserPanel pnlSideUser;
@ -66,8 +65,7 @@ public class HeaderPanel extends Panel implements EventListener
right.appendChild(pnlSideUser); right.appendChild(pnlSideUser);
String homeURL = MSysConfig.getValue("WEBUI_LOGOURL", "/images/logo_ad.png"); image.setSrc("/images/PosteritaAjaxUILogo.jpg");
image.setSrc(homeURL);
image.addEventListener(Events.ON_CLICK, this); image.addEventListener(Events.ON_CLICK, this);
left.appendChild(image); left.appendChild(image);
@ -86,8 +84,7 @@ public class HeaderPanel extends Panel implements EventListener
return; return;
if (event.getTarget() == image){ if (event.getTarget() == image){
String homeURL = MSysConfig.getValue("WEBUI_HOMEURL", "http://www.adempiere.com/"); SessionManager.getAppDesktop().showURL("http://www.posterita.org/", true);
SessionManager.getAppDesktop().showURL(homeURL, true);
} }
} }

BIN
extension/posterita/webui/images/logo_ad.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.8 KiB

6
lib/adempiereAll.xml
View File

@ -48,10 +48,4 @@
<context-root>/posterita</context-root> <context-root>/posterita</context-root>
</web> </web>
</module> </module>
<module>
<web>
<web-uri>webui.war</web-uri>
<context-root>/webui</context-root>
</web>
</module>
</application> </application>

13
serverRoot/src/web/adempiere.html
View File

@ -166,18 +166,7 @@ Start Adempiere via RUN_Adempiere </td>
</td> </td>
<td bgcolor="#fbf8f1"> <td bgcolor="#fbf8f1">
<p><a href="/webui">Adempiere ZK webUI (beta)</a> - contributed by Posterita</p> <p><a href="/adempiere">Adempiere Web Application Login (</a><a href="/adempiere/WStart">alternative)</a></p>
</td>
</tr>
<tr>
<td bgcolor="#e9eef5" valign="top">
<h2><font color="#000000">Web Application</font></h2>
</td>
<td bgcolor="#fbf8f1">
<p><a href="/adempiere">Adempiere old UI HTML (alpha) (</a><a href="/adempiere/WStart">alternative)</a></p>
</td> </td>
</tr> </tr>

2
utils_dev/build.xml
View File

@ -30,7 +30,6 @@
<ant inheritAll="false" dir="webCM"/> <ant inheritAll="false" dir="webCM"/>
<ant inheritAll="false" dir="sqlj"/> <ant inheritAll="false" dir="sqlj"/>
<ant inheritAll="false" dir="posterita"/> <ant inheritAll="false" dir="posterita"/>
<ant inheritAll="false" dir="extension/posterita/webui"/>
</target> </target>
<target name="build" depends="jar"> <target name="build" depends="jar">
<ant inheritAll="false" dir="install"/> <ant inheritAll="false" dir="install"/>
@ -50,7 +49,6 @@
<ant inheritAll="false" dir="sqlj" target="clean"/> <ant inheritAll="false" dir="sqlj" target="clean"/>
<ant inheritAll="false" dir="posterita" target="clean"/> <ant inheritAll="false" dir="posterita" target="clean"/>
<ant inheritAll="false" dir="install" target="clean"/> <ant inheritAll="false" dir="install" target="clean"/>
<ant inheritAll="false" dir="extension/posterita/webui" target="clean"/>
</target> </target>
<target name="clean-all" depends="clean"> <target name="clean-all" depends="clean">