From d4a76f1bea064b6d56a8566938dbef0c38757a92 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 14 Feb 2019 14:21:21 +0100
Subject: [PATCH] V8: Align dialogs in the Settings section (#4344)

* Show the cancel button on macro delete confirm

* Hide "Do something else" when creating folders

* Remove "Do something else" on create relation type
---
 src/Umbraco.Web.UI.Client/src/views/macros/delete.html      | 2 +-
 .../src/views/partialviewmacros/create.html                 | 2 +-
 .../src/views/partialviews/create.html                      | 2 +-
 .../src/views/relationtypes/create.html                     | 6 ------
 src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html b/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
index 9d16e2d4e6..e6c24507b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/macros/delete.html
@@ -5,6 +5,6 @@
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{vm.name}}</strong>?
         </p>
 
-        <umb-confirm on-confirm="vm.performDelete" on-cancel="cancel"></umb-confirm>
+        <umb-confirm on-confirm="vm.performDelete" on-cancel="vm.cancel"></umb-confirm>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 89e8075d33..88ab5b944c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -77,7 +77,7 @@
     </div>
 
     <!-- Dialog footer -->
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
         <button class="btn btn-info" ng-click="vm.close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index d11e240c3c..93c2eeb8ca 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -67,7 +67,7 @@
     </div>
 
     <!-- Dialog footer -->
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
         <button class="btn btn-info" ng-click="vm.close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
index e5f66c9fe0..9f3a22d6f1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
@@ -50,9 +50,3 @@
         </form>
     </div>
 </div>
-
-<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-    <button class="btn btn-info">
-        <localize key="buttons_somethingElse">Do something else</localize>
-    </button>
-</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
index 630d23fe78..999a17ca77 100644
--- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html
@@ -49,7 +49,7 @@
 
     </div>
 
-    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="vm.creatingFolder">
         <button class="btn btn-info" ng-click="vm.close()">
             <localize key="buttons_somethingElse">Do something else</localize>
         </button>