From 22651bb7f2d19e28bc5b6c615406ef1d92094243 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 9 Nov 2014 23:02:30 +0100 Subject: [PATCH] UPD: change names for Cert/Pass login. --- src/org/cacert/gigi/Gigi.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index c5ab1bca..ff1b9693 100644 --- 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"); -- 2.39.2