You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/08/30 22:44:25 UTC
svn commit: r264854 -
/incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
Author: snoopdave
Date: Tue Aug 30 13:44:13 2005
New Revision: 264854
URL: http://svn.apache.org/viewcvs?rev=264854&view=rev
Log:
Rearrange status banner
Modified:
incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
Modified: incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp?rev=264854&r1=264853&r2=264854&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp Tue Aug 30 13:44:13 2005
@@ -11,36 +11,44 @@
<div class="bannerStatusBox">
<div class="bannerLeft">
- <roller:link forward="main">
- <%= RollerRuntimeConfig.getProperty("site.shortName") %>
- </roller:link>
- </div>
-
- <div class="bannerRight">
-
+
<% if (user != null) { %>
<fmt:message key="mainPage.loggedInAs" />
<b><%= user.getUserName() %></b>
- |
<% } %>
<c:if test="${!empty model.website}" >
- <fmt:message key="mainPage.currentWebsite" />
+ | <fmt:message key="mainPage.currentWebsite" />
<b><c:out value="${model.website.handle}" /></b>
- |
</c:if>
+
+ </div>
+
+ <div class="bannerRight">
+
+ <roller:link forward="main">
+ <%= RollerRuntimeConfig.getProperty("site.shortName") %>
+ </roller:link>
- <roller:link forward="yourWebsites">
+ | <roller:link forward="yourWebsites">
<fmt:message key="mainPage.mainMenu" />
</roller:link>
<% if (user != null) { %>
- | <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
+ | <html:link forward="logout-redirect">
+ <fmt:message key="navigationBar.logout"/>
+ </html:link>
<% } else if (allowNewUsers) { %>
- | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
- | <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
+ | <html:link forward="login-redirect">
+ <fmt:message key="navigationBar.login"/>
+ </html:link>
+ | <html:link forward="registerUser">
+ <fmt:message key="navigationBar.register"/>
+ </html:link>
<% } else { %>
- | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+ | <html:link forward="login-redirect">
+ <fmt:message key="navigationBar.login"/>
+ </html:link>
<% } %>
</div>