]> WPIA git - gigi.git/commitdiff
projects / gigi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c9be5d5)
Move "About CAcert"-Menu to dynamic content.
authorFelix Dörre <felix@dogcraft.de>
Sat, 30 Aug 2014 21:54:25 +0000 (23:54 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 30 Aug 2014 21:54:25 +0000 (23:54 +0200)
src/org/cacert/gigi/Gigi.java patch | blob | history
src/org/cacert/gigi/Gigi.templ patch | blob | history

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 79cf670f9ba3a2eb1f3a932dc06e14129235636c..5a41bf68e849092b60210e8dc814bbded19cb2c9 100644 (file)
--- 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 4c156ad8abe9a25ec303550fa5de3e1cc773a144..2cb3d90f6fc53e098252c1a08d5989cb3cffa58b 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -4,6 +4,7 @@
 <title><?=$title?></title>
 <link rel="stylesheet" href="<?=$static?>/default.css" type="text/css">
 <script src="<?=$static?>/menu.js"></script>
+<link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.CAcert.org/feed">
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head>
 <body>
@@ -20,22 +21,6 @@
                </div>
                <div id="pageNav">
                        <?=$menu?>
-                       <div>
-                               <h3 class="pointer">+ Über CAcert.org</h3>
-                               <ul class="menu hidden" id="misc">
-                                       <li><a href="//blog.cacert.org/">CAcert-Nachrichten</a></li>
-                                       <li><a href="//wiki.CAcert.org/">Wiki-Dokumentation</a></li>
-                                       <li><a href="/policy/">Richtlinien</a></li>
-                                       <li><a href="//wiki.cacert.org/FAQ/Privileges">Punkte-System</a></li>
-                                       <li><a href="//bugs.CAcert.org/">Fehler-Datenbank</a></li>
-                                       <li><a href="/stats.php">CAcert-Statistik</a></li>
-                                       <li><a href="//blog.CAcert.org/feed/">RSS-Nachrichten-Feed</a></li>
-                                       <li><a href="//wiki.cacert.org/Board">CAcert-Vorstand</a></li>
-                                       <li><a href="//lists.cacert.org/wws">Mailinglisten</a></li>
-                                       <li><a href="/src-lic.php">Quellcode</a></li>
-                               </ul>
-                       </div>
-
                        <div>
                                <h3 class="pointer">+ <?=_Translations?></h3>
                                <ul class="menu hidden" id="trans">
WPIA Certificate Web Issuance Platform