From 2fb0af2c1dd48272ffcc1d501324ff1f609331d4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sun, 24 Aug 2014 02:11:43 +0200
Subject: [PATCH] Fix menu exploding (so that we don't need the id's anymore)

---
 src/org/cacert/gigi/Gigi.java        |  4 ++--
 src/org/cacert/gigi/output/Menu.java | 13 ++++---------
 static/static/menu.js                | 12 ++++++------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 245dff9d..74bfd623 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -84,7 +84,7 @@ public class Gigi extends HttpServlet {
             putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates");
             putPage(DomainOverview.PATH, new DomainOverview("Domains"), "Certificates");
             baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));
-            rootMenu = new Menu("Main", "");
+            rootMenu = new Menu("Main");
             for (Menu menu : categories) {
                 menu.prepare();
                 rootMenu.addItem(menu);
@@ -109,7 +109,7 @@ public class Gigi extends HttpServlet {
             }
         }
         if (m == null) {
-            m = new Menu(category, "");
+            m = new Menu(category);
             categories.add(m);
         }
         m.addItem(new PageMenuItem(p));
diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index b1fc745a..a57f5317 100644
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -13,15 +13,12 @@ public class Menu implements IMenuItem {
 
     private String menuName;
 
-    private String id;
-
     private IMenuItem[] content;
 
     private LinkedList<IMenuItem> prepare = new LinkedList<IMenuItem>();
 
-    public Menu(String menuName, String id) {
+    public Menu(String menuName) {
         this.menuName = menuName;
-        this.id = id;
     }
 
     @Override
@@ -33,12 +30,10 @@ public class Menu implements IMenuItem {
                 if ( !visible) {
                     visible = true;
                     out.println("<div>");
-                    out.print("<h3>+ ");
+                    out.print("<h3 class='pointer'>+ ");
                     out.print(l.getTranslation(menuName));
-                    out.print("</h3>");
-                    out.print("<ul class=\"menu\" id=\"");
-                    out.print(id);
-                    out.print("\">");
+                    out.println("</h3>");
+                    out.print("<ul class=\"menu\">");
                 }
                 mi.output(out, l, vars);
             }
diff --git a/static/static/menu.js b/static/static/menu.js
index aff0c36b..023e6244 100644
--- a/static/static/menu.js
+++ b/static/static/menu.js
@@ -1,9 +1,9 @@
 (function() {
 	function explodeMenu(e) {
-		if (document.getElementById(e).className == 'menu hidden') {
-			document.getElementById(e).className = 'menu';
+		if (e.className == 'menu hidden') {
+			e.className = 'menu';
 		} else {
-			document.getElementById(e).className = 'menu hidden';
+			e.className = 'menu hidden';
 		}
 	}
 
@@ -13,11 +13,11 @@
 		for (var i = 0; i < max; i++) {
 			var nodeObj = Nodes.item(i);
 			if (nodeObj.className.indexOf("menu") > -1 && nodeObj.id != "recom") {
-				nodeObj.previousSibling.previousSibling.onclick = (function(nid) {
+				nodeObj.previousSibling.previousSibling.onclick = (function(node) {
 					return function() {
-						explodeMenu(nid);
+						explodeMenu(node);
 					};
-				})(nodeObj.id);
+				})(nodeObj);
 			}
 		}
 	}
-- 
2.39.2