diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java index 7f402e15be..46ee0356b8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java +++ b/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 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 { 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 // } + 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) diff --git a/org.adempiere.ui.zk/theme/default/images/login-box-footer.png b/org.adempiere.ui.zk/theme/default/images/login-box-footer.png index 6e24eb60f4..562a0fcc8c 100644 Binary files a/org.adempiere.ui.zk/theme/default/images/login-box-footer.png and b/org.adempiere.ui.zk/theme/default/images/login-box-footer.png differ diff --git a/org.adempiere.ui.zk/theme/default/login-info.zul b/org.adempiere.ui.zk/theme/default/login-info.zul index dd088affd7..927b26d144 100644 --- a/org.adempiere.ui.zk/theme/default/login-info.zul +++ b/org.adempiere.ui.zk/theme/default/login-info.zul @@ -24,48 +24,40 @@ Copyright (C) 2009 Idalica Corporation Initially you can log into the system with the following users: - +
- - - - - + + - - - - - - - - -
Usage User +EMail Password
System Management -System -System +GardenAdmin +admin @ gardenworld.com +GardenAdmin
GardenUser +user @ gardenworld.com +GardenUser +
System Management or any role/company SuperUser +superuser @ idempiere.com System
Sample Client Administration -GardenAdmin -GardenAdmin +System +system @ idempiere.com +System
Sample Client User -GardenUser -GardenUser -
]]> - \ No newline at end of file + diff --git a/org.adempiere.ui.zk/theme/default/login-left.zul b/org.adempiere.ui.zk/theme/default/login-left.zul index 2f604cc016..787cda76e2 100644 --- a/org.adempiere.ui.zk/theme/default/login-left.zul +++ b/org.adempiere.ui.zk/theme/default/login-left.zul @@ -9,7 +9,7 @@ Copyright (C) 2009 Idalica Corporation
- +
diff --git a/org.adempiere.ui.zk/theme/default/login-links.zul b/org.adempiere.ui.zk/theme/default/login-links.zul index 51e8a63a9d..1668427d5f 100644 --- a/org.adempiere.ui.zk/theme/default/login-links.zul +++ b/org.adempiere.ui.zk/theme/default/login-links.zul @@ -15,7 +15,7 @@ Copyright (C) 2009 Idalica Corporation } -
-
- + diff --git a/org.adempiere.ui.zk/theme/default/vendor-logo.zul b/org.adempiere.ui.zk/theme/default/vendor-logo.zul index bb6688bb03..dc8901e62d 100644 --- a/org.adempiere.ui.zk/theme/default/vendor-logo.zul +++ b/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;" /> -
+
+ + + +
+