From 597a10fc5de7395b82cf789755b4dd67103bf8ea Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 17 Nov 2016 10:33:15 +0100
Subject: [PATCH] small fixes to overlay buttons + insert order

---
 .../overlays/insert/insert.controller.js      |  2 +-
 .../views/common/overlays/insert/insert.html  | 18 +++++++++---------
 .../src/views/templates/edit.controller.js    | 19 +++----------------
 .../src/views/templates/edit.html             |  2 +-
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.controller.js
index 65b34d5432..b6366bca74 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.controller.js
@@ -22,9 +22,9 @@
 
             vm.macroPickerOverlay = {
                 view: "macropicker",
-                show: true,
                 title: "Insert macro",
                 dialogData: {},
+                show: true,
                 submit: function(model) {
 
                     $scope.model.insert = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
index 4d8fb4a4bd..c49c045853 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insert/insert.html
@@ -2,23 +2,23 @@
 
     <div class="umb-insert-code-boxes">
 
-        <div class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
-            <div class="umb-insert-code-box__title">Macro</div>
-            <div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
-        </div>
-
         <div class="umb-insert-code-box" ng-click="vm.openPageFieldOverlay()">
             <div class="umb-insert-code-box__title">Value</div>
             <div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
         </div>
 
-        <div class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
-            <div class="umb-insert-code-box__title">Dictionary</div>
+        <div class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
+            <div class="umb-insert-code-box__title">Partial view</div>
             <div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
         </div>
 
-        <div class="umb-insert-code-box" ng-click="vm.openPartialOverlay()">
-            <div class="umb-insert-code-box__title">Partial</div>
+        <div class="umb-insert-code-box" ng-click="vm.openMacroPicker()">
+            <div class="umb-insert-code-box__title">Macro</div>
+            <div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
+        </div>
+
+        <div class="umb-insert-code-box" ng-click="vm.openDictionaryItemOverlay()">
+            <div class="umb-insert-code-box__title">Dictionary</div>
             <div class="umb-insert-code-box__description">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris pellentesque gravida hendrerit. Nunc lacinia ipsum sed urna volutpat finibus.</div>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 0986975a02..81f04015ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -200,7 +200,6 @@
                 multiPicker: false,
                 show: true,
                 title: "Insert dictionary item",
-
                 select: function(node){
                 	//crappy hack due to dictionary items not in umbracoNode table
                 	var code = "@Umbraco.GetDictionaryValue(\"" + node.name + "\")";
@@ -209,11 +208,6 @@
                 	vm.dictionaryItemOverlay.show = false;
                     vm.dictionaryItemOverlay = null;
                 },
-
-                submit: function (model) {
-                    console.log(model);
-                },
-
                 close: function (model) {
                     vm.dictionaryItemOverlay.show = false;
                     vm.dictionaryItemOverlay = null;
@@ -230,7 +224,6 @@
                 multiPicker: false,
                 show: true,
                 title: "Insert Partial view",
-
                 select: function(node){
                     //crappy hack due to dictionary items not in umbracoNode table
                     var code = "@Html.Partial(\"" + node.name + "\")";
@@ -239,13 +232,6 @@
                     vm.partialItemOverlay.show = false;
                     vm.partialItemOverlay = null;
                 },
-
-                submit: function (model) {
-                    console.log(model);
-                    vm.partialItemOverlay.show = false;
-                    vm.partialItemOverlay = null;
-                },
-
                 close: function (model) {
                     vm.partialItemOverlay.show = false;
                     vm.partialItemOverlay = null;
@@ -288,8 +274,9 @@
 
             vm.sectionsOverlay = {
                 view: "templatesections",
-                show: true,
                 isMasterTemplate: true,
+                submitButtonLabel: "Insert",
+                show: true,
                 submit: function(model) {
 
                     if (model.insertType === 'renderBody') {
@@ -374,7 +361,7 @@
                 return templateName;
 
             } else {
-                return "No template";
+                return "No master";
             }
             
         }
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index 67f409f8d3..e09a6be4c4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -41,9 +41,9 @@
 
                             <ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" role="menu">
                                 <li><a href="" ng-click="vm.openPageFieldOverlay()">Value</a></li>
+                                <li><a href="" ng-click="vm.openPartialOverlay()">Partial view</a></li>
                                 <li><a href="" ng-click="vm.openDictionaryItemOverlay()">Dictionary</a></li>
                                 <li><a href="" ng-click="vm.openMacroOverlay()">Macro</a></li>
-                                <li><a href="" ng-click="vm.openPartialOverlay()">Partial view</a></li>
                             </ul>
                         </div>