IDEMPIERE-77 Start on the left, Cancel on the right

IDEMPIERE-166 Rebranding of logo and product name

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java

@@ -34,6 +34,7 @@ import java.util.logging.Level;
 import org.adempiere.webui.AdempiereIdGenerator;
 import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.AEnv;
+import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Combobox;
 import org.adempiere.webui.component.ConfirmPanel;
 import org.adempiere.webui.component.Label;
@@ -47,6 +48,7 @@ import org.adempiere.webui.theme.ITheme;
 import org.adempiere.webui.theme.ThemeManager;
 import org.adempiere.webui.util.BrowserToken;
 import org.adempiere.webui.util.UserPreference;
+import org.adempiere.webui.window.FDialog;
 import org.adempiere.webui.window.LoginWindow;
 import org.compiere.Adempiere;
 import org.compiere.model.MClient;
@@ -236,8 +238,14 @@ public class LoginPanel extends Window implements EventListener<Event>
 
     	div = new Div();
     	div.setSclass(ITheme.LOGIN_BOX_FOOTER_CLASS);
-        ConfirmPanel pnlButtons = new ConfirmPanel(false);
+        ConfirmPanel pnlButtons = new ConfirmPanel();
         pnlButtons.addActionListener(this);
+
+        Button helpButton = pnlButtons.createButton(ConfirmPanel.A_HELP);
+		helpButton.addEventListener(Events.ON_CLICK, this);
+		helpButton.setSclass(ITheme.LOGIN_BUTTON_CLASS);
+		pnlButtons.addComponentsRight(helpButton);
+        
         LayoutUtils.addSclass(ITheme.LOGIN_BOX_FOOTER_PANEL_CLASS, pnlButtons);
         pnlButtons.setWidth(null);
         pnlButtons.getButton(ConfirmPanel.A_OK).setSclass(ITheme.LOGIN_BUTTON_CLASS);
@@ -372,6 +380,10 @@ public class LoginPanel extends Window implements EventListener<Event>
         {
             validateLogin();
         }
+        else if (event.getTarget().getId().equals(ConfirmPanel.A_HELP))
+        {
+            openLoginHelp();
+        }
         else if (event.getName().equals(Events.ON_SELECT))
         {
             if(eventComp.getId().equals(lstLanguage.getId())) {
@@ -405,6 +417,17 @@ public class LoginPanel extends Window implements EventListener<Event>
         //
     }
 
+	private void openLoginHelp() {
+		String helpURL = MSysConfig.getValue("LOGIN_HELP_URL", 	"http://wiki.idempiere.org/wiki/Login_Help");
+		try {
+			Executions.getCurrent().sendRedirect(helpURL, "_blank");
+		}
+		catch (Exception e) {
+			String message = e.getMessage();
+			FDialog.warn(0, this, "URLnotValid", message);
+		}
+	}
+
 	private void onUserIdChange(int AD_User_ID) {
 		String userName = txtUserId.getValue();
 		if (userName != null && userName.length() > 0 && AD_User_ID < 0)

org.adempiere.ui.zk/theme/default/login-info.zul

@@ -24,48 +24,40 @@ Copyright (C) 2009 Idalica Corporation
 <span class="section-head">Initially you can log into the system with the following users:
 </span>
 
-<table border="thin" cellpadding="5" cellspacing="0" style="margin-top: 10px; font-size: 8pt; background-color: transparent; border: 1px solid lightgray; border-collapse: collapse;">
+<table cellpadding="5" cellspacing="0" style="margin-top: 10px; font-size: 8pt; background-color: transparent;">
 
 <tbody><tr valign="top">
-<th ><i><b>Usage</b></i>
 </th><th><i><b>User</b></i>
+</th><th><i><b>EMail</b></i>
 </th><th><i><b>Password</b></i>
 </th></tr>
 
-
-
 <tr valign="top">
-<td>System Management
+</td><td>GardenAdmin
-</td><td>System
+</td><td>admin @ gardenworld.com
-</td><td>System
+</td><td>GardenAdmin
 </td></tr>
 
-
+<tr valign="top">
+</td><td>GardenUser
+</td><td>user @ gardenworld.com
+</td><td>GardenUser
+</td></tr>
 
 <tr valign="top">
-<td>System Management or any role/company
 </td><td>SuperUser
+</td><td>superuser @ idempiere.com
 </td><td>System
 </td></tr>
 
-
-
 <tr valign="top">
-
+</td><td>System
-<td>Sample Client Administration
+</td><td>system @ idempiere.com
-</td><td>GardenAdmin
+</td><td>System
-</td><td>GardenAdmin
 </td></tr>
 
-
-
-<tr valign="top">
-<td>Sample Client User
-</td><td>GardenUser
-</td><td>GardenUser
-</td></tr>
 </tbody>
 </table>
 </div>
 ]]>
