From 8fe2307f83e7f544e6d18c0311791b48b3a28dca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 30 Aug 2014 23:54:25 +0200 Subject: [PATCH] Move "About CAcert"-Menu to dynamic content. --- src/org/cacert/gigi/Gigi.java | 13 +++++++++++++ src/org/cacert/gigi/Gigi.templ | 17 +---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 79cf670f..5a41bf68 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -21,6 +21,7 @@ import org.cacert.gigi.output.Form.CSRFException; import org.cacert.gigi.output.Menu; import org.cacert.gigi.output.Outputable; import org.cacert.gigi.output.PageMenuItem; +import org.cacert.gigi.output.SimpleMenuItem; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; @@ -106,6 +107,18 @@ public class Gigi extends HttpServlet { menu.prepare(); rootMenu.addItem(menu); } + Menu about = new Menu("About CAcert.org"); + about.addItem(new SimpleMenuItem("//blog.cacert.org/", "CAcert News")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation")); + about.addItem(new SimpleMenuItem("/policy", "Policies")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/FAQ/Privileges", "Point System")); + about.addItem(new SimpleMenuItem("//bugs.cacert.org/", "Bug Database")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "CAcert Board")); + about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists")); + about.addItem(new SimpleMenuItem("//blog.CAcert.org/feed", "RSS News Feed")); + about.prepare(); + rootMenu.addItem(about); + rootMenu.prepare(); firstInstanceInited = true; } diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ index 4c156ad8..2cb3d90f 100644 --- a/src/org/cacert/gigi/Gigi.templ +++ b/src/org/cacert/gigi/Gigi.templ @@ -4,6 +4,7 @@ <?=$title?> + @@ -20,22 +21,6 @@