1:44 p.m.
Author: wesleyhales
Date: 2007-11-26 14:44:19 -0500 (Mon, 26 Nov 2007)
New Revision: 9114
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
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/generic/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBPORTAL-1789 :Improve login page of jboss-portal to match JBP LnF
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26
16:27:40 UTC (rev 9113)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26
19:44:19 UTC (rev 9114)
@@ -2,7 +2,7 @@
var loadingImage = 'loading.gif';
var closeButton = 'close.gif';
-
+var isModalLoaded = false
//
// getPageScroll()
// Returns array with x,y page scroll values.
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
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-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/common/modal.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -1,5 +1,5 @@
-<script src="/portal-core/js/modal.js"
type="text/javascript"></script>
-<link rel="stylesheet" href="/portal-core/css/modal.css"
type="text/css" />
+<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%"; %>
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2007-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -16,7 +16,7 @@
<body id="body">
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<%@ include file="../common/modal.jsp" %>
+<%@include file="/layouts/common/modal.jsp"%>
<div id="portal-container">
<div id="sizer">
<div id="expander">
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-11-26
16:27:40 UTC (rev 9113)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-11-26
19:44:19 UTC (rev 9114)
@@ -16,15 +16,20 @@
if (user == null)
{
%>
+<script type="text/javascript">
+ if (typeof isModalLoaded != 'undefined'){
+ document.write('<a href=\"#\"
onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return
false;\">Login</a>');
+ }else{
+ document.write('<a href=\"<%= loginURL
%>\">Login</a>');
+ }
- <script type="text/javascript">
- document.write('<a href=\"#\"
onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return
false;\">Login</a>');
- </script>
+</script>
<noscript>
<a href="<%= loginURL %>">Login</a>
</noscript>
+
<%
}
else
@@ -60,4 +65,4 @@
%> <a href="<%= signOutURL
%>">Logout</a>
<%
}
-%>
\ No newline at end of file
+%>