[portal-commits] JBoss Portal SVN: r12501 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war.
Author: chris.laprun(a)jboss.com
Date: 2009-01-14 10:11:19 -0500 (Wed, 14 Jan 2009)
New Revision: 12501
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
- Restore previous behavior on buttons.
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 2009-01-14
14:42:34 UTC (rev 12500)
+++
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-01-14
15:11:19 UTC (rev 12501)
@@ -28,8 +28,9 @@
<%
ResourceBundle rb = ResourceBundle.getBundle("Resource",
request.getLocale());
// todo: use ParameterValidation.sanitize after 2.7.1
- String loginheight =
- ParameterSanitizer.sanitize(request.getParameter("loginheight"),
ParameterSanitizer.CSS_DISTANCE, "300px");
+ String loginheight = request.getParameter("loginheight");
+ boolean paramPresent = loginheight != null;
+ loginheight = ParameterSanitizer.sanitize(loginheight,
ParameterSanitizer.CSS_DISTANCE, "300px");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -92,16 +93,18 @@
target="_parent">
<div class="form-field">
<label for="j_username"><%=
rb.getString("LOGIN_USERNAME") %></label>
- <input type="text" name="j_username"
id="j_username" value=""/>
+ <input type="text" name="j_username"
id="j_username" value=""/>
</div>
<div class="form-field">
<label for="j_password"><%=
rb.getString("LOGIN_PASSWORD") %></label>
- <input type="password" name="j_password"
id="j_password" value=""/>
- </div><br class="clear"/>
- <div class="button-container"><br
class="clear"/>
- <input style="display:none" type="button"
name="cancel" value="<%= rb.getString("LOGIN_CANCEL")
%>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
+ <input type="password" name="j_password"
id="j_password" value=""/>
+ </div>
+ <br class="clear"/>
+ <div class="button-container">
<br class="clear"/>
- <input style="right:10px" type="submit"
name="login" value="<%= rb.getString("LOGIN_SUBMIT")
%>" class="login-button"/>
+ <input style="<%=paramPresent ? "" :
"display:none"%>;" type="button" name="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"
value="<%= rb.getString("LOGIN_SUBMIT") %>"
class="login-button"/>
</div>
<br class="clear"/>
</form>