From ea1cb8576551bc4404b5d0cdce1a436d9df7894f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 2 Jun 2016 12:16:20 +0200 Subject: [PATCH] upd: Cleanup lang-string locations Change-Id: Ibbc6cd4d2871633abaf3489e23f094a62b1cacd2 --- src/org/cacert/gigi/Gigi.java | 20 +++++++++---------- src/org/cacert/gigi/pages/LoginPage.java | 4 ++-- src/org/cacert/gigi/pages/LogoutPage.java | 4 ++-- src/org/cacert/gigi/pages/MainPage.java | 4 ++-- .../pages/account/domain/DomainOverview.java | 4 ++-- .../gigi/pages/account/mail/MailOverview.java | 4 ++-- .../pages/admin/support/FindDomainPage.java | 4 ++-- .../pages/admin/support/FindUserPage.java | 4 ++-- .../admin/support/SupportUserDetailsPage.java | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 71786545..b80f9c75 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -108,7 +108,7 @@ public final class Gigi extends HttpServlet { public MenuCollector generateMenu() throws ServletException { putPage("/denied", new AccessDenied(), null); putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("Password Login"), null); + putPage("/login", new LoginPage(), null); getMenu("SomeCA.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") { @Override @@ -123,7 +123,7 @@ public final class Gigi extends HttpServlet { return ac == null; } }); - putPage("/", new MainPage("SomeCA - Home"), null); + putPage("/", new MainPage(), null); putPage("/roots", new RootCertPage(truststore), "SomeCA.org"); putPage("/secure", new TestSecure(), null); @@ -131,8 +131,8 @@ public final class Gigi extends HttpServlet { putPage(Certificates.PATH + "/*", new Certificates(), "Certificates"); putPage(RegisterPage.PATH, new RegisterPage(), "SomeCA.org"); putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates"); - putPage(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates"); - putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates"); + putPage(MailOverview.DEFAULT_PATH, new MailOverview(), "Certificates"); + putPage(DomainOverview.PATH + "*", new DomainOverview(), "Certificates"); putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust"); putPage(MyPoints.PATH, new MyPoints(), "Web of Trust"); @@ -144,12 +144,12 @@ public final class Gigi extends HttpServlet { putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin"); putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console"); - putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console"); - putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console"); + putPage(FindUserPage.PATH, new FindUserPage(), "Support Console"); + putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console"); - putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null); + putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); - putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account"); + putPage(LogoutPage.PATH, new LogoutPage(), "My Account"); putPage(History.PATH, new History(false), "My Account"); putPage(History.SUPPORT_PATH, new History(true), null); putPage(UserTrainings.PATH, new UserTrainings(false), "My Account"); @@ -430,7 +430,7 @@ public final class Gigi extends HttpServlet { csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure()); csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure()); csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure()); - //csp.append(";report-url https://api.cacert.org/security/csp/report"); + // csp.append(";report-url https://api.cacert.org/security/csp/report"); return csp.toString(); } @@ -443,7 +443,7 @@ public final class Gigi extends HttpServlet { csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort()); csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort()); csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePort()); - //csp.append(";report-url http://api.cacert.org/security/csp/report"); + // csp.append(";report-url http://api.cacert.org/security/csp/report"); return csp.toString(); } diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java index 23a703ef..97a0c29f 100644 --- a/src/org/cacert/gigi/pages/LoginPage.java +++ b/src/org/cacert/gigi/pages/LoginPage.java @@ -48,8 +48,8 @@ public class LoginPage extends Page { public static final String LOGIN_RETURNPATH = "login-returnpath"; - public LoginPage(String title) { - super(title); + public LoginPage() { + super("Password Login"); } @Override diff --git a/src/org/cacert/gigi/pages/LogoutPage.java b/src/org/cacert/gigi/pages/LogoutPage.java index 1a854837..6f568f12 100644 --- a/src/org/cacert/gigi/pages/LogoutPage.java +++ b/src/org/cacert/gigi/pages/LogoutPage.java @@ -13,8 +13,8 @@ public class LogoutPage extends Page { public static final String PATH = "/logout"; - public LogoutPage(String title) { - super(title); + public LogoutPage() { + super("Logout"); } @Override diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java index 6e4d8ea2..44930b08 100644 --- a/src/org/cacert/gigi/pages/MainPage.java +++ b/src/org/cacert/gigi/pages/MainPage.java @@ -12,8 +12,8 @@ public class MainPage extends Page { Template notLog = new Template(MainPage.class.getResource("MainPageNotLogin.templ")); - public MainPage(String title) { - super(title); + public MainPage() { + super("SomeCA - Home"); } @Override diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java index ed707612..41fa5c4d 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java @@ -18,8 +18,8 @@ public class DomainOverview extends Page { public static final String PATH = "/account/domains/"; - public DomainOverview(String title) { - super(title); + public DomainOverview() { + super("Domains"); } @Override diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java index 61f583ab..e3b59916 100644 --- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java +++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java @@ -17,8 +17,8 @@ public class MailOverview extends Page { public static final String DEFAULT_PATH = "/account/mails"; - public MailOverview(String title) { - super(title); + public MailOverview() { + super("Email addresses"); } @Override diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java index ac3d9f73..06d41621 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java +++ b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java @@ -11,8 +11,8 @@ public class FindDomainPage extends OneFormPage { public static final String PATH = "/support/find/domain"; - public FindDomainPage(String title) { - super(title, FindDomainForm.class); + public FindDomainPage() { + super("Find Domain", FindDomainForm.class); } @Override diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java index 562f0e89..059298f8 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java @@ -19,8 +19,8 @@ public class FindUserPage extends Page { public static final String PATH = "/support/find/user"; - public FindUserPage(String title) { - super(title); + public FindUserPage() { + super("Find User"); } @Override diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java index 5cc35b53..726bdd39 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java +++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java @@ -22,8 +22,8 @@ public class SupportUserDetailsPage extends Page { public static final String PATH = "/support/user/"; - public SupportUserDetailsPage(String title) { - super(title); + public SupportUserDetailsPage() { + super("Support: User Details"); } @Override -- 2.39.2