Author: jasha
Date: Fri Sep 21 21:20:10 2012
New Revision: 1388687
URL: http://svn.apache.org/viewvc?rev=1388687&view=rev
Log:
RAVE-792 HTML improvements in user forms for iOS devices:
- Disable autocorrect and autocapitalize for login name field.
- Make email input fields of type email.
- A form can only have 1 autofocus field.
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp?rev=1388687&r1=1388686&r2=1388687&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
Fri Sep 21 21:20:10 2012
@@ -28,7 +28,7 @@
<div class="control-group">
<label class="control-label" for="userNameField"><fmt:message
key="page.general.username"/></label>
<div class="controls">
- <form:input id="userNameField" path="username"
required="required" autofocus="autofocus"/>
+ <form:input id="userNameField" path="username"
required="required" autofocus="autofocus" autocapitalize="off"
autocorrect="off"/>
<form:errors path="username" cssClass="error"/>
</div>
</div>
@@ -52,7 +52,9 @@
<div class="control-group">
<label class="control-label" for="emailField"><fmt:message
key="page.general.email"/></label>
<div class="controls">
- <form:input id="emailField" path="email" required="required"/>
+ <spring:bind path="email">
+ <input type="email" id="emailField" name="email"
required="required" value="<c:out value="${status.value}"/>"/>
+ </spring:bind>
<form:errors path="email" cssClass="error"/>
</div>
</div>
@@ -92,15 +94,15 @@
<fieldset>
<div class="control-group">
<label class="control-label" for="firstNameField"><fmt:message
key="page.general.first.name"/></label>
- <div class="controls"><form:input id="firstNameField"
path="givenName" autofocus="autofocus"/></div>
+ <div class="controls"><form:input id="firstNameField"
path="givenName"/></div>
</div>
<div class="control-group">
<label class="control-label" for="lastNameField"><fmt:message
key="page.general.last.name"/></label>
- <div class="controls"><form:input id="lastNameField"
path="familyName" autofocus="autofocus"/></div>
+ <div class="controls"><form:input id="lastNameField"
path="familyName"/></div>
</div>
<div class="control-group">
<label class="control-label" for="displayNameField"><fmt:message
key="page.general.display.name"/></label>
- <div class="controls"><form:input id="displayNameField"
path="displayName" autofocus="autofocus"/></div>
+ <div class="controls"><form:input id="displayNameField"
path="displayName"/></div>
</div>
<div class="control-group">
<label class="control-label" for="statusField"><fmt:message
key="page.general.relation.status"/></label>
@@ -119,7 +121,7 @@
</div>
<div class="control-group">
<label class="control-label" for="aboutMeField"><fmt:message
key="page.general.about.me"/></label>
- <div class="controls"><form:textarea id="aboutMeField"
path="aboutMe" autofocus="autofocus"/></div>
+ <div class="controls"><form:textarea id="aboutMeField"
path="aboutMe"/></div>
</div>
</fieldset>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp?rev=1388687&r1=1388686&r2=1388687&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
Fri Sep 21 21:20:10 2012
@@ -1,20 +1,20 @@
<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
--%>
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
@@ -36,85 +36,84 @@
<h1><fmt:message key="${pageTitleKey}"/></h1>
<div class="row-fluid" id="loginOptions">
- <div id="loginBlock" class="clearfix well">
- <div class="span6">
+ <div id="loginBlock" class="clearfix well">
+ <div class="span6">
<%--
//############################################
// LOGIN FORM
//############################################
--%>
- <form class="form-horizontal" id="loginForm"
name="loginForm" action="j_spring_security_check" method="post">
- <fieldset>
- <legend><fmt:message
key="page.login.usernamepassword"/></legend>
+ <form class="form-horizontal" id="loginForm"
name="loginForm" action="j_spring_security_check" method="post">
+ <fieldset>
+ <legend><fmt:message
key="page.login.usernamepassword"/></legend>
<c:if test="${param['authfail'] eq 'form'}">
<div class="alert
alert-error"><fmt:message key="page.login.usernamepassword.fail"/></div>
</c:if>
- <div class="control-group">
- <label class="control-label"
for="usernameField"><fmt:message key="page.general.username"/></label>
- <div class="controls">
- <input class="input-large"
id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="passwordField"><fmt:message key="page.general.password"/></label>
- <div class="controls">
- <input class="input-large"
id="passwordField" type="password" name="j_password"/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="remember_me">
- <fmt:message
key="page.login.rememberme"/>
- </label>
- <div class="controls">
- <input type='checkbox'
name='_spring_security_remember_me' id="remember_me" value="true"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message
key="page.login.usernamepassword.login" var="loginButtonText"/>
- <div class="controls">
- <button class="btn btn-primary"
type="submit" value="${loginButtonText}">${loginButtonText}</button>
- </div>
- </fieldset>
- </form>
- </div>
- <div class="span4">
+ <div class="control-group">
+ <label class="control-label"
for="usernameField"><fmt:message key="page.general.username"/></label>
+ <div class="controls">
+ <input class="input-large"
id="usernameField" type="text" name="j_username" autofocus="autofocus"
autocapitalize="off" autocorrect="off"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="passwordField"><fmt:message key="page.general.password"/></label>
+ <div class="controls">
+ <input class="input-large"
id="passwordField" type="password" name="j_password"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="remember_me">
+ <fmt:message
key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox'
name='_spring_security_remember_me' id="remember_me" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message
key="page.login.usernamepassword.login" var="loginButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary"
type="submit" value="${loginButtonText}">${loginButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="span4">
<%--
//############################################
// OPENID LOGIN
//############################################
--%>
- <form class="form-horizontal" id="openIdForm"
name='oidf' action='j_spring_openid_security_check' method='POST'>
- <fieldset>
- <legend><fmt:message
key="page.login.openid"/></legend>
+ <form class="form-horizontal" id="openIdForm"
name='oidf' action='j_spring_openid_security_check' method='POST'>
+ <fieldset>
+ <legend><fmt:message
key="page.login.openid"/></legend>
<c:if test="${param['authfail'] eq 'openid'}">
<div class="alert
alert-error"><fmt:message key="page.login.openid.fail"/></div>
</c:if>
- <div class="control-group">
- <label class="control-label"
for="openid_identifier"><fmt:message
key="page.login.openid.identifier"/></label>
- <div class="controls">
- <input class="input-large"
type="text" id="openid_identifier" name='openid_identifier'/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="remember_me">
- <fmt:message
key="page.login.rememberme"/>
- </label>
- <div class="controls">
- <input type='checkbox'
name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.openid.button"
var="openidButtonText"/>
- <div class="controls">
- <button class="btn btn-primary"
type="submit" value="${openidButtonText}">${openidButtonText}</button>
- </div>
- </fieldset>
-
- </form>
- </div>
- </div>
+ <div class="control-group">
+ <label class="control-label"
for="openid_identifier"><fmt:message
key="page.login.openid.identifier"/></label>
+ <div class="controls">
+ <input class="input-large" type="text"
id="openid_identifier" name="openid_identifier" autocapitalize="off"
autocorrect="off"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="remember_me">
+ <fmt:message
key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox'
name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.openid.button"
var="openidButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary"
type="submit" value="${openidButtonText}">${openidButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ </div>
</div>
</div>
</tiles:putAttribute>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp?rev=1388687&r1=1388686&r2=1388687&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
Fri Sep 21 21:20:10 2012
@@ -27,45 +27,48 @@
<rave:login_navbar hideButton="requestNewPasswordButton" />
<div class="container-fluid">
- <div class="row-fluid">
- <h1><fmt:message key="page.newpassword.title"/></h1>
- <c:choose>
- <c:when test="${success}">
- <div class="alert-message success">
- <fmt:message key="page.newpassword.email.sent">
- <fmt:param>${email}</fmt:param>
- </fmt:message>
- </div>
- <a href="<c:url value="/"/>"><fmt:message
key="page.newpassword.email.sent.login"/></a>
- </c:when>
-
- <c:otherwise>
-
- <form:form cssClass="form-horizontal well"
commandName="user" action="newpassword" method="post">
- <fieldset>
- <p><fmt:message key="form.all.fields.required"/></p>
-
- <p><form:errors cssClass="error"/></p>
-
- <div class="control-group">
- <label class="control-label"
for="emailField"><fmt:message key="page.general.email"/></label>
- <div class="controls">
- <form:input id="emailField" path="email"
required="required" autofocus="autofocus"/>
- <form:errors path="email" cssClass="error"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <div class="control-group">
- <div class="controls">${captchaHtml}</div>
- </div>
- </fieldset>
- <fieldset>
- <fmt:message
key="page.login.forgot.password.button" var="submitButtonText"/>
- <button type="submit" class="btn btn-primary"
value="${submitButtonText}">${submitButtonText}</button>
- </fieldset>
- </form:form>
- </c:otherwise>
- </c:choose>
- </div>
+ <div class="row-fluid">
+ <h1><fmt:message key="page.newpassword.title"/></h1>
+ <c:choose>
+ <c:when test="${success}">
+ <div class="alert-message success">
+ <fmt:message key="page.newpassword.email.sent">
+ <fmt:param>${email}</fmt:param>
+ </fmt:message>
+ </div>
+ <a href="<c:url value="/"/>"><fmt:message
key="page.newpassword.email.sent.login"/></a>
+ </c:when>
+
+ <c:otherwise>
+
+ <form:form cssClass="form-horizontal well" commandName="user"
action="newpassword" method="post">
+ <fieldset>
+ <p><fmt:message key="form.all.fields.required"/></p>
+
+ <p><form:errors cssClass="error"/></p>
+
+ <div class="control-group">
+ <label class="control-label"
for="emailField"><fmt:message key="page.general.email"/></label>
+ <div class="controls">
+ <spring:bind path="email">
+ <input type="email" name="email"
id="emailField" required="required" autofocus="autofocus"
+ value="<c:out
value="${status.value}"/>"/>
+ </spring:bind>
+ <form:errors path="email" cssClass="error"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">${captchaHtml}</div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.forgot.password.button"
var="submitButtonText"/>
+ <button type="submit" class="btn btn-primary"
value="${submitButtonText}">${submitButtonText}</button>
+ </fieldset>
+ </form:form>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
\ No newline at end of file
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp?rev=1388687&r1=1388686&r2=1388687&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
Fri Sep 21 21:20:10 2012
@@ -26,47 +26,50 @@
<rave:login_navbar hideButton="requestNewUsernameButton" />
<div class="container-fluid">
- <div class="row-fluid">
- <h1><fmt:message key="page.retrieveusername.title"/></h1>
- <c:choose>
- <c:when test="${success}">
-
- <div class="alert-message success">
- <fmt:message key="page.newpassword.email.sent">
- <fmt:param>${email}</fmt:param>
- </fmt:message>
- </div>
- <a href="<c:url value="/"/>"><fmt:message
key="page.newpassword.email.sent.login"/></a>
- </c:when>
-
- <c:otherwise>
- <form:form cssClass="form-horizontal well"
commandName="user" action="retrieveusername" method="post">
- <fieldset>
- <p><fmt:message key="form.all.fields.required"/></p>
-
- <p><form:errors cssClass="error"/></p>
-
- <div class="control-group">
-
- <label class="control-label"
for="emailField"><fmt:message key="page.general.email"/></label>
- <div class="controls">
- <form:input id="emailField" path="email"
required="required" autofocus="autofocus"/>
- <form:errors path="email" cssClass="error"/>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <div class="control-group">
- <div class="controls">${captchaHtml}</div>
- </div>
- </fieldset>
-
- <fieldset>
- <fmt:message
key="page.login.forgot.username.button" var="submitButtonText"/>
- <button class="btn btn-primary" type="submit"
value="${submitButtonText}">${submitButtonText}</button>
- </fieldset>
- </form:form>
- </c:otherwise>
- </c:choose>
- </div>
+ <div class="row-fluid">
+ <h1><fmt:message key="page.retrieveusername.title"/></h1>
+ <c:choose>
+ <c:when test="${success}">
+
+ <div class="alert-message success">
+ <fmt:message key="page.newpassword.email.sent">
+ <fmt:param>${email}</fmt:param>
+ </fmt:message>
+ </div>
+ <a href="<c:url value="/"/>"><fmt:message
key="page.newpassword.email.sent.login"/></a>
+ </c:when>
+
+ <c:otherwise>
+ <form:form cssClass="form-horizontal well" commandName="user"
action="retrieveusername" method="post">
+ <fieldset>
+ <p><fmt:message key="form.all.fields.required"/></p>
+
+ <p><form:errors cssClass="error"/></p>
+
+ <div class="control-group">
+
+ <label class="control-label"
for="emailField"><fmt:message key="page.general.email"/></label>
+ <div class="controls">
+ <spring:bind path="email">
+ <input type="email" name="email"
id="emailField" required="required" autofocus="autofocus"
+ value="<c:out
value="${status.value}"/>"/>
+ </spring:bind>
+ <form:errors path="email" cssClass="error"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">${captchaHtml}</div>
+ </div>
+ </fieldset>
+
+ <fieldset>
+ <fmt:message key="page.login.forgot.username.button"
var="submitButtonText"/>
+ <button class="btn btn-primary" type="submit"
value="${submitButtonText}">${submitButtonText}</button>
+ </fieldset>
+ </form:form>
+ </c:otherwise>
+ </c:choose>
+ </div>
</div>
\ No newline at end of file
