You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ma...@apache.org on 2012/04/24 15:51:14 UTC
svn commit: r1329719 - in
/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views:
admin/newaccount.jsp includes/login-navbar.jsp includes/new_user_form.jsp
newaccount.jsp newpassword.jsp retrieveusername.jsp
Author: marijan
Date: Tue Apr 24 13:51:13 2012
New Revision: 1329719
URL: http://svn.apache.org/viewvc?rev=1329719&view=rev
Log:
RAVE-536 Admin area: fix layout
- introduce login navbar
- merge git changes
- use bootstrap layout for forgot username/password forms & new user account
Added:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
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/newaccount.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/admin/newaccount.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp?rev=1329719&r1=1329718&r2=1329719&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp Tue Apr 24 13:51:13 2012
@@ -23,30 +23,21 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<c:set var="canChangeUserStatus" value="${user.username ne loggedInUser}"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
- <ul class="horizontal-list goback">
- <li><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a>
- </li>
- </ul>
-
- <div class="rightcolumn">
- <%--RIGHT COLUMN--%>
+<div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span1">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span11">
+ <ul class="pager">
+ <li class="previous">
+ <a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a>
+ </li>
+ </ul>
+ <section class="formbox">
+ <h2><fmt:message key="admin.userdetail.editdata"/></h2>
+ <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+ </section>
+ </article>
</div>
-
- <div class="leftcolumn">
- <section class="formbox">
- <h2><fmt:message key="admin.userdetail.editdata"/></h2>
- <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
- </section>
-
- </div>
-
- <div class="clear-float">
-
- </div>
-
-
- </article>
-</div>
+</div>
\ No newline at end of file
Added: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp?rev=1329719&view=auto
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp (added)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp Tue Apr 24 13:51:13 2012
@@ -0,0 +1,39 @@
+<%@ page language="java" trimDirectiveWhitespaces="true" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<header>
+
+ <nav>
+ <div class="navbar navbar-fixed-top">
+ <div class="container">
+ <a href="/" class="brand">RAVE</a>
+
+ <ul class="nav pull-right">
+ <li>
+ <form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
+ <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
+ <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+ </form>
+ </li>
+ <li class="divider-vertical"></li>
+ <li>
+ <form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
+ <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
+ <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+ </form>
+ </li>
+ <li class="divider-vertical"></li>
+
+ <li>
+ <form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
+ <fieldset>
+ <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
+ <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+ </fieldset>
+ </form>
+ </li>
+ <li class="divider-vertical"></li>
+ </ul>
+ </div>
+ </div>
+ </nav>
+</header>
\ No newline at end of file
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=1329719&r1=1329718&r2=1329719&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 Tue Apr 24 13:51:13 2012
@@ -19,86 +19,100 @@
under the License.
--%>
-<form:form id="newAccountForm" commandName="newUser" action="newaccount" method="POST">
- <fieldset>
- <p><fmt:message key="form.all.fields.required"/></p>
-
- <p><form:errors cssClass="error"/></p>
-
- <p>
- <label for="userNameField"><fmt:message key="page.general.username"/></label>
- <form:input id="userNameField" path="username" required="required" autofocus="autofocus"/>
- <form:errors path="username" cssClass="error"/>
- </p>
-
- <p>
- <label for="passwordField"><fmt:message key="page.general.password"/></label>
- <form:password id="passwordField" path="password" required="required"/>
- <form:errors path="password" cssClass="error"/>
- </p>
-
- <p>
- <label for="passwordConfirmField"><fmt:message key="page.general.confirmpassword"/></label>
- <form:password id="passwordConfirmField" path="confirmPassword" required="required"/>
- <form:errors path="confirmPassword" cssClass="error"/>
- </p>
-
- <p>
- <label for="emailField"><fmt:message key="page.general.email"/></label>
- <form:input id="emailField" path="email" required="required"/>
- <form:errors path="email" cssClass="error"/>
- </p>
-
- <p>
- <label for="pageLayoutField"><fmt:message key="page.general.addpage.selectlayout"/></label>
- <form:select path="pageLayout" id="pageLayoutField">
- <form:option value="columns_1" id="columns_1_id"><fmt:message
- key="page.general.addpage.layout.columns_1"/></form:option>
- <form:option value="columns_2" id="columns_2_id"><fmt:message
- key="page.general.addpage.layout.columns_2"/></form:option>
- <form:option value="columns_2wn" id="columns_2wn_id"><fmt:message
- key="page.general.addpage.layout.columns_2wn"/></form:option>
- <form:option value="columns_3" id="columns_3_id"><fmt:message
- key="page.general.addpage.layout.columns_3"/></form:option>
- <form:option value="columns_3nwn" id="columns_3nwn_id"><fmt:message
- key="page.general.addpage.layout.columns_3nwn"/></form:option>
- <form:option value="columns_4" id="columns_4_id"><fmt:message
- key="page.general.addpage.layout.columns_4"/></form:option>
- <form:option value="columns_3nwn_1_bottom" id="columns_3nwn_1_bottom"><fmt:message
- key="page.general.addpage.layout.columns_3nwn_1_bottom"/></form:option>
- </form:select>
- </p>
- </fieldset>
-
- <fieldset>${captchaHtml}</fieldset>
-
- <!-- Personal information optional -->
- <h2><fmt:message key="page.general.personal.information"/></h2>
- <fieldset>
- <p>
- <label for="firstNameField"><fmt:message key="page.general.first.name"/></label>
- <form:input id="firstNameField" path="firstName" autofocus="autofocus"/>
- </p>
- <p>
- <label for="lastNameField"><fmt:message key="page.general.last.name"/></label>
- <form:input id="lastNameField" path="lastName" autofocus="autofocus"/>
- </p>
- <p>
- <label for="displayNameField"><fmt:message key="page.general.display.name"/></label>
- <form:input id="displayNameField" path="displayName" autofocus="autofocus"/>
- </p>
- <p>
- <label for="statusField"><fmt:message key="page.general.status"/></label>
- <form:input id="statusField" path="status" autofocus="autofocus"/>
- </p>
- <p>
- <label for="aboutMeField"><fmt:message key="page.general.about.me"/></label>
- <form:textarea id="aboutMeField" path="aboutMe" autofocus="autofocus"/>
- </p>
- </fieldset>
-
- <fieldset>
- <fmt:message key="page.newaccount.button" var="submitButtonText"/>
- <input type="submit" value="${submitButtonText}"/>
- </fieldset>
-</form:form>
+<form:form cssClass="form-horizontal" id="newAccountForm" commandName="newUser" action="newaccount" 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="userNameField"><fmt:message key="page.general.username"/></label>
+ <div class="controls">
+ <form:input id="userNameField" path="username" required="required" autofocus="autofocus"/>
+ <form:errors path="username" cssClass="error"/>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
+ <div class="controls">
+ <form:password id="passwordField" path="password" required="required"/>
+ <form:errors path="password" cssClass="error"/>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label" for="passwordConfirmField"><fmt:message key="page.general.confirmpassword"/></label>
+ <div class="controls">
+ <form:password id="passwordConfirmField" path="confirmPassword" required="required"/>
+ <form:errors path="confirmPassword" cssClass="error"/>
+ </div>
+ </div>
+
+ <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"/>
+ <form:errors path="email" cssClass="error"/>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label" for="pageLayoutField"><fmt:message key="page.general.addpage.selectlayout"/></label>
+ <div class="controls">
+ <form:select path="pageLayout" id="pageLayoutField">
+ <form:option value="columns_1" id="columns_1_id"><fmt:message
+ key="page.general.addpage.layout.columns_1"/></form:option>
+ <form:option value="columns_2" id="columns_2_id"><fmt:message
+ key="page.general.addpage.layout.columns_2"/></form:option>
+ <form:option value="columns_2wn" id="columns_2wn_id"><fmt:message
+ key="page.general.addpage.layout.columns_2wn"/></form:option>
+ <form:option value="columns_3" id="columns_3_id"><fmt:message
+ key="page.general.addpage.layout.columns_3"/></form:option>
+ <form:option value="columns_3nwn" id="columns_3nwn_id"><fmt:message
+ key="page.general.addpage.layout.columns_3nwn"/></form:option>
+ <form:option value="columns_4" id="columns_4_id"><fmt:message
+ key="page.general.addpage.layout.columns_4"/></form:option>
+ <form:option value="columns_3nwn_1_bottom" id="columns_3nwn_1_bottom"><fmt:message
+ key="page.general.addpage.layout.columns_3nwn_1_bottom"/></form:option>
+ </form:select>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">${captchaHtml}</div>
+ </div>
+ </fieldset>
+
+ <!-- Personal information optional -->
+ <h2><fmt:message key="page.general.personal.information"/></h2>
+ <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="firstName" autofocus="autofocus"/></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="lastName" autofocus="autofocus"/></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>
+ <div class="control-group">
+ <label class="control-label" for="statusField"><fmt:message key="page.general.status"/></label>
+ <div class="controls"><form:input id="statusField" path="status" autofocus="autofocus"/></div>
+ </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>
+ </fieldset>
+
+ <fieldset>
+ <fmt:message key="page.newaccount.button" var="submitButtonText"/>
+ <button class="btn btn-primary" type="submit" value="${submitButtonText}">${submitButtonText}</button>
+ </fieldset>
+</form:form>
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp?rev=1329719&r1=1329718&r2=1329719&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp Tue Apr 24 13:51:13 2012
@@ -26,9 +26,10 @@ under the License.
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <div id="content">
+ <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.jsp" %>
+ <div class="container navbar-spacer">
<h1>${pagetitle}</h1>
-
+
<!-- Login information (required) -->
<h2><fmt:message key="page.general.login.information"/></h2>
<%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
@@ -40,4 +41,4 @@ under the License.
<script>
$(document).ready(rave.forms.validateNewAccountForm());
</script>
-</portal:register-init-script>
+</portal:register-init-script>
\ No newline at end of file
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=1329719&r1=1329718&r2=1329719&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 Tue Apr 24 13:51:13 2012
@@ -26,11 +26,11 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <div id="content">
+ <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.jsp" %>
+ <div class="container navbar-spacer">
<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>
@@ -41,27 +41,32 @@
<c:otherwise>
- <h2><fmt:message key="page.newpassword.password.title"/></h2>
- <form:form commandName="newUser" action="newpassword" method="post">
+ <form:form cssClass="form-horizontal well" commandName="newUser" action="newpassword" method="post">
<fieldset>
<p><fmt:message key="form.all.fields.required"/></p>
<p><form:errors cssClass="error"/></p>
- <p>
- <label for="emailField"><fmt:message key="page.general.email"/></label>
- <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
- <form:errors path="email" 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>${captchaHtml}</fieldset>
<fieldset>
<fmt:message key="page.login.forgot.password.button" var="submitButtonText"/>
- <input type="submit" value="${submitButtonText}"/>
+ <button type="submit" class="btn btn-primary" value="${submitButtonText}">${submitButtonText}</button>
</fieldset>
</form:form>
</c:otherwise>
</c:choose>
</div>
</tiles:putAttribute>
-</tiles:insertDefinition>
+</tiles:insertDefinition>
\ 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=1329719&r1=1329718&r2=1329719&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 Tue Apr 24 13:51:13 2012
@@ -25,7 +25,8 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <div id="content">
+ <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.jsp" %>
+ <div class="container navbar-spacer">
<h1><fmt:message key="page.retrieveusername.title"/></h1>
<c:choose>
<c:when test="${success}">
@@ -39,28 +40,34 @@
</c:when>
<c:otherwise>
-
- <h2><fmt:message key="page.newpassword.username.title"/></h2>
- <form:form commandName="newUser" action="retrieveusername" method="post">
+ <form:form cssClass="form-horizontal well" commandName="newUser" action="retrieveusername" method="post">
<fieldset>
<p><fmt:message key="form.all.fields.required"/></p>
<p><form:errors cssClass="error"/></p>
- <p>
- <label for="emailField"><fmt:message key="page.general.email"/></label>
- <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
- <form:errors path="email" 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>${captchaHtml}</fieldset>
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">${captchaHtml}</div>
+ </div>
+ </fieldset>
+
<fieldset>
<fmt:message key="page.login.forgot.username.button" var="submitButtonText"/>
- <input type="submit" value="${submitButtonText}"/>
+ <button class="btn btn-primary" type="submit" value="${submitButtonText}">${submitButtonText}</button>
</fieldset>
</form:form>
</c:otherwise>
</c:choose>
</div>
</tiles:putAttribute>
-</tiles:insertDefinition>
+</tiles:insertDefinition>
\ No newline at end of file