9:54 a.m.
Author: wesleyhales
Date: 2007-11-26 10:54:01 -0500 (Mon, 26 Nov 2007)
New Revision: 9112
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.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/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2007-11-26
15:49:35 UTC (rev 9111)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2007-11-26
15:54:01 UTC (rev 9112)
@@ -2,13 +2,13 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
width: 255px;
- height: 155px;
border: 1px solid #436999;
position: relative;
margin: 0 auto 0 auto;
background-color:white;
}
+input.cancel-button,
input.login-button {
background-color: #5078AA;
border-color: #97B7C6 rgb( 37, 72, 105 ) rgb( 37, 72, 105 ) rgb( 151, 183, 198 );
@@ -18,7 +18,16 @@
font-size: 10px;
font-weight: bold;
position: absolute;
+}
+
+input.login-button {
bottom: 20px;
+ width: 60px;
+ right: 90px
+}
+
+input.cancel-button {
+ bottom: 20px;
right: 10px;
width: 70px;
}
@@ -46,7 +55,6 @@
background-position: top left;
background-repeat: repeat-x;
width: 255px;
- height: 116px;
font-weight: bold;
padding: 10px 0 0 0;
text-align: right;
@@ -60,7 +68,13 @@
div.error-message {
color: red;
margin: 0 auto 0 auto;
- width: 300px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-size: 11px;
+ padding: 5px;
+ font-weight:normal;
+ text-align:left;
+}
+
+div.bottom-field{
+ padding-bottom: 68px;
}
\ No newline at end of file
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
15:49:35 UTC (rev 9111)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/js/modal.js 2007-11-26
15:54:01 UTC (rev 9112)
@@ -266,7 +266,7 @@
objOverlay.style.position = 'absolute';
objOverlay.style.top = '0';
objOverlay.style.left = '0';
- objOverlay.style.zIndex = '90';
+ objOverlay.style.zIndex = '101';
objOverlay.style.width = '100%';
objBody.insertBefore(objOverlay, objBody.firstChild);
var arrayPageSize = getPageSize();
@@ -303,7 +303,7 @@
objModal.className = 'modal';
objModal.style.display = 'none';
objModal.style.position = 'absolute';
- objModal.style.zIndex = '100';
+ objModal.style.zIndex = '102';
objBody.insertBefore(objModal, objOverlay.nextSibling);
// create link
@@ -503,7 +503,7 @@
objOverlay.style.position = 'absolute';
objOverlay.style.top = '0';
objOverlay.style.left = '0';
- objOverlay.style.zIndex = '90';
+ objOverlay.style.zIndex = '101';
objOverlay.style.width = '100%';
objOverlay.onclick = function (){hideContentModal(modalId); return false};
@@ -518,7 +518,7 @@
objModal.className = 'modal';
objModal.style.display = 'none';
objModal.style.position = 'absolute';
- objModal.style.zIndex = '100';
+ objModal.style.zIndex = '102';
objModal.style.width = contentWidth + 'px';
objModal.style.height = contentHeight + 'px';
objModal.innerHTML = contentBody.innerHTML;
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-11-26
15:49:35 UTC (rev 9111)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-11-26
15:54:01 UTC (rev 9112)
@@ -36,16 +36,16 @@
<link rel="stylesheet" href="/portal-core/css/login.css"
type="text/css" />
</head>
<body OnLoad="document.loginform.j_username.focus();">
-<div class="error-message"
-
style="display:<%=(request.getAttribute("org.jboss.portal.loginError")
!= null ? "" :
"none")%>;"><%=request.getAttribute("org.jboss.portal.loginError")
%>
-</div>
+
<div class="login-container">
<div class="login-header">
<h2>JBoss Portal Login</h2>
</div>
<div class="login-content">
-
+ <div class="error-message"
+
style="display:<%=(request.getAttribute("org.jboss.portal.loginError")
!= null ? "" :
"none")%>;"><%=request.getAttribute("org.jboss.portal.loginError")
%>
+ </div>
<form method="POST" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
target="_parent">
<label for="j_username">
@@ -53,11 +53,11 @@
<input type="text" name="j_username"
id="j_username" value=""/></div>
</label>
<label for="j_password">
- <div class="form-field">Password:
+ <div class="form-field bottom-field">Password:
<input type="password" name="j_password"
id="j_password" value=""/></div>
</label>
-
- <input type="submit" name="login" value="Login"
class="login-button"/>
+ <input
style="display:<%=(request.getParameter("loginheight") != null ?
"" : "none")%>;" type="button"
name="cancel" value="Cancel" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="Login" class="login-button"/>
</form>
</div>