Author: wesleyhales Date: 2008-01-18 12:34:44 -0500 (Fri, 18 Jan 2008) New Revision: 9537 Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp Log: Fix double load issue and cleanup Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2008-01-18 17:05:08 UTC (rev 9536) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2008-01-18 17:34:44 UTC (rev 9537) @@ -1,10 +1,7 @@ -<%@page import="org.jboss.portal.server.ServerURL"%> -<%@page import="org.jboss.portal.server.AbstractServerURL"%> <script src="<%=request.getContextPath()%>/js/modal.js" type="text/javascript"></script> <link rel="stylesheet" href="<%=request.getContextPath()%>/css/modal.css" type="text/css" /> -<div id="login-modal" style="display:none"> - <div id="login-modal-msg" style="display:none;width:257px;height:157px"> - <% String loginHeight = "100%"; %> - <iframe src="<%=request.getAttribute("org.jboss.portal.PORTAL_CONTEXT_PATH")%>/auth/?loginheight=0" 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 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> + </div> + </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2008-01-18 17:05:08 UTC (rev 9536) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2008-01-18 17:34:44 UTC (rev 9537) @@ -486,7 +486,7 @@ text-indent: 5px; padding-top: 5px; padding-bottom: 6px; - width:90%; + width:85%; display:block; margin-right:10px; } Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-01-18 17:05:08 UTC (rev 9536) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-01-18 17:34:44 UTC (rev 9537) @@ -37,6 +37,10 @@ else { %> +<script type="text/javascript"> + //we don't need the iframe/modal if logged in + document.getElementById('loginIframe').src = ''; +</script> Logged in as: <%= user.getUserName() %><br/><br/> <%