]> WPIA git - gigi.git/commitdiff
projects / gigi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4ef7ef0)
Comment out about menu, policy list, sponsor links and footer
authorINOPIAE <m.maengel@inopiae.de>
Sun, 8 May 2016 15:41:55 +0000 (17:41 +0200)
committerLucas Werkmeister <mail@lucaswerkmeister.de>
Thu, 26 May 2016 19:21:04 +0000 (21:21 +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 36afac6fe43d1f32b53ec5f6af13f6a02a616d6b..0ee1d1ce5b4bed4d8c0fd8da3e3d98afc8947e6d 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -38,7 +38,6 @@ import org.cacert.gigi.pages.LogoutPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.pages.PasswordResetPage;
-import org.cacert.gigi.pages.PolicyIndex;
 import org.cacert.gigi.pages.RootCertPage;
 import org.cacert.gigi.pages.StaticPage;
 import org.cacert.gigi.pages.TestSecure;
@@ -177,18 +176,6 @@ public final class Gigi extends HttpServlet {
             }
             baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
             rootMenu = new MenuCollector();
-            Menu about = new Menu("About SomeCA.org");
-            categories.add(about);
-
-            about.addItem(new SimpleMenuItem("//blog.cacert.org/", "SomeCA News"));
-            about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation"));
-            putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About SomeCA.org");
-            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", "SomeCA Board"));
-            about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists"));
-            about.addItem(new SimpleMenuItem("//blog.SomeCA.org/feed", "RSS News Feed"));
-            about.addItem(new SimpleMenuItem("//wiki.cacert.org/Impress", "Impress"));
 
             Menu languages = new Menu("Translations");
             for (Locale l : Language.getSupportedLocales()) {
diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index 423be491695d0560adef83ebe7ea88d87ee91a08..bedc99e10b359d31e54ffb438c6ce4e8bdf60dcc 100644 (file)
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.SomeCA.org/feed">
+        <!-- <link rel="alternate" type="application/rss+xml" title="Newsfeed" href="//blog.SomeCA.org/feed"> -->
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <title><?=$title?></title>
         <meta name="description" content="">
@@ -49,13 +49,14 @@
        </div>
        <hr/>
                <div id="siteInfo">
-                       <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_About Us?></a> |
+            Page info
+                       <!-- <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_About Us?></a> |
                        <a href="/index.php?id=13"><?=_Donations?></a> |
                        <a href="//wiki.cacert.org/wiki/CAcertIncorporated"><?=_Association Membership?></a> |
                        <a href="/policy/PrivacyPolicy.html"><?=_Privacy Policy?></a> |
                        <a href="/index.php?id=51"><?=_Mission Statement?></a> |
-                       <a href="/index.php?id=11"><?=_Contact Us?></a> |
-                       ©2014-<?=$year?> SomeCA
+                       <a href="/index.php?id=11"><?=_Contact Us?></a> --> |
+                       ©2016-<?=$year?> SomeCA
                </div>
 
 </body>
WPIA Certificate Web Issuance Platform