X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FMenu.java;h=f351b7326c94c2310e9677091b9d2cb879fc5c74;hb=07f74d10bddc819f4524e2e0c1a2815eb4e7ec79;hp=a57f531764467f413082f85fb07d9c87dfe2afd6;hpb=2fb0af2c1dd48272ffcc1d501324ff1f609331d4;p=gigi.git

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index a57f5317..f351b732 100644
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -4,12 +4,12 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class Menu implements IMenuItem {
 
-    public static final String USER_VALUE = "user";
+    public static final String AUTH_VALUE = "ac";
 
     private String menuName;
 
@@ -24,22 +24,20 @@ public class Menu implements IMenuItem {
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         boolean visible = false;
-        User u = (User) vars.get(USER_VALUE);
-        for (IMenuItem mi : content) {
+        AuthorizationContext u = (AuthorizationContext) vars.get(AUTH_VALUE);
+        for (IMenuItem mi : getContent()) {
             if (mi.isPermitted(u)) {
                 if ( !visible) {
                     visible = true;
-                    out.println("<div>");
-                    out.print("<h3 class='pointer'>+ ");
+                    out.print("<li class=\"dropdown\"><a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">");
                     out.print(l.getTranslation(menuName));
-                    out.println("</h3>");
-                    out.print("<ul class=\"menu\">");
+                    out.print("<span class=\"caret\"></span></a><ul class=\"dropdown-menu\">");
                 }
                 mi.output(out, l, vars);
             }
         }
         if (visible) {
-            out.println("</ul></div>");
+            out.println("</ul></li>");
         }
     }
 
@@ -58,7 +56,12 @@ public class Menu implements IMenuItem {
         if (obj instanceof Menu) {
             return menuName.equals(((Menu) obj).getMenuName());
         }
-        return super.equals(obj);
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return menuName.hashCode();
     }
 
     public String getMenuName() {
@@ -66,7 +69,12 @@ public class Menu implements IMenuItem {
     }
 
     @Override
-    public boolean isPermitted(User u) {
+    public boolean isPermitted(AuthorizationContext ac) {
         return true;
     }
+
+    public IMenuItem[] getContent() {
+        return content;
+    }
+
 }