Merge ~andreserl/maas:backport_various_fixes into maas:2.2

[Andres Rodriguez]

Backport fc3bfd69e7c882a5dc60e8f19481217473d89528 from master.

LP: #1701056: Show correct information for a device details page as a normal user
LP: #1701052: Do not show the controllers tab as a normal user
Fix format when devices/controllers are selected to match those of machines

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index a75a810..af31377 100644
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -252,7 +252,7 @@
                 </div>
             </div>
             <form class="form form--stack twelve-col">
-                <fieldset class="form__fieldset six-col ng-hide" data-ng-show="isSuperUser() && !isController">
+                <fieldset class="form__fieldset six-col ng-hide" data-ng-show="!isController">
                     <div class="form__group">
                         <label for="zone" class="form__group-label two-col">Zone</label>
                         <div class="form__group-input three-col">
@@ -306,26 +306,6 @@
                         </div>
                     </div>
                 </fieldset>
-                <div data-ng-hide="isSuperUser() || isController">
-                    <dl>
-                        <dt class="two-col">Zone</dt>
-                            <dd class="four-col last-col">
-                                {$ node.zone.name $}
-                            </dd>
-                        <dt class="two-col" data-ng-if="!isDevice">Architecture</dt>
-                            <dd class="four-col last-col">
-                                {$ node.architecture || "Missing" $}
-                            </dd>
-                        <dt class="two-col">Owner</dt>
-                            <dd class="four-col last-col">
-                                {$ node.owner || "Unassigned" $}
-                            </dd>
-                        <dt class="two-col">Tags</dt>
-                            <dd class="four-col last-col">
-                                {$ node.tags.join(', ') $}
-                            </dd>
-                    </dl>
-                </div>
                 <div class="six-col" data-ng-if="isController">
                     <dl>
                         <dt class="two-col">Type</dt>
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index a2a1814..5ced404 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -34,9 +34,7 @@
                     data-ng-show="addDeviceScope.viewable">Cancel add device</button>
             </div>
             <div data-ng-show="tabs.devices.selectedItems.length">
-                <span class="page-header__controls-feedback u-margin--right" data-ng-click="showSelected('devices')">
-                    {$ tabs.devices.selectedItems.length $} Selected
-                </span>
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('devices')">{$ tabs.devices.selectedItems.length $} Selected</a>
                 <div data-maas-cta="tabs.devices.takeActionOptions"
                     data-ng-model="tabs.devices.actionOption"
                     data-ng-change="actionOptionSelected('devices')">
@@ -55,9 +53,7 @@
                         data-ng-show="tabs.controllers.addController">Close add rack controller</button>
             </div>
             <div data-ng-show="tabs.controllers.selectedItems.length">
-                <span class="page-header__controls-feedback u-margin--right" data-ng-click="showSelected('controllers')">
-                    {$ tabs.controllers.selectedItems.length $} Selected
-                </span>
+                <a class="u-display--inline u-margin--right" data-ng-click="showSelected('controllers')">{$ tabs.controllers.selectedItems.length $} Selected</a>
                 <div data-maas-cta="tabs.controllers.takeActionOptions"
                     data-ng-model="tabs.controllers.actionOption"
                     data-ng-change="actionOptionSelected('controllers')">
@@ -644,6 +640,7 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                 data-ng-class="{ 'is-active': currentpage === 'devices'}"
                 data-ng-click="toggleTab('devices')">{$ devices.length $} <ng-pluralize count="devices.length" when="{'one': 'Device', 'other': 'Devices'}"></ng-pluralize></button>
             <button class="page-navigation__link tooltip"
+                data-ng-if="isSuperUser()"
                 aria-label="A node that provides MAAS services."
                 data-ng-class="{ 'is-active': currentpage === 'controllers'}"
                 data-ng-click="toggleTab('controllers')">{$ controllers.length $} <ng-pluralize count="controllers.length" when="{'one': 'Controller', 'other': 'Controllers'}"></ng-pluralize></button>