Author: wesleyhales Date: 2007-12-04 14:31:27 -0500 (Tue, 04 Dec 2007) New Revision: 9290 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/resources/portal-core-war/WEB-INF/jsp/header/header.jsp Log: Add requested URL to modal iframe src 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 2007-12-04 19:09:25 UTC (rev 9289) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2007-12-04 19:31:27 UTC (rev 9290) @@ -5,6 +5,6 @@ <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"></iframe> + <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 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 2007-12-04 19:09:25 UTC (rev 9289) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-12-04 19:31:27 UTC (rev 9290) @@ -22,6 +22,9 @@ }else{ document.write('<a href=\"<%= loginURL %>\">Login</a>'); } + //set the iframe src for login modal to requested URL + var iframeSrc = '<%= loginURL %>' + '?loginheight=0'; + document.getElementById('loginIframe').src = iframeSrc; </script> <noscript>