From 4b8a9e556a0815b8495422e94424c1160a4c95d6 Mon Sep 17 00:00:00 2001 From: Juliana Corredor Date: Thu, 9 Aug 2012 18:44:20 -0500 Subject: [PATCH] IDEMPIERE-354 Implement 'Select Role' checkbox on first login screen to skip second login screen / change the order of "Remember me" and "Select Role" --- .../org/adempiere/webui/panel/LoginPanel.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 d09e56d4a2..811d451a59 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 @@ -187,6 +187,18 @@ public class LoginPanel extends Window implements EventListener td.setSclass(ITheme.LOGIN_FIELD_CLASS); tr.appendChild(td); td.appendChild(lstLanguage); + + tr = new Tr(); + tr.setId("rowSelectRole"); + table.appendChild(tr); + td = new Td(); + tr.appendChild(td); + td.setSclass(ITheme.LOGIN_LABEL_CLASS); + td.appendChild(new Label("")); + td = new Td(); + td.setSclass(ITheme.LOGIN_FIELD_CLASS); + tr.appendChild(td); + td.appendChild(chkSelectRole); if (MSystem.isZKRememberUserAllowed()) { tr = new Tr(); @@ -200,17 +212,7 @@ public class LoginPanel extends Window implements EventListener td.setSclass(ITheme.LOGIN_FIELD_CLASS); tr.appendChild(td); td.appendChild(chkRememberMe); - tr = new Tr(); - tr.setId("rowSelectRole"); - table.appendChild(tr); - td = new Td(); - tr.appendChild(td); - td.setSclass(ITheme.LOGIN_LABEL_CLASS); - td.appendChild(new Label("")); - td = new Td(); - td.setSclass(ITheme.LOGIN_FIELD_CLASS); - tr.appendChild(td); - td.appendChild(chkSelectRole); + } div = new Div();