Merge branch 'develop' into fix-token-validity

addons/rose/addon/components/rose/form/index.hbs

@@ -9,6 +9,10 @@
   {{!--
     Only show the edit toggle button if the toggle is enabled in the first place
     AND the form is not already in editable mode.
+
+    The cancel button's disabled state depends on the mode.  In edit mode,
+    the cancel button is only disabled if the disabled argument is true,
+    otherwise it is disabled based on the computed property this.disabled.
   --}}
   {{yield (hash
     radioGroup=(component 'rose/form/radio/group' disabled=this.disabled)
@@ -22,7 +26,7 @@
         'rose/form/actions'
       )
       submitDisabled=this.disabled
-      cancelDisabled=(if @showEditToggle false this.disabled)
+      cancelDisabled=(if @showEditToggle @disabled this.disabled)
       cancel=this.handleCancel
       enableEdit=this.enableEdit
     )

addons/rose/addon/components/rose/header/nav/index.hbs

@@ -1,4 +1,4 @@
-<nav class="rose-header-nav">
+<nav class="rose-header-nav" aria-label="header-nav">
   {{yield (hash
     link=(component 'link-to' class="rose-header-nav-link")
     dropdown=(component 'rose/dropdown')

ui/core/app/routes/scopes/scope.js

@@ -33,4 +33,12 @@ export default class ScopesScopeRoute extends Route {
       );
     });
   }
+
+  /**
+   * Set scope in application controller
+   */
+  afterModel() {
+    const scope = this.modelFor('scopes.scope');
+    this.controllerFor('application').set('scope', scope);
+  }
 }

ui/core/app/templates/application.hbs

@@ -7,6 +7,12 @@
     <Rose::Header class="{{if (is-loading) " loading"}}" as |header|>
       <header.brand @logo="logo-boundary" @text={{app-name}} />
       {{#if this.session.isAuthenticated}}
+        <header.nav as |nav|>
+          {{#if this.scope.isOrg}}
+            <nav.link @route="scopes.scope" @model={{this.scope}}>{{this.scope.displayName}}</nav.link>
+          {{/if}}
+        </header.nav>
+
         <header.utilities as |utilities|>
           <utilities.dropdown
             @text="user@example.net"