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
This commit is contained in:
parent
ab1ca3e4d5
commit
5916c3a3e3
|
@ -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";
|
||||
|
||||
|
|
|
@ -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,7 +52,7 @@ import org.zkoss.zul.Iframe;
|
|||
*/
|
||||
public class Desktop extends Window implements MenuListener
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
private static final long serialVersionUID = 9056511175189603883L;
|
||||
|
||||
private static final CLogger logger = CLogger.getCLogger(Desktop.class);
|
||||
|
||||
|
@ -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()
|
||||
|
|
|
@ -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;
|
||||
|
@ -65,7 +66,8 @@ public class HeaderPanel extends Panel implements EventListener
|
|||
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 8.8 KiB |
|
@ -48,4 +48,10 @@
|
|||
<context-root>/posterita</context-root>
|
||||
</web>
|
||||
</module>
|
||||
<module>
|
||||
<web>
|
||||
<web-uri>webui.war</web-uri>
|
||||
<context-root>/webui</context-root>
|
||||
</web>
|
||||
</module>
|
||||
</application>
|
||||
|
|
|
@ -166,7 +166,18 @@ Start Adempiere via RUN_Adempiere </td>
|
|||
</td>
|
||||
|
||||
<td bgcolor="#fbf8f1">
|
||||
<p><a href="/adempiere">Adempiere Web Application Login (</a><a href="/adempiere/WStart">alternative)</a></p>
|
||||
<p><a href="/webui">Adempiere ZK webUI (beta)</a> - contributed by Posterita</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>
|
||||
|
||||
</tr>
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
<ant inheritAll="false" dir="webCM"/>
|
||||
<ant inheritAll="false" dir="sqlj"/>
|
||||
<ant inheritAll="false" dir="posterita"/>
|
||||
<ant inheritAll="false" dir="extension/posterita/webui"/>
|
||||
</target>
|
||||
<target name="build" depends="jar">
|
||||
<ant inheritAll="false" dir="install"/>
|
||||
|
@ -49,6 +50,7 @@
|
|||
<ant inheritAll="false" dir="sqlj" target="clean"/>
|
||||
<ant inheritAll="false" dir="posterita" target="clean"/>
|
||||
<ant inheritAll="false" dir="install" target="clean"/>
|
||||
<ant inheritAll="false" dir="extension/posterita/webui" target="clean"/>
|
||||
</target>
|
||||
|
||||
<target name="clean-all" depends="clean">
|
||||
|
|
Loading…
Reference in New Issue