Author: raminder
Date: Fri Jul 6 20:42:53 2012
New Revision: 1358406
URL: http://svn.apache.org/viewvc?rev=1358406&view=rev
Log:
applied patch from viknes. Rave-657
Modified:
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/newaccount.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp?rev=1358406&r1=1358405&r2=1358406&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
Fri Jul 6 20:42:53 2012
@@ -26,7 +26,33 @@ under the License.
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.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>
+ </nav>
+ </header>
+ <br><br>
<div class="container navbar-spacer">
<h1>${pagetitle}</h1>
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=1358406&r1=1358405&r2=1358406&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 Jul 6 20:42:53 2012
@@ -26,7 +26,36 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.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/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>
+ <br><br>
<div class="container navbar-spacer">
<h1><fmt:message key="page.newpassword.title"/></h1>
<c:choose>
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=1358406&r1=1358405&r2=1358406&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 Jul 6 20:42:53 2012
@@ -25,7 +25,35 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <%@ include file="/WEB-INF/jsp/views/includes/login-navbar.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/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>
+ <br><br>
<div class="container navbar-spacer">
<h1><fmt:message key="page.retrieveusername.title"/></h1>
<c:choose>
