Author: chris.laprun(a)jboss.com Date: 2009-02-28 12:02:15 -0500 (Sat, 28 Feb 2009) New Revision: 12913 Added: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/images/logo-small-blue.gif Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_admin.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_current.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_hover2.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_admin.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_current.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_hover2.gif tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java Log: Forgot to merge changes from 12904 and 12905: JBPORTAL-2227, JBPORTAL-2285, JBPORTAL-2277 Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css 2009-02-28 17:02:15 UTC (rev 12913) @@ -33,14 +33,16 @@ } div.login-container div.login-header { - background-image: url( ../images/modal/login-header-bg.gif ); - background-position: top left; - background-repeat: repeat-x; + background: url(../themes/renewal/images/header-bg-left-shadow2.gif) repeat-x top left; width: 255px; - height: 27px; + height: 30px; text-align: left; } +div.login-container div.login-header img { + margin: 5px 0 0 5px; +} + div.login-container div.login-header h2 { color: #fff; font-weight: bold; Copied: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/images/logo-small-blue.gif (from rev 12904, branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/logo-small-blue.gif) =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_admin.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_current.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_hover2.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_admin.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_current.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_hover2.gif =================================================================== (Binary files differ) Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 17:02:15 UTC (rev 12913) @@ -248,7 +248,7 @@ bottom: -5px; left: 0; min-width: 550px; - z-index: 1; + z-index: 10; } ul#tabsHeader li { Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-02-28 17:02:15 UTC (rev 12913) @@ -29,7 +29,7 @@ document.write('<a href=\"<%= loginURL %>\">Login</a>'); } //set the iframe src for login modal to requested URL - var iframeSrc = '<%= loginURL %>' + '?loginheight=0'; + var iframeSrc = '<%= loginURL %>'; document.getElementById('loginIframe').src = iframeSrc; /* ]]> */ </script> Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-02-28 17:02:15 UTC (rev 12913) @@ -21,36 +21,37 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> <%@ page pageEncoding="utf-8" %> -<%@page import="org.jboss.portal.common.util.ParameterValidation" %> <%@page import="org.jboss.portal.identity.UserStatus" %> <%@page import="java.util.ResourceBundle" %> <% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); - String loginheight = request.getParameter("loginheight"); - boolean paramPresent = loginheight != null; - loginheight = ParameterValidation.sanitizeFromPattern(loginheight, ParameterValidation.CSS_DISTANCE, "300px"); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><%= rb.getString("LOGIN_TITLE") %> - </title> - <style type="text/css"> - /* <![CDATA[ */ - body { - margin: 0; - padding: 0; - border: 0; - padding-top: <%=loginheight%>; - } + <title><%= rb.getString("LOGIN_TITLE")%></title> - /* ]]> */ - </style> - <script> + var isModal = true; + function displayStatus(){ + if(window.parent.frames.length > 0){ + //loaded as modal + }else{ + try{ + //normal page + isModal = false; + document.body.style.paddingTop = ((window.innerHeight / 2) - document.getElementById('login-content').offsetHeight) + 'px'; + //document.getElementById('login-cancel').value = "<< Back"; + document.getElementById('login-cancel').onclick = function(){self.history.go(-1)}; + document.getElementById('login-submit').style.right = ''; + }catch(e){ + //swallow + } + } + } function setFocusOnLoginForm() { try @@ -61,21 +62,23 @@ { } } + </script> <link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/> </head> -<body onload="setFocusOnLoginForm();"> +<body onload="displayStatus();setFocusOnLoginForm();"> <div class="login-container"> <div class="login-header"> - <h2><%= rb.getString("LOGIN_TITLE") %> - </h2> + <%--text title--%> + <%--<h2><%= rb.getString("LOGIN_TITLE") %></h2>--%> + <%--img title--%> + <img src="/portal-core/images/logo-small-blue.gif" width="118px" height="17px"alt=""/> </div> - <div class="login-content"> - + <div class="login-content" id="login-content"> <div class="error-message" style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus") ? "" : "display:none"))%>;"> <% @@ -110,11 +113,11 @@ <div class="button-container"> <br class="clear"/> - <input style="<%=paramPresent ? "" : "display:none"%>;" type="button" name="cancel" + <input type="button" name="cancel" id="login-cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> <br class="clear"/> - <input style="<%=paramPresent ? "" : "right:10px"%>;" type="submit" name="login" + <input type="submit" name="login" id="login-submit" value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/> </div> <br class="clear"/> Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-02-28 17:02:15 UTC (rev 12913) @@ -119,6 +119,7 @@ markup.print("<script type='text/javascript' src='"); markup.print(jsBase); markup.print("/dyna.js'></script>\n"); + markup.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n"); markup.print("<script type='text/javascript'>\n"); // Async server URL needed for callbacks Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java =================================================================== --- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2009-02-28 16:37:59 UTC (rev 12912) +++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2009-02-28 17:02:15 UTC (rev 12913) @@ -86,13 +86,14 @@ PortalTheme theme = themeContext.getTheme(); // Hard code here for now - // todo remove that hack - String jsBase = rendererContext.getProperty(DynaConstants.RESOURCE_BASE_URL); + + //JBPORTAL-2285 - move to render with other dyna scripts in DynaRegionRenderer + /*String jsBase = rendererContext.getProperty(DynaConstants.RESOURCE_BASE_URL); if (jsBase != null) { out.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n"); } - + */ // If no theme provided we use what may be on the tag if (theme == null && themeName != null && themeName.length() > 0) {