top bar now reacts to pagename variable, login page doesn't show top bar contents anymore, closes #371

pull/576/head
Justin Richer 2014-02-18 22:20:30 -05:00
parent 478463bd5a
commit 8736c24310
4 changed files with 69 additions and 67 deletions

View File

@ -34,10 +34,11 @@
<span class="icon-bar"></span>
</button>
<a class="brand" href="">${config.topbarTitle}</a>
<c:if test="${ not empty pageName }">
<div class="nav-collapse collapse">
<ul class="nav">
<c:choose>
<c:when test="${pageName == 'Home' || empty pageName}">
<c:when test="${pageName == 'Home'}">
<li class="active"><a href="">Home</a></li>
</c:when>
<c:otherwise>
@ -99,6 +100,7 @@
</ul>
</div><!--/.nav-collapse -->
</c:if>
</div>
</div>
</div>

View File

@ -6,7 +6,7 @@
<%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<o:header title="Approve Access" />
<o:topbar />
<o:topbar pageName="Approve" />
<div class="container main">
<% if (session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY) != null && !(session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY) instanceof UnapprovedClientAuthenticationException)) { %>
<div class="alert-message error">

View File

@ -3,7 +3,7 @@
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
<o:header title="welcome" />
<o:topbar />
<o:topbar pageName="Home" />
<div class="container-fluid main">
<div class="row-fluid">
<o:sidebar />

View File

@ -2,7 +2,7 @@
<%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
<o:header title="Management Console"/>
<o:topbar />
<o:topbar pageName="Home" />
<div class="container-fluid main">
<div class="row-fluid">
<o:sidebar/>