Merge ~deadlight/maas:network-discovery-issues into ~ya-bo-ng/maas:vanilla

[Karl Williams]

Fixed expanding table issues on the dashboard

QA:
 - Go to the dashboard and click "open" on the rows and check that the form displays correctly.

[Anthony Dillon (ya-bo-ng)]

Thanks +1

review: Approve

[Karl Williams (deadlight)]

Fixes: https://app.zenhub.com/workspace/o/ubuntudesign/maas-design-squad/issues/297

diff --git a/src/maasserver/static/partials/dashboard.html b/src/maasserver/static/partials/dashboard.html
index 9423c74..fbdeb51 100644
--- a/src/maasserver/static/partials/dashboard.html
+++ b/src/maasserver/static/partials/dashboard.html
@@ -89,7 +89,7 @@
                                     </button>
                                 </div>
                             </td>
-                            <td class="p-table-expanding__panel">
+                            <td class="p-table-expanding__panel col-12" data-ng-if="discovery.first_seen === selectedDevice">
                                 <maas-obj-form data-ng-if="discovery.first_seen === selectedDevice"
                                     obj="convertTo" manager="proxyManager" pre-process="preProcess"
                                     after-save="afterSave" table-form="true" save-on-blur="false">
@@ -143,9 +143,9 @@
                                                             disable-label="true" placeholder="Hostname (optional)"></maas-obj-field>
                                                     </div>
                                                 </div>
-                                                <div>
-                                                    <label class="col-2">Type</label>
-                                                    <div class="col-3">
+                                                <div class="p-form__group u-clearfix">
+                                                    <label class="p-form__label col-2">Type</label>
+                                                    <div class="p-form__control col-3">
                                                         <select name="type" data-ng-model="convertTo.type">
                                                             <option value="" disabled>Choose type</option>
                                                             <option value="device">Device</option>
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index feeffa8..1e69db1 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -876,7 +876,7 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                         data-ng-model="tabs.nodes.search" data-ng-change="updateFilters('nodes')"
                         data-ng-class="{ error: !tabs.nodes.searchValid }"
                         data-ng-disabled="tabs.nodes.actionOption" />
-                    <button type="reset" class="p-search-box__reset" alt="reset" 
+                    <button type="reset" class="p-search-box__reset" alt="reset"
                         data-ng-click="clearSearch('nodes')"
                         data-ng-show="tabs.nodes.search.length > 0"><i class="p-icon--close"></i></button>
                     <button type="submit" class="p-search-box__button" alt="search"><i class="p-icon--search"></i></button>
@@ -893,9 +893,9 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                 <div class="p-search-box">
                     <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
                     <input
-                        type="search" placeholder="Search devices" 
+                        type="search" placeholder="Search devices"
                         class="p-search-boxh__input p-form-validation__input"
-                        data-ng-model="tabs.devices.search" 
+                        data-ng-model="tabs.devices.search"
                         data-ng-change="updateFilters('devices')"
                         data-ng-disabled="tabs.devices.actionOption" />
                     <button type="reset" class="p-search-box__reset" alt="reset"
@@ -1055,9 +1055,9 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                 data-ng-class="{ 'is-error': !tabs.switches.searchValid }">
             <!-- XXX rvba 2015-02-25 - Need to add e2e test. -->
             <input
-                type="search" placeholder="Search switches" 
+                type="search" placeholder="Search switches"
                 class="p-search-box__input p-form-validation__input"
-                data-ng-model="tabs.switches.search" 
+                data-ng-model="tabs.switches.search"
                 data-ng-change="updateFilters('switches')"
                 data-ng-disabled="tabs.switches.actionOption" />
             <button type="reset" class="p-search-box__reset" alt="reset"