add: group to block an account for issuing new certs.

[gigi.git] / src / org / cacert / gigi / output / Menu.java

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index b1fc745ad1ed7858bc7852ac035e1e375645ed7c..6c37617584a3f5012d413fdef2511a71c7354772 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -4,41 +4,36 @@ 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;
 
-    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
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         boolean visible = false;
-        User u = (User) vars.get(USER_VALUE);
+        AuthorizationContext u = (AuthorizationContext) vars.get(AUTH_VALUE);
         for (IMenuItem mi : content) {
             if (mi.isPermitted(u)) {
                 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);
             }
@@ -63,7 +58,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() {
@@ -71,7 +71,7 @@ public class Menu implements IMenuItem {
     }
 
     @Override
-    public boolean isPermitted(User u) {
+    public boolean isPermitted(AuthorizationContext ac) {
         return true;
     }
 }