Merge ~deadlight/maas:remove-repo into maas:master

[Karl Williams]

Fixes LP #1749867 - Allow removal of custom repositories

Make the confirmation buttons appear on /settings/repositories when the user clicks "remove"

Make the confirmation buttons appear on /settings/repositories when the user clicks "remove"

QA:
 - Go to /settings/repositories
 - Add a repo other than the default ones
 - Click the "remove" button on this new row
 - See that there is a confirmation form
 - Click remove
 - See that the repo is removed

[MAAS Lander (maas-lander)]

UNIT TESTS
-b remove-repo lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: eb563d1987b41b2900b16db26e6daee75cd0d809

review: Approve

[Anthony Dillon (ya-bo-ng)]

Fixes https://bugs.launchpad.net/maas/+bug/1749867

[Anthony Dillon (ya-bo-ng)]

Code look good to me and QA works.

review: Approve

[Anthony Dillon (ya-bo-ng)]

Karl please update the description to the following format:

LP: #xxxxx - <short description>

<long description of needed>

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Karl Williams (deadlight)]

> Karl please update the description to the following format:
>
> LP: #xxxxx - <short description>
>
> <long description of needed>

I updated the commit message.

diff --git a/src/maasserver/static/partials/settings.html b/src/maasserver/static/partials/settings.html
index aef8ea3..1e6f7e3 100644
--- a/src/maasserver/static/partials/settings.html
+++ b/src/maasserver/static/partials/settings.html
@@ -143,6 +143,7 @@
                                 <h2 data-ng-click="snippetExitRemove(snippet)" class="u-float--left">Removing {$ snippet.name $}</h2>
                                 <button data-ng-click="snippetExitRemove(snippet)" class="p-icon--close u-float--right"></button>
                             </div>
+                            <hr />
                             <div class="row u-no-margin--top u-equal-height">
                                 <div class="col-6 u-vertically-center">
                                     <p><i class="p-icon--warning">Warning:</i> Are you sure you want to remove this snippet?</p>
@@ -374,8 +375,8 @@
                                     data-ng-click="toggleMenu(); repositoryEnterRemove(repository)">Remove</button>
                             </div>
                         </td>
-                        <td class="is-active p-table-expanding__panel col-12" col-span="5" data-ng-if="editRepository === repository">
-                            <maas-obj-form obj="editRepository" manager="packageRepositoriesManager" manager-method="updateItem"
+                        <td class="is-active p-table-expanding__panel col-12" col-span="5" data-ng-if="editRepository === repository || deleteRepository === repository">
+                            <maas-obj-form obj="editRepository" manager="packageRepositoriesManager" manager-method="updateItem" data-ng-if="editRepository === repository"
                                 table-form="true" save-on-blur="false" after-save="repositoryExitEdit">
                                 <div class="row u-equal-height">
                                     <div class="col-3 u-vertically-center">
@@ -460,17 +461,18 @@
                                 </div>
                             </maas-obj-form>
                             <div class="table__dropdown" data-ng-if="deleteRepository === repository">
-                                <div class="table__dropdown-title">
+                                <div class="row u-hide u-show--small">
                                     <h2 data-ng-click="repositoryExitRemove()" class="u-float--left">Removing {$ repository.name $}</h2>
                                     <button data-ng-click="repositoryExitRemove()" class="p-icon--close u-float--right"></button>
                                 </div>
-                                <div class="is-active">
-                                    <div class=" u-float--left">
-                                            <p><span class="p-icon--warning"></span> Are you sure you want to remove this repository?</p>
+                                <hr />
+                                <div class="row u-no-margin--top u-equal-height">
+                                    <div class="col-6 u-vertically-center">
+                                        <p><span class="p-icon--warning"></span> Are you sure you want to remove this repository?</p>
                                     </div>
-                                    <div class=" u-float--right">
-                                            <button class="button--base" type="button" data-ng-click="repositoryExitRemove()">Cancel</button>
-                                            <button class="button--destructive" data-ng-click="repositoryConfirmRemove()">Remove</button>
+                                    <div class="col-6 u-align--right">
+                                        <button class="p-button--base" type="button" data-ng-click="repositoryExitRemove()">Cancel</button>
+                                        <button class="p-button--negative" data-ng-click="repositoryConfirmRemove()">Remove</button>
                                     </div>
                                 </div>
                             </div>