diff --git a/java/google/registry/ui/css/kd_components.css b/java/google/registry/ui/css/kd_components.css index ea44f760e..4e150c4ec 100644 --- a/java/google/registry/ui/css/kd_components.css +++ b/java/google/registry/ui/css/kd_components.css @@ -1244,12 +1244,12 @@ li.kd-labellistitem a.kd-label-blue { Component: App bars ------------------------------------------------------------------*/ .kd-appbar { - position:relative; + position: relative; padding: 21px 0; border-bottom: 1px solid #ebebeb; - height: 29px; - z-index:20; - background:#fff; + height: 66px; + z-index: 20; + background: #fff; } .kd-appbar .kd-appname { width: 160px; @@ -1263,6 +1263,22 @@ Component: App bars color: #666; white-space:nowrap; } +.kd-appbar .kd-description { + height: 29px; + font-size: 20px; + font-weight: normal; + line-height: 29px; + padding-bottom: 8px; + color: #666; + white-space:nowrap; +} +.kd-appbar .kd-description .kd-value { + color: black; + font-weight: bold; +} +.kd-appbar .kd-description form { + display: inline; +} .kd-appbar .kd-appname a { color: #666; cursor:pointer; } #stickers .kd-appbar .kd-buttonbar { margin-bottom: 0; diff --git a/java/google/registry/ui/css/registry.css b/java/google/registry/ui/css/registry.css index 9d7bbd3cd..ad8e4d45d 100644 --- a/java/google/registry/ui/css/registry.css +++ b/java/google/registry/ui/css/registry.css @@ -196,13 +196,10 @@ li.kd-menulistitem { } .kd-appbar { - padding: 0.75em 0; -} - -#reg-app-buttons { - /* Same as in reg-content below. Lines the left edge of the - appbuttons and content area with the 'R' in Registry. */ + /* same as in reg-content below. lines the left edge of the + appbuttons and content area with the 'r' in registry. */ padding-left: 173px; + padding-top: .75em; } .kd-content-sidebar { @@ -214,7 +211,7 @@ li.kd-menulistitem { #reg-nav { position: fixed; left: 0; - top: 128px; + top: 136px; width: 155px; margin: 0 25px 0 0; z-index: 3; @@ -261,7 +258,7 @@ li.kd-menulistitem { #reg-content-and-footer { position: absolute; - top: 105px; + top: 136px; left: 173px; bottom: 0; width: 100%; diff --git a/java/google/registry/ui/js/edit_item.js b/java/google/registry/ui/js/edit_item.js index 433646369..131f88eb7 100644 --- a/java/google/registry/ui/js/edit_item.js +++ b/java/google/registry/ui/js/edit_item.js @@ -31,10 +31,11 @@ goog.forwardDeclare('registry.Console'); * An editable item, with Edit and Save/Cancel buttons in the appbar. * @param {!registry.Console} cons * @param {function()} itemTmpl + * @param {boolean} isEditable * @constructor * @extends {registry.Component} */ -registry.EditItem = function(cons, itemTmpl) { +registry.EditItem = function(cons, itemTmpl, isEditable) { registry.EditItem.base(this, 'constructor', cons); /** @@ -48,6 +49,12 @@ registry.EditItem = function(cons, itemTmpl) { */ this.id = null; + /** + * Should the "edit" button be enabled? + * @type {boolean} + */ + this.isEditable = isEditable; + /** * Transitional id for next resource during create. * @type {?string} @@ -68,7 +75,7 @@ registry.EditItem.prototype.bindToDom = function(id) { /** Setup appbar save/edit buttons. */ registry.EditItem.prototype.setupAppbar = function() { - goog.soy.renderElement(goog.dom.getRequiredElement('reg-appbar'), + goog.soy.renderElement(goog.dom.getRequiredElement('reg-app-buttons'), registry.soy.console.appbarButtons); goog.events.listen(goog.dom.getRequiredElement('reg-app-btn-add'), goog.events.EventType.CLICK, @@ -85,11 +92,11 @@ registry.EditItem.prototype.setupAppbar = function() { goog.events.listen(goog.dom.getRequiredElement('reg-app-btn-back'), goog.events.EventType.CLICK, goog.bind(this.back, this)); - if (this.id) { - registry.util.setVisible('reg-app-btns-edit', true); - } else { - registry.util.setVisible('reg-app-btn-add', true); - } + // Show the add/edit buttons only if isEditable. + // "edit" is shown if we have an item's ID + // "add" is shown if we don't have an item's ID + registry.util.setVisible('reg-app-btns-edit', this.isEditable && !!this.id); + registry.util.setVisible('reg-app-btn-add', this.isEditable && !this.id); }; diff --git a/java/google/registry/ui/js/registrar/admin_settings.js b/java/google/registry/ui/js/registrar/admin_settings.js index 2fa6f696c..24a4c0272 100644 --- a/java/google/registry/ui/js/registrar/admin_settings.js +++ b/java/google/registry/ui/js/registrar/admin_settings.js @@ -39,7 +39,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.AdminSettings = function(console, resource) { registry.registrar.AdminSettings.base( this, 'constructor', console, resource, - registry.soy.registrar.admin.settings, null); + registry.soy.registrar.admin.settings, console.params.isAdmin, null); }; goog.inherits(registry.registrar.AdminSettings, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/contact_settings.js b/java/google/registry/ui/js/registrar/contact_settings.js index d690bc79a..5284f6ad1 100644 --- a/java/google/registry/ui/js/registrar/contact_settings.js +++ b/java/google/registry/ui/js/registrar/contact_settings.js @@ -45,7 +45,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.ContactSettings = function(console, resource) { registry.registrar.ContactSettings.base( this, 'constructor', console, resource, - registry.soy.registrar.contacts.contact, null); + registry.soy.registrar.contacts.contact, console.params.isOwner, null); }; goog.inherits(registry.registrar.ContactSettings, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/contact_us.js b/java/google/registry/ui/js/registrar/contact_us.js index 0d19c09ad..73b1f97eb 100644 --- a/java/google/registry/ui/js/registrar/contact_us.js +++ b/java/google/registry/ui/js/registrar/contact_us.js @@ -34,7 +34,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.ContactUs = function(console, resource) { registry.registrar.ContactUs.base( this, 'constructor', console, resource, - registry.soy.registrar.console.contactUs, null); + registry.soy.registrar.console.contactUs, console.params.isOwner, null); }; goog.inherits(registry.registrar.ContactUs, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/dashboard.js b/java/google/registry/ui/js/registrar/dashboard.js index 1fdb7b980..17ffbaad7 100644 --- a/java/google/registry/ui/js/registrar/dashboard.js +++ b/java/google/registry/ui/js/registrar/dashboard.js @@ -52,7 +52,7 @@ goog.inherits(registry.registrar.Dashboard, registry.Component); /** @override */ registry.registrar.Dashboard.prototype.bindToDom = function(id) { registry.registrar.Dashboard.base(this, 'bindToDom', ''); - goog.dom.removeChildren(goog.dom.getRequiredElement('reg-appbar')); + goog.dom.removeChildren(goog.dom.getRequiredElement('reg-app-buttons')); goog.soy.renderElement(goog.dom.getElement('reg-content'), registry.soy.registrar.console.dashboard, this.console.params); diff --git a/java/google/registry/ui/js/registrar/main.js b/java/google/registry/ui/js/registrar/main.js index dc44a4d1b..1a8ad1df4 100644 --- a/java/google/registry/ui/js/registrar/main.js +++ b/java/google/registry/ui/js/registrar/main.js @@ -29,6 +29,7 @@ goog.require('registry.registrar.Console'); * @param {string} xsrfToken populated by server-side soy template. * @param {string} clientId The registrar clientId. * @param {boolean} isAdmin + * @param {boolean} isOwner * @param {string} productName the product name displayed by the UI. * @param {string} integrationEmail * @param {string} supportEmail @@ -37,14 +38,15 @@ goog.require('registry.registrar.Console'); * @param {string} technicalDocsUrl * @export */ -registry.registrar.main = function(xsrfToken, clientId, isAdmin, productName, - integrationEmail, supportEmail, +registry.registrar.main = function(xsrfToken, clientId, isAdmin, isOwner, + productName, integrationEmail, supportEmail, announcementsEmail, supportPhoneNumber, technicalDocsUrl) { new registry.registrar.Console({ xsrfToken: xsrfToken, clientId: clientId, isAdmin: isAdmin, + isOwner: isOwner, productName: productName, integrationEmail: integrationEmail, supportEmail: supportEmail, diff --git a/java/google/registry/ui/js/registrar/resources.js b/java/google/registry/ui/js/registrar/resources.js index 5f188a38d..e6116813e 100644 --- a/java/google/registry/ui/js/registrar/resources.js +++ b/java/google/registry/ui/js/registrar/resources.js @@ -34,7 +34,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.Resources = function(console, resource) { registry.registrar.Resources.base( this, 'constructor', console, resource, - registry.soy.registrar.console.resources, null); + registry.soy.registrar.console.resources, console.params.isOwner, null); }; goog.inherits(registry.registrar.Resources, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/security_settings.js b/java/google/registry/ui/js/registrar/security_settings.js index 31a2c95ba..8c092b63e 100644 --- a/java/google/registry/ui/js/registrar/security_settings.js +++ b/java/google/registry/ui/js/registrar/security_settings.js @@ -39,7 +39,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.SecuritySettings = function(console, resource) { registry.registrar.SecuritySettings.base( this, 'constructor', console, resource, - registry.soy.registrar.security.settings, null); + registry.soy.registrar.security.settings, console.params.isOwner, null); }; goog.inherits(registry.registrar.SecuritySettings, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/whois_settings.js b/java/google/registry/ui/js/registrar/whois_settings.js index 68297dbb7..a87d0dca6 100644 --- a/java/google/registry/ui/js/registrar/whois_settings.js +++ b/java/google/registry/ui/js/registrar/whois_settings.js @@ -34,7 +34,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.WhoisSettings = function(console, resource) { registry.registrar.WhoisSettings.base( this, 'constructor', console, resource, - registry.soy.registrar.whois.settings, null); + registry.soy.registrar.whois.settings, console.params.isOwner, null); }; goog.inherits(registry.registrar.WhoisSettings, registry.ResourceComponent); diff --git a/java/google/registry/ui/js/registrar/xml_resource_component.js b/java/google/registry/ui/js/registrar/xml_resource_component.js index b3b9a083d..2f736bc08 100644 --- a/java/google/registry/ui/js/registrar/xml_resource_component.js +++ b/java/google/registry/ui/js/registrar/xml_resource_component.js @@ -37,7 +37,7 @@ goog.forwardDeclare('registry.registrar.Console'); registry.registrar.XmlResourceComponent = function( itemTmpl, eppTmpls, console) { registry.registrar.XmlResourceComponent.base( - this, 'constructor', console, itemTmpl); + this, 'constructor', console, itemTmpl, console.params.isOwner); /** @type {!Object} */ this.eppTmpls = eppTmpls; diff --git a/java/google/registry/ui/js/resource_component.js b/java/google/registry/ui/js/resource_component.js index 5f1084b56..469260978 100644 --- a/java/google/registry/ui/js/resource_component.js +++ b/java/google/registry/ui/js/resource_component.js @@ -33,6 +33,7 @@ goog.forwardDeclare('registry.Resource'); * @param {!registry.Console} console console singleton. * @param {!registry.Resource} resource the RESTful resource. * @param {!Function} itemTmpl + * @param {boolean} isEditable if true, the "edit" button will be enabled * @param {Function} renderSetCb may be null if this resource is only * ever an item. * @constructor @@ -42,8 +43,10 @@ registry.ResourceComponent = function( console, resource, itemTmpl, + isEditable, renderSetCb) { - registry.ResourceComponent.base(this, 'constructor', console, itemTmpl); + registry.ResourceComponent.base( + this, 'constructor', console, itemTmpl, isEditable); /** @type {!registry.Resource} */ this.resource = resource; @@ -108,7 +111,7 @@ registry.ResourceComponent.prototype.handleFetchItem = function(id, rsp) { } else if ('set' in rsp && this.renderSetCb != null) { // XXX: This conditional logic should be hoisted to edit_item when // collection support is improved. - goog.dom.removeChildren(goog.dom.getRequiredElement('reg-appbar')); + goog.dom.removeChildren(goog.dom.getRequiredElement('reg-app-buttons')); this.renderSetCb(goog.dom.getRequiredElement('reg-content'), rsp); } else { registry.util.log('unknown message type in handleFetchItem'); diff --git a/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/java/google/registry/ui/server/registrar/ConsoleUiAction.java index 39668b9f0..e6c3331a2 100644 --- a/java/google/registry/ui/server/registrar/ConsoleUiAction.java +++ b/java/google/registry/ui/server/registrar/ConsoleUiAction.java @@ -17,6 +17,7 @@ package google.registry.ui.server.registrar; import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.HttpHeaders.X_FRAME_OPTIONS; import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.ADMIN; +import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.OWNER; import static google.registry.ui.server.registrar.RegistrarConsoleModule.PARAM_CLIENT_ID; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; @@ -141,6 +142,7 @@ public final class ConsoleUiAction implements Runnable { try { clientId = paramClientId.orElse(registrarAccessor.guessClientId()); data.put("clientId", clientId); + data.put("isOwner", roleMap.containsEntry(clientId, OWNER)); data.put("isAdmin", roleMap.containsEntry(clientId, ADMIN)); // We want to load the registrar even if we won't use it later (even if we remove the diff --git a/java/google/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy index 1619f27ed..7a1bec533 100644 --- a/java/google/registry/ui/soy/Console.soy +++ b/java/google/registry/ui/soy/Console.soy @@ -102,27 +102,25 @@ /** Appbar add/back, edit/cancel appbar. */ {template .appbarButtons} -
- +
+ -
- - -
-
- - -
+ class="{css('kd-button')} {css('kd-button-submit')}"> + Edit + +
+
+ +
{/template} diff --git a/java/google/registry/ui/soy/registrar/AdminSettings.soy b/java/google/registry/ui/soy/registrar/AdminSettings.soy index 5bc82d9a0..960cb2ac2 100644 --- a/java/google/registry/ui/soy/registrar/AdminSettings.soy +++ b/java/google/registry/ui/soy/registrar/AdminSettings.soy @@ -18,14 +18,9 @@ /** Registrar admin settings page for view and edit. */ {template .settings} - {@param clientId: string} {@param allowedTlds: list} - {@param readonly: bool}
-

Administrator settings for {$clientId}

- {if $readonly} -

Use the 'Edit' button above to switch to enable editing the information below. - {/if} +

Administrator settings

diff --git a/java/google/registry/ui/soy/registrar/Console.soy b/java/google/registry/ui/soy/registrar/Console.soy index 0eea97c15..7efccb122 100644 --- a/java/google/registry/ui/soy/registrar/Console.soy +++ b/java/google/registry/ui/soy/registrar/Console.soy @@ -25,6 +25,7 @@ {@param clientId: string} /** Registrar client identifier. */ {@param allClientIds: list} /** All registrar client identifiers for the user. */ {@param isAdmin: bool} + {@param isOwner: bool} {@param username: string} /** Arbitrary username to display. */ {@param logoutUrl: string} /** Generated URL for logging out of Google. */ {@param productName: string} /** Name to display for this software product. */ @@ -40,7 +41,17 @@ {/call} {call registry.soy.console.googlebar data="all" /}
-
+
+
+ Accessing {$clientId} as{sp} + {if $isOwner}Owner{/if} + {if $isAdmin}Admin{/if} + {if length($allClientIds) > 1} + {sp}(Switch registrar: {call .clientIdSelect_ data="all" /}) + {/if} +
+
+
{call .navbar_ data="all" /}
@@ -65,6 +76,7 @@ registry.registrar.main({$xsrfToken}, {$clientId}, {if $isAdmin}true{else}false{/if}, + {if $isOwner}true{else}false{/if}, {$productName}, {$integrationEmail}, {$supportEmail}, @@ -78,22 +90,9 @@ /** Sidebar nav. Ids on each elt for testing only. */ {template .navbar_ visibility="private"} - {@param clientId: string} /** Registrar client identifier. */ - {@param allClientIds: list} {@param isAdmin: bool}
- - -
  • Home @@ -120,6 +119,24 @@ {/template} +/** Drop-down selection for the clientId. */ +{template .clientIdSelect_} + {@param clientId: string} /** Registrar client identifier. */ + {@param allClientIds: list} +
    + +
    +{/template} + + /** * Feature disabled */ diff --git a/java/google/registry/ui/soy/registrar/SecuritySettings.soy b/java/google/registry/ui/soy/registrar/SecuritySettings.soy index 4100a65c8..bbaa873fa 100644 --- a/java/google/registry/ui/soy/registrar/SecuritySettings.soy +++ b/java/google/registry/ui/soy/registrar/SecuritySettings.soy @@ -25,9 +25,6 @@ {@param readonly: bool}

    Security settings

    - {if $readonly} -

    Use the 'Edit' button above to switch to enable editing the information below. - {/if}
    diff --git a/javatests/google/registry/ui/js/registrar/console_test_util.js b/javatests/google/registry/ui/js/registrar/console_test_util.js index cb723a7a9..023c1cc06 100644 --- a/javatests/google/registry/ui/js/registrar/console_test_util.js +++ b/javatests/google/registry/ui/js/registrar/console_test_util.js @@ -61,6 +61,7 @@ registry.registrar.ConsoleTestUtil.renderConsoleMain = function( username: args.username || 'jart', logoutUrl: args.logoutUrl || 'https://logout.url.com', isAdmin: !!args.isAdmin, + isOwner: !!args.isOwner, clientId: args.clientId || 'ignore', allClientIds: args.allClientIds || ['clientId1', 'clientId2'], logoFilename: args.logoFilename || 'logo.png', @@ -89,6 +90,15 @@ registry.registrar.ConsoleTestUtil.visit = function( opt_args.clientId = opt_args.clientId || 'dummyRegistrarId'; opt_args.xsrfToken = opt_args.xsrfToken || 'dummyXsrfToken'; opt_args.isAdmin = !!opt_args.isAdmin; + // set the default isOwner to be the opposite of isAdmin. + // That way, if we don't explicitly state them both we get what we'd expect: + // {} -> OWNER (the "regular" case of a visitor to the console) + // {isOwner:true} -> OWNER + // {isAdmin:true} -> ADMIN (the "regular" case of an admin visitor) + // {isOwner:true, isAdmin:true} -> OWNER + ADMIN together + if (opt_args.isOwner === undefined) { + opt_args.isOwner = !opt_args.isAdmin; + } if (opt_args.isEppLoggedIn === undefined) { opt_args.isEppLoggedIn = true; }