Author: raminder
Date: Mon Jul 23 15:39:18 2012
New Revision: 1364686
URL: http://svn.apache.org/viewvc?rev=1364686&view=rev
Log:
Applying patch from Viknes. Rave-658
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1364686&r1=1364685&r2=1364686&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
Mon Jul 23 15:39:18 2012
@@ -62,10 +62,11 @@ public class NewAccountController {
}
@RequestMapping(value = "/newaccount.jsp")
- public void setUpForm(ModelMap model, HttpServletRequest request) {
+ public String setUpForm(ModelMap model, HttpServletRequest request) {
logger.debug("Initializing form");
model.addAttribute(ModelKeys.CAPTCHA_HTML,
captchaService.createHtml(request));
model.addAttribute(ModelKeys.NEW_USER, new UserImpl());
+ return ViewNames.NEW_ACCOUNT;
}
@RequestMapping(value = {"/newaccount", "/newaccount/*"}, method =
RequestMethod.POST)
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=1364686&r1=1364685&r2=1364686&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
Mon Jul 23 15:39:18 2012
@@ -19,49 +19,45 @@ under the License.
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%-- Note: This page has the body definition embedded so we can reference it
directly from the security config file. --%>
-<tiles:insertDefinition name="templates.base">
- <%-- Override the default pageTitleKey and then export it to the request
scope for use later on this page --%>
- <tiles:putAttribute name="pageTitleKey" value="page.newaccount.title"/>
- <tiles:importAttribute name="pageTitleKey" scope="request"/>
- <tiles:putAttribute name="body">
- <header>
- <nav>
- <div class="navbar navbar-fixed-top">
- <div class="container">
- <a href="/" class="brand">RAVE</a>
- <ul class="nav pull-right">
- <li class="divider-vertical"></li>
- <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>
- </ul>
- </div>
- </div>
- </nav>
- </header>
- <br><br>
- <div class="container navbar-spacer">
- <h1>${pagetitle}</h1>
+<%-- Override the default pageTitleKey and then export it to the request scope
for use later on this page --%>
+<tiles:putAttribute name="pageTitleKey" value="page.newaccount.title"/>
+<tiles:importAttribute name="pageTitleKey" scope="request"/>
- <!-- Login information (required) -->
- <h2><fmt:message key="page.general.login.information"/></h2>
- <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+<header>
+ <nav>
+ <div class="navbar navbar-fixed-top">
+ <div class="container">
+ <a href="/" class="brand">RAVE</a>
+ <ul class="nav pull-right">
+ <li class="divider-vertical"></li>
+ <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>
+ </ul>
+ </div>
</div>
- </tiles:putAttribute>
-</tiles:insertDefinition>
+ </nav>
+</header>
+<br><br>
+<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" %>
+</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
