upd: move logout button to toplevel

Change-Id: I689d5ed6d537779b29849a7898bb54d832311450

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index e55f97a226e1d7692784b69102865368c0a109b2..41e504f8fbb29b2a99ebf6c0354bd11a5f0c93b6 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -155,7 +155,6 @@ public final class Gigi extends HttpServlet {
 
             putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);
             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
-            putPage(LogoutPage.PATH, new LogoutPage(), "My Account");
             putPage(History.PATH, new History(false), "My Account");
             putPage(FindAgentAccess.PATH, new OneFormPage("Access to Find Agent", FindAgentAccess.class) {
 
@@ -170,6 +169,7 @@ public final class Gigi extends HttpServlet {
             putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null);
 
             putPage(PasswordResetPage.PATH, new PasswordResetPage(), null);
+            putPage(LogoutPage.PATH, new LogoutPage(), null);
 
             if (testing) {
                 try {

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index a163c7d532f74f74bdb5f3f9500b33c9e6a29e6c..9884721a68457a01430d2dfa60e1c34b576a08bb 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -36,8 +36,9 @@
       <ul class="nav navbar-nav">
         <?=$menu?>
       </ul>
-      <ul class="nav navbra-nav navbar-right">
-      <li><p class="navbar-text"><? if($authContext) { ?><?=$authContext?><? } ?></p></li>
+      <ul class="nav navbar-nav navbar-right">
+      <? if($authContext) { ?><li><p class="navbar-text"><?=$authContext?></p></li><? } ?>
+      <? if($authContext) { ?><li><span class="btn-group"><a href="/logout" class="btn btn-primary">Logout</a></span></li><? } ?>
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->