UPD: change names for Cert/Pass login.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index c5ab1bca91e1b1bfcf03485c1d89e39a69dc8270..ff1b9693cfa3c423c7f0f057a5230d7c2460445f 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -96,8 +96,14 @@ public class Gigi extends HttpServlet {
     public void init() throws ServletException {
         if ( !firstInstanceInited) {
             putPage("/error", new PageNotFound(), null);
-            putPage("/login", new LoginPage("CAcert - Login"), "CAcert.org");
-            getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "CAcert - Login (Certificate)"));
+            putPage("/login", new LoginPage("Password Login"), "CAcert.org");
+            getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") {
+
+                @Override
+                public boolean isPermitted(User u) {
+                    return u == null;
+                }
+            });
             putPage("/", new MainPage("CAcert - Home"), null);
             putPage("/roots", new RootCertPage(truststore), "CAcert.org");
             putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");