top bar now reacts to pagename variable, login page doesn't show top bar contents anymore, closes #371
Justin Richer
parent
478463bd5a
commit
8736c24310
|
|
@ -34,71 +34,73 @@
|
|||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="brand" href="">${config.topbarTitle}</a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Home' || empty pageName}">
|
||||
<li class="active"><a href="">Home</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="">Home</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'About'}">
|
||||
<li class="active"><a href="">About</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="about">About</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Statistics'}">
|
||||
<li class="active"><a href="">Statistics</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="stats">Statistics</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Contact'}">
|
||||
<li class="active"><a href="">Contact</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="contact">Contact</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
||||
|
||||
<security:authorize access="hasRole('ROLE_USER')">
|
||||
|
||||
<li class="dropdown hidden-desktop"><a href="#"
|
||||
class="dropdown-toggle" data-toggle="dropdown">Action <b
|
||||
class="caret"></b></a>
|
||||
<c:if test="${ not empty pageName }">
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Home'}">
|
||||
<li class="active"><a href="">Home</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="">Home</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'About'}">
|
||||
<li class="active"><a href="">About</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="about">About</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Statistics'}">
|
||||
<li class="active"><a href="">Statistics</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="stats">Statistics</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:choose>
|
||||
<c:when test="${pageName == 'Contact'}">
|
||||
<li class="active"><a href="">Contact</a></li>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<li><a href="contact">Contact</a></li>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
||||
|
||||
<security:authorize access="hasRole('ROLE_USER')">
|
||||
|
||||
<li class="dropdown hidden-desktop"><a href="#"
|
||||
class="dropdown-toggle" data-toggle="dropdown">Action <b
|
||||
class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
<o:actionmenu />
|
||||
</ul></li>
|
||||
|
||||
</security:authorize>
|
||||
|
||||
</ul>
|
||||
<ul class="nav pull-right">
|
||||
<security:authorize access="hasRole('ROLE_USER')">
|
||||
<div class="btn-group">
|
||||
<a class="btn btn-primary btn-small dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<o:actionmenu />
|
||||
</ul></li>
|
||||
|
||||
</security:authorize>
|
||||
|
||||
</ul>
|
||||
<ul class="nav pull-right">
|
||||
<security:authorize access="hasRole('ROLE_USER')">
|
||||
<div class="btn-group">
|
||||
<a class="btn btn-primary btn-small dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a>${ longName }</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="logout"><i class="icon-remove"></i> Log out</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</security:authorize>
|
||||
<security:authorize access="!hasRole('ROLE_USER')">
|
||||
<a class="btn btn-primary btn-small" href="login"><i class="icon-user icon-white"></i> Log in</a>
|
||||
</security:authorize>
|
||||
</ul>
|
||||
|
||||
</div><!--/.nav-collapse -->
|
||||
<li><a>${ longName }</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="logout"><i class="icon-remove"></i> Log out</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</security:authorize>
|
||||
<security:authorize access="!hasRole('ROLE_USER')">
|
||||
<a class="btn btn-primary btn-small" href="login"><i class="icon-user icon-white"></i> Log in</a>
|
||||
</security:authorize>
|
||||
</ul>
|
||||
|
||||
</div><!--/.nav-collapse -->
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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 />
|
||||
|
|
|
|||
|
|
@ -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/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue