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

IDEMPIERE-2382 Mixed Content in login-links.zul break SSL certificate

This commit is contained in:
Carlos Ruiz 2015-07-01 15:42:38 -05:00
parent 942f2b5244
commit ac5b2bc7e0
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
org.adempiere.ui.zk/theme/default/images/zkpowered_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -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>

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

@ -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>

16
org.adempiere.ui.zk/theme/default/zul/login/vendor-logo.zul
View File

@ -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>