You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/21 22:08:53 UTC
git commit: ISIS-537: moved the 'about' link to footer,
and moved the 'logout' link into a dropdown.
Repository: isis
Updated Branches:
refs/heads/master 0a2e5dc48 -> 133547e33
ISIS-537: moved the 'about' link to footer, and moved the 'logout' link into a dropdown.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/133547e3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/133547e3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/133547e3
Branch: refs/heads/master
Commit: 133547e3359a1df149adcc1644625d1fabe4dc31
Parents: 0a2e5dc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 21 21:08:43 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 21 21:08:43 2014 +0100
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/133547e3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 4bb9cd3..4ce3bcf 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -48,10 +48,17 @@
<form class="navbar-form navbar-left">
<span wicket:id="breadcrumbs"></span>
</form>
- <p class="navbar-text"><i class="fa fa-user"></i> <span wicket:id="userName"></span></p>
<ul class="nav navbar-nav">
- <li><a wicket:id="logoutLink" class="navbar-right"><i class="fa fa-sign-out"></i> <wicket:message key="logoutLabel"></wicket:message> </a></li>
- <li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <i class="fa fa-user"></i> <span wicket:id="userName"></span><span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu" role="menu" style="min-width: 0px;">
+ <li class="navbar-right">
+ <a wicket:id="logoutLink"><i class="fa fa-sign-out"></i><wicket:message key="logoutLabel"></wicket:message></a>
+ </li>
+ </ul>
+ </li>
</ul>
</div>
<div class="navbar-collapse app-actions collapse">
@@ -87,6 +94,7 @@
<li><a href="http://isis.apache.org" target="_blank">Apache Isis</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
+ <li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
<li wicket:id="themePicker"></li>
</ul>
</div>