upd: move logout button to toplevel

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index ab0e1b6fa7e2acefa4f15feea664d18648b183cc..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 {
@@ -187,7 +187,6 @@ public final class Gigi extends HttpServlet {
             } catch (UnsupportedEncodingException e) {
                 throw new ServletException(e);
             }
-            baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
 
             Menu languages = new Menu("Language");
@@ -223,7 +222,7 @@ public final class Gigi extends HttpServlet {
 
     private static Gigi instance;
 
-    private Template baseTemplate;
+    private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));;
 
     private PingerDaemon pinger;