[portal-commits] JBoss Portal SVN: r14038 - in branches/Enterprise_Portal_Platform_4_3: core/src/bin/portal-core-war/layouts/common and 2 other directories.
Author: thomas.heute(a)jboss.com
Date: 2012-01-24 16:21:57 -0500 (Tue, 24 Jan 2012)
New Revision: 14038
Modified:
branches/Enterprise_Portal_Platform_4_3/
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBEPP-995: IE 6 displays 'This page contains both secure and nonsecure items' on
every pages when using SSL
Property changes on: branches/Enterprise_Portal_Platform_4_3
___________________________________________________________________
Added: svn:mergeinfo
+ /tags/Enterprise_Portal_Platform_4_3_GA_CP07:14037
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2012-01-24
21:18:24 UTC (rev 14037)
+++
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2012-01-24
21:21:57 UTC (rev 14038)
@@ -1,5 +1,5 @@
<div id="login-modal" style="display:none">
<div id="login-modal-msg"
style="display:none;width:257px;height:157px">
- <iframe src="javascript:" frameborder="0"
width="257" height="157" scrolling="no"
marginheight="0" marginwidth="0" name="login-content"
class="login-content" id="loginIframe"></iframe>
+ <iframe src="javascript:false" frameborder="0"
width="257" height="157" scrolling="no"
marginheight="0" marginwidth="0" name="login-content"
class="login-content" id="loginIframe"></iframe>
</div>
</div>
Property changes on:
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2012-01-24
21:18:24 UTC (rev 14037)
+++
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2012-01-24
21:21:57 UTC (rev 14038)
@@ -51,7 +51,7 @@
<script type="text/javascript">
/* <![CDATA[ */
//we don't need the iframe/modal if logged in
- document.getElementById('loginIframe').src =
"javascript:''";
+ document.getElementById('loginIframe').src = "javascript:false";
/* ]]> */
</script>
<%= rb.getString("LOGGED") %>: <%= principal.getName()
%><br/><br/>