diff --git a/java/google/registry/config/ConfigModule.java b/java/google/registry/config/ConfigModule.java index 8e696c404..22fb62a4e 100644 --- a/java/google/registry/config/ConfigModule.java +++ b/java/google/registry/config/ConfigModule.java @@ -81,6 +81,34 @@ public final class ConfigModule { return config.getProjectId(); } + /** The filename of the logo to be displayed in the header of the registrar console. */ + @Provides + @Config("logoFilename") + public static String provideLogoFilename(RegistryEnvironment environment) { + switch (environment) { + case UNITTEST: + case LOCAL: + return "logo.png"; + default: + // Change this to the filename of your logo. + return "google_registry.png"; + } + } + + /** The product name of this specific registry. Used throughout the registrar console. */ + @Provides + @Config("productName") + public static String provideProductName(RegistryEnvironment environment) { + switch (environment) { + case UNITTEST: + case LOCAL: + return "Domain Registry"; + default: + // Change this to the name of your product. + return "Google Registry"; + } + } + /** @see RegistryConfig#getZoneFilesBucket() */ @Provides @Config("zoneFilesBucket") diff --git a/java/google/registry/ui/assets/images/glogo_black.png b/java/google/registry/ui/assets/images/glogo_black.png deleted file mode 100644 index f280ffc31..000000000 Binary files a/java/google/registry/ui/assets/images/glogo_black.png and /dev/null differ diff --git a/java/google/registry/ui/assets/images/google_registry.png b/java/google/registry/ui/assets/images/google_registry.png new file mode 100644 index 000000000..45682d07c Binary files /dev/null and b/java/google/registry/ui/assets/images/google_registry.png differ diff --git a/java/google/registry/ui/assets/images/logo.png b/java/google/registry/ui/assets/images/logo.png new file mode 100644 index 000000000..0531700ca Binary files /dev/null and b/java/google/registry/ui/assets/images/logo.png differ diff --git a/java/google/registry/ui/css/registry.css b/java/google/registry/ui/css/registry.css index 1f5f8e14d..9d7bbd3cd 100644 --- a/java/google/registry/ui/css/registry.css +++ b/java/google/registry/ui/css/registry.css @@ -129,7 +129,7 @@ input#kd-searchfield { /* Logo */ a.logo { - vertical-align: top; + vertical-align: middle; font-size: 30px; font-weight: 300; font-family: "open sans", sans-serif; @@ -137,12 +137,7 @@ a.logo { } a.logo * { - vertical-align: top; -} - -a.logo img { - /* Get the baseline of "Google" and "Registry" to line up. */ - margin-top: 1px; + vertical-align: middle; } /* Reg prefix. */ diff --git a/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/java/google/registry/ui/server/registrar/ConsoleUiAction.java index b942d2502..49f346a08 100644 --- a/java/google/registry/ui/server/registrar/ConsoleUiAction.java +++ b/java/google/registry/ui/server/registrar/ConsoleUiAction.java @@ -58,6 +58,8 @@ public final class ConsoleUiAction implements Runnable { @Inject Response response; @Inject SessionUtils sessionUtils; @Inject UserService userService; + @Inject @Config("logoFilename") String logoFilename; + @Inject @Config("productName") String productName; @Inject @Config("registrarConsoleEnabled") boolean enabled; @Inject ConsoleUiAction() {} @@ -66,19 +68,22 @@ public final class ConsoleUiAction implements Runnable { response.setContentType(MediaType.HTML_UTF_8); response.setHeader(X_FRAME_OPTIONS, "SAMEORIGIN"); // Disallow iframing. response.setHeader("X-Ui-Compatible", "IE=edge"); // Ask IE not to be silly. + SoyMapData data = new SoyMapData(); + data.put("logoFilename", logoFilename); + data.put("productName", productName); if (!enabled) { response.setStatus(SC_SERVICE_UNAVAILABLE); response.setPayload( TOFU_SUPPLIER.get() .newRenderer(ConsoleSoyInfo.DISABLED) .setCssRenamingMap(CSS_RENAMING_MAP_SUPPLIER.get()) + .setData(data) .render()); return; } + data.put("username", userService.getCurrentUser().getNickname()); + data.put("logoutUrl", userService.createLogoutURL(PATH)); if (!sessionUtils.checkRegistrarConsoleLogin(req)) { - SoyMapData data = new SoyMapData(); - data.put("username", userService.getCurrentUser().getNickname()); - data.put("logoutUrl", userService.createLogoutURL(PATH)); response.setStatus(SC_FORBIDDEN); response.setPayload( TOFU_SUPPLIER.get() @@ -89,12 +94,9 @@ public final class ConsoleUiAction implements Runnable { return; } Registrar registrar = Registrar.loadByClientId(sessionUtils.getRegistrarClientId(req)); - SoyMapData data = new SoyMapData(); data.put("xsrfToken", XsrfTokenManager.generateToken(EppConsoleAction.XSRF_SCOPE)); data.put("clientId", registrar.getClientId()); - data.put("username", userService.getCurrentUser().getNickname()); data.put("isAdmin", userService.isUserAdmin()); - data.put("logoutUrl", userService.createLogoutURL(PATH)); data.put("showPaymentLink", registrar.getBillingMethod() == Registrar.BillingMethod.BRAINTREE); response.setPayload( TOFU_SUPPLIER.get() diff --git a/java/google/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy index a9c798604..38b5776e5 100644 --- a/java/google/registry/ui/soy/Console.soy +++ b/java/google/registry/ui/soy/Console.soy @@ -70,9 +70,11 @@ {template .googlebar} {@param username: string} {@param logoutUrl: string} + {@param logoFilename: string} + {@param productName: string}