Merge ~ya-bo-ng/maas:hardware-testing-qa into ~deadlight/maas:vanilla

[Anthony Dillon]

## Done
Made the actions menu an icon not the word. Hot fixed the tabbed nav in the test log page.

## QA
- Go to a node details
- Go to Hardware testing
- Check the Actions menu in the tables are now icons
- Click on view logs and see that the tabbed menu has correct active styling

Fixes https://github.com/ubuntudesign/MAAS-design-squad/issues/250, https://github.com/ubuntudesign/MAAS-design-squad/issues/249

[LukeWH (0-luke)]

+1 Looks good thanks Ant

review: Approve

diff --git a/src/maasserver/static/partials/node-result.html b/src/maasserver/static/partials/node-result.html
index f4d9428..08ed104 100644
--- a/src/maasserver/static/partials/node-result.html
+++ b/src/maasserver/static/partials/node-result.html
@@ -66,17 +66,25 @@
                 <h2 class="ng-binding">Output</h2>
                 <nav class="p-tabs">
                     <ul class="p-tabs__list">
-                        <li class="p-tabs__item" data-ng-class="{ 'is-active': output === 'combined' }">
-                            <a href="" class="p-tabs__link" data-ng-click="get_result_data('combined')">combined</a>
+                        <li class="p-tabs__item">
+                            <a href="" class="p-tabs__link"
+                                data-ng-class="{ 'is-active': output === 'combined' }"
+                                data-ng-click="get_result_data('combined')">combined</a>
                         </li>
-                        <li class="p-tabs__item" data-ng-class="{ 'is-active': output === 'stdout' }">
-                            <a href="" class="p-tabs__link" data-ng-click="get_result_data('stdout')">stdout</a>
+                        <li class="p-tabs__item">
+                            <a href="" class="p-tabs__link" 
+                                data-ng-class="{ 'is-active': output === 'stdout' }"
+                                data-ng-click="get_result_data('stdout')">stdout</a>
                         </li>
-                        <li class="p-tabs__item" data-ng-class="{ 'is-active': output === 'stderr' }">
-                            <a href="" class="p-tabs__link" data-ng-click="get_result_data('stderr')">stderr</a>
+                        <li class="p-tabs__item">
+                            <a href="" class="p-tabs__link" 
+                                data-ng-class="{ 'is-active': output === 'stderr' }"
+                                data-ng-click="get_result_data('stderr')">stderr</a>
                         </li>
-                        <li class="p-tabs__item" data-ng-class="{ 'is-active': output === 'result' }">
-                            <a href="" class="p-tabs__link" data-ng-click="get_result_data('result')">yaml</a>
+                        <li class="p-tabs__item">
+                            <a href="" class="p-tabs__link" 
+                                data-ng-class="{ 'is-active': output === 'result' }"
+                                data-ng-click="get_result_data('result')">yaml</a>
                         </li>
                     </ul>
                 </nav>
diff --git a/src/maasserver/static/partials/script-results-list.html b/src/maasserver/static/partials/script-results-list.html
index 87323d3..0e3c325 100644
--- a/src/maasserver/static/partials/script-results-list.html
+++ b/src/maasserver/static/partials/script-results-list.html
@@ -17,8 +17,8 @@
                                 <th class="col-2">Tags</th>
                                 <th class="col-1">Runtime</th>
                                 <th class="col-2">Date</th>
-                                <th class="col-1">Result</th>
-                                <th class="col-2 u-align--right">Actions</th>
+                                <th class="col-2">Result</th>
+                                <th class="col-1 u-align--right">Actions</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -31,15 +31,17 @@
                                 <td class="col-2" aria-label="Tags"><span data-ng-hide="result.showing_history">{$ result.tags $}</span></td>
                                 <td class="col-1" aria-label="Runtime"><span data-ng-hide="result.showing_history" data-maas-script-run-time="script-runtime" data-start-time="result.starttime" data-run-time="{{result.runtime}}" data-estimated-run-time="{{result.estimated_runtime}}" data-script-status="result.status"></span></td>
                                 <td class="col-2" aria-label="Date"><span data-ng-hide="result.showing_history">{$ result.updated $}</span></td>
-                                <td class="col-1" aria-label="Result">
+                                <td class="col-2" aria-label="Result">
                                     <span data-ng-hide="result.showing_history">
                                         <!-- Only link to the testing result when we've received it. This is indicated with status 2(passed), 3(failed), 4(timedout), 6(degraded), 8(failed installing)-->
                                         {$ result.status_name $} <a data-ng-if="result.status === 2 || result.status === 3 || result.status === 4 || result.status === 6 || result.status === 8" href="#/node/{$ type_name $}/{$ node.system_id $}/{$ section.area $}/{$ result.id $}">View log</a>
                                     </span>
                                 </td>
-                                <td class="col-2 u-align--right">
+                                <td class="col-1 u-align--right">
                                     <div class="p-contextual-menu" toggle-ctrl data-ng-hide="isShowingAdd() || isEditing(interface) || isShowingDeleteConfirm() || isShowingAdd()">
-                                        <button class="p-contextual-menu__toggle" data-ng-click="toggleMenu()">Actions</button>
+                                        <button class="p-button--base p-contextual-menu__toggle" data-ng-click="toggleMenu()">
+                                            <i class="p-icon--contextual-menu u-no-margin--right">Actions</i>
+                                        </button>
                                         <div class="p-contextual-menu__dropdown" role="menu" data-ng-show="isToggled">
                                             <button class="p-contextual-menu__link" aria-label="View metrics" data-ng-if="!result.showing_results" data-ng-click="toggleMenu(); result.showing_history = false; result.showing_results = true">View metrics</button>
                                             <button class="p-contextual-menu__link" aria-label="Hide metrics" data-ng-if="result.showing_results" data-ng-click="toggleMenu(); result.showing_history = false; result.showing_results = false">Hide metrics</button>