-</html>
+</html>

org.adempiere.ui.zk/theme/default/login-left.zul

@@ -9,7 +9,7 @@ Copyright (C) 2009 Idalica Corporation
 <?component name="loginLinks" inline="true" macroURI="login-links.zul"?>
 <div>
 	<vendorLogo/>
-	<loginInfo if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName == &quot;127.0.0.1&quot;}"/>
+	<loginInfo if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}"/>
 	<versionInfo/>
 	<loginLinks/>
 </div>

org.adempiere.ui.zk/theme/default/login-links.zul

@@ -15,7 +15,7 @@ Copyright (C) 2009 Idalica Corporation
 	}
 </style>
 
-<div class="loginLinksBox" if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName == &quot;127.0.0.1&quot;}"
+<div class="loginLinksBox" if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}"
 	style="position: absolute; bottom: 5px;">
 
 	<toolbarbutton href="http://www.zkoss.org" image="http://www.zkoss.org/img/zkpowered_s.png"
@@ -25,11 +25,11 @@ Copyright (C) 2009 Idalica Corporation
 		image="http://sfx-images.mozilla.org/affiliates/Buttons/firefox3/110x32_get_ffx.png"
 		target="_blank"
 		/>
-	<button href="http://www.adempiere.org" image="images/AD32.png"
+	<button href="http://www.idempiere.org" image="images/AD32.png"
-		tooltiptext="ADempiere Community" style="height:32px; width:32px" target="_blank"/>
+		tooltiptext="iDempiere Community" style="height:32px; width:32px" target="_blank"/>
 </div>
 
-<zscript if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName == &quot;127.0.0.1&quot;}">
+<zscript if="${desktop.execution.localName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
 <![CDATA[
 	getFirefox.setHref("http://www.mozilla.com/?from=sfx&uid=0&t=306");
 ]]>

org.adempiere.ui.zk/theme/default/vendor-logo.zul

@@ -14,7 +14,16 @@ Copyright (C) 2009 Idalica Corporation
 			style="font-family:Arial,sans-serif; color:#578BB8; font-size:1em; font-weight: bold;" />
 	</hbox>
 </div>
-<div style="height: 90px" if="${desktop.execution.localName != &quot;ip-10-8-0-1.ec2.internal&quot;}">
+<div style="background-color: #E5E5E5; margin: 5px;"
+	if="${desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
+	<hbox align="center">
+		<toolbarbutton
+			href="http://www.idempiere.org" image="http://www.idempiere.org/_/rsrc/1341897488671/config/customLogo.gif?revision=2" target="_blank"/>
+		<label value="iDempiere Online Demonstration"
+			style="font-family:Arial,sans-serif; color:#578BB8; font-size:1.5em; font-weight: bold;" />
+	</hbox>
+</div>
+<div style="height: 90px" if="${desktop.execution.localName != &quot;ip-10-8-0-1.ec2.internal&quot; and ! desktop.execution.localName.startsWith(&quot;demo.&quot;)}">
 	<space/>
 </div>