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

IDEMPIERE-1022 Login warning msg translation / deprecate message

This commit is contained in:
Carlos Ruiz 2019-12-26 10:17:16 +01:00
parent ef3ed449ca
commit 6c5f285dc4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java
View File

@ -19,18 +19,14 @@ import java.util.Properties;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.part.AbstractUIPart; import org.adempiere.webui.part.AbstractUIPart;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.LoginWindow; import org.adempiere.webui.window.LoginWindow;
import org.zkoss.web.servlet.Servlets; import org.zkoss.web.servlet.Servlets;
import org.zkoss.zhtml.Text;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.metainfo.PageDefinition; import org.zkoss.zk.ui.metainfo.PageDefinition;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Div;
import org.zkoss.zul.East; import org.zkoss.zul.East;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.South; import org.zkoss.zul.South;
@ -67,6 +63,7 @@ public class WLogin extends AbstractUIPart
loginWindow = (LoginWindow) loginPage.getFellow("loginWindow"); loginWindow = (LoginWindow) loginPage.getFellow("loginWindow");
loginWindow.init(app); loginWindow.init(app);
/* IDEMPIERE-1022 - deprecated message
if (!AEnv.isBrowserSupported()) if (!AEnv.isBrowserSupported())
{ {
//TODO: localization //TODO: localization
@ -81,6 +78,7 @@ public class WLogin extends AbstractUIPart
browserWarningWindow.setPage(page); browserWarningWindow.setPage(page);
browserWarningWindow.doOverlapped(); browserWarningWindow.doOverlapped();
} }
*/
boolean mobile = false; boolean mobile = false;
if (Executions.getCurrent().getBrowser("mobile") !=null) { if (Executions.getCurrent().getBrowser("mobile") !=null) {

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -524,6 +524,7 @@ public final class AEnv
/** /**
* @return boolean * @return boolean
* @deprecated See IDEMPIERE-1022
*/ */
public static boolean isBrowserSupported() { public static boolean isBrowserSupported() {
Execution execution = Executions.getCurrent(); Execution execution = Executions.getCurrent();

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
View File

@ -19,7 +19,6 @@ package org.adempiere.webui.panel;
import org.adempiere.webui.AdempiereWebUI; import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.Panel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
@ -208,7 +207,7 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
statusLine.setStyle("color: black"); statusLine.setStyle("color: black");
statusLine.setTooltiptext(text); statusLine.setTooltiptext(text);
if (showPopup && AEnv.isBrowserSupported()) if (showPopup)
{ {
Text t = new Text(text); Text t = new Text(text);
popupContent.getChildren().clear(); popupContent.getChildren().clear();