[portal-commits] JBoss Portal SVN: r11699 - in branches/JBoss_Portal_Branch_2_7/core/src: resources/portal-server-war and 1 other directory.
Author: wesleyhales
Date: 2008-08-18 22:20:27 -0400 (Mon, 18 Aug 2008)
New Revision: 11699
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2121
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-08-19
02:20:04 UTC (rev 11698)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-08-19
02:20:27 UTC (rev 11699)
@@ -18,17 +18,18 @@
font-size: 10px;
font-weight: bold;
position: absolute;
- width: 75px;
}
input.login-button {
- bottom: 20px;
- right: 90px
+ bottom: 25px;
+ right: 90px;
+ width: 75px;
}
input.cancel-button {
- bottom: 20px;
+ bottom: 25px;
right: 10px;
+ width: 75px;
}
div.login-container div.login-header {
@@ -55,13 +56,12 @@
background-repeat: repeat-x;
width: 255px;
font-weight: bold;
- padding: 10px 0 0 0;
text-align: right;
}
div.login-container div.login-content div.form-field {
height: 25px;
- padding-right: 7px;
+ padding: 5px 11px 0 0;
}
div.error-message {
@@ -74,6 +74,7 @@
text-align:left;
}
-div.bottom-field{
- padding-bottom: 68px;
+div.button-container{
+ height: 50px;
+ position: relative;
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-08-19
02:20:04 UTC (rev 11698)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-08-19
02:20:27 UTC (rev 11699)
@@ -25,7 +25,7 @@
<%@page import="java.util.ResourceBundle"%>
<%
- ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale());
+ ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource",
request.getLocale());
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -60,16 +60,16 @@
<div class="login-container">
-
+
<div class="login-header">
<h2><%= rb.getString("LOGIN_TITLE") %></h2>
</div>
<div class="login-content">
-
+
<div class="error-message"
style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus")
? "" : "display:none"))%>;">
<%
-
+
if
(UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
{
out.println(rb.getString("ACCOUNT_DISABLED"));
@@ -90,12 +90,15 @@
<label for="j_username"><%=
rb.getString("LOGIN_USERNAME") %></label>
<input type="text" name="j_username"
id="j_username" value=""/>
</div>
- <div class="form-field bottom-field">
+ <div class="form-field">
<label for="j_password"><%=
rb.getString("LOGIN_PASSWORD") %></label>
<input type="password" name="j_password"
id="j_password" value=""/>
</div>
- <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="<%= rb.getString("LOGIN_CANCEL")
%>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
- <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="<%= rb.getString("LOGIN_SUBMIT")
%>" class="login-button"/>
+ <div class="button-container">
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "display:none")%>;" type="button"
name="cancel" value="<%= rb.getString("LOGIN_CANCEL")
%>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+ <input style="<%=(request.getParameter("loginheight") !=
null ? "" : "right:10px")%>;" type="submit"
name="login" value="<%= rb.getString("LOGIN_SUBMIT")
%>" class="login-button"/>
+ </div>
+ <br class="clear"/>
</form>
</div>