From ac5b2bc7e014de80d1ce048a30fc62915f940ca8 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 1 Jul 2015 15:42:38 -0500
Subject: [PATCH] IDEMPIERE-2382 Mixed Content in login-links.zul break SSL
 certificate

---
 .../theme/default/images/zkpowered_s.png        | Bin 0 -> 1841 bytes
 .../theme/default/zul/login/login-left.zul      |   2 +-
 .../theme/default/zul/login/login-links.zul     |   6 +++---
 .../theme/default/zul/login/vendor-logo.zul     |  16 +++-------------
 4 files changed, 7 insertions(+), 17 deletions(-)
 create mode 100644 org.adempiere.ui.zk/theme/default/images/zkpowered_s.png

diff --git a/org.adempiere.ui.zk/theme/default/images/zkpowered_s.png b/org.adempiere.ui.zk/theme/default/images/zkpowered_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c9526182c76ab241a5873a652647192d8e6438a
GIT binary patch
literal 1841
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
b*blePo7f-VKJA?T1Aw`)jZv+kXZ-&G(MGq-

literal 0
HcmV?d00001

diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-left.zul b/org.adempiere.ui.zk/theme/default/zul/login/login-left.zul
index 2aeae8a220..dde3403fc1 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/login-left.zul
+++ b/org.adempiere.ui.zk/theme/default/zul/login/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.serverName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}"/>
+	<loginInfo if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}"/>
 	<versionInfo/>
 	<loginLinks/>
 </div>
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul b/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul
index f4643fc272..a71dfb9c6d 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul
+++ b/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul
@@ -15,10 +15,10 @@ Copyright (C) 2009 Idalica Corporation
 	}
 </style>
 
-<div class="loginLinksBox" if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot; or desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}"
-	style="position: absolute; bottom: 5px;">
+<div class="loginLinksBox" if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}"
+	style="position: absolute; bottom: 30px;">
 
-	<toolbarbutton href="http://www.zkoss.org" image="http://www.zkoss.org/img/zkpowered_s.png"
+	<toolbarbutton href="http://www.zkoss.org" image="/theme/default/images/zkpowered_s.png"
 		tooltiptext="Powered by Zk" target="_blank"
 		/>
 </div>
diff --git a/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul b/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
index 12d07af5ee..94d587a76e 100644
--- a/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
+++ b/org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
@@ -6,24 +6,14 @@ Copyright (C) 2009 Idalica Corporation
 <zk>
 
 <div style="background-color: #E5E5E5; margin: 5px;"
-	if="${desktop.execution.serverName == &quot;ip-10-8-0-1.ec2.internal&quot;}">
+	if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}">
 	<hbox align="center">
-		<toolbarbutton
-			href="http://www.idalica.com" image="http://www.testadempiere.com/images/Idalica_Logo-grey-sm.png" target="_blank"/>
-		<label value="iDempiere Online Demonstration - Built Nightly by Idalica"
-			style="font-family:Arial,sans-serif; color:#578BB8; font-size:1em; font-weight: bold;" />
-	</hbox>
-</div>
-<div style="background-color: #E5E5E5; margin: 5px;"
-	if="${desktop.execution.serverName.startsWith(&quot;demo.&quot;) or desktop.execution.serverName.startsWith(&quot;test.&quot;) or desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}">
-	<hbox align="center">
-		<toolbarbutton
-			href="http://www.idempiere.org" image="http://www.idempiere.org/_/rsrc/1366146890872/config/customLogo.gif?revision=3" target="_blank"/>
+		<a href="http://www.idempiere.org" target="_blank"><image src="/theme/default/images/login-logo.png"/></a>
 		<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.serverName != &quot;ip-10-8-0-1.ec2.internal&quot; and ! desktop.execution.serverName.startsWith(&quot;demo.&quot;) and ! desktop.execution.serverName.startsWith(&quot;test.&quot;) and ! desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}">
+<div style="height: 90px" if="${! desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) and ! desktop.execution.serverName.startsWith(&quot;demo.&quot;) and ! desktop.execution.serverName.startsWith(&quot;test.&quot;) and ! desktop.execution.serverName.startsWith(&quot;experimental.&quot;)}">
 	<space/>
 </div>