[portal-commits] JBoss Portal SVN: r14013 - in branches/Enterprise_Portal_Platform_4_3/core/src: resources/portal-core-war/WEB-INF/jsp/header and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2011-09-06 12:02:46 -0400 (Tue, 06 Sep 2011)
New Revision: 14013
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/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
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 2011-09-06
16:01:37 UTC (rev 14012)
+++
branches/Enterprise_Portal_Platform_4_3/core/src/bin/portal-core-war/layouts/common/modal_body.jsp 2011-09-06
16:02:46 UTC (rev 14013)
@@ -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="" frameborder="0" width="257"
height="157" scrolling="no" marginheight="0"
marginwidth="0" name="login-content" class="login-content"
id="loginIframe"></iframe>
+ <iframe src="javascript:" frameborder="0"
width="257" height="157" scrolling="no"
marginheight="0" marginwidth="0" name="login-content"
class="login-content" id="loginIframe"></iframe>
</div>
- </div>
\ No newline at end of file
+ </div>
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 2011-09-06
16:01:37 UTC (rev 14012)
+++
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2011-09-06
16:02:46 UTC (rev 14013)
@@ -51,7 +51,7 @@
<script type="text/javascript">
/* <![CDATA[ */
//we don't need the iframe/modal if logged in
- document.getElementById('loginIframe').src = '';
+ document.getElementById('loginIframe').src =
"javascript:''";
/* ]]> */
</script>
<%= rb.getString("LOGGED") %>: <%= principal.getName()
%><br/><br/>