From 42bcde2c59d1a493760dfa4ca2e64b3f2ca83596 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 5 Nov 2018 15:32:07 +0100
Subject: [PATCH] rename button, use umb button directive, add icon to template
 + a bit of code clean up

---
 .../views/templates/templates.controller.js   | 54 +++++++++++--------
 .../views/templates/templates.html            | 30 ++++++-----
 2 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
index 82f13dcc9f..e9499bedf8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
@@ -19,25 +19,32 @@
         vm.canCreateTemplate = false;
         vm.updateTemplatePlaceholder = false;
 
+        vm.createTemplate = createTemplate;
 
         /* ---------- INIT ---------- */
 
-        init(function () {
+        function onInit() {
 
-            // update placeholder template information on new doc types
-            if (!$routeParams.notemplate && $scope.model.id === 0) {
-                vm.updateTemplatePlaceholder = true;
-                vm.availableTemplates = contentTypeHelper.insertTemplatePlaceholder(vm.availableTemplates);
-            }
-        });
+            entityResource.getAll("Template").then(function (templates) {
 
-        function init(callback) {
-            checkIfTemplateExists();
+                vm.availableTemplates = templates;
+
+                // update placeholder template information on new doc types
+                if (!$routeParams.notemplate && $scope.model.id === 0) {
+                    vm.updateTemplatePlaceholder = true;
+                    vm.availableTemplates = contentTypeHelper.insertTemplatePlaceholder(vm.availableTemplates);
+                }
+
+                checkIfTemplateExists();
+
+            });
 
-            callback();
         }
 
-        vm.createTemplate = function () {
+        function createTemplate() {
+
+            vm.createTemplateButtonState = "busy";
+
             templateResource.getScaffold(-1).then(function (template) {
 
                 template.alias = $scope.model.alias;
@@ -45,6 +52,9 @@
 
                 templateResource.save(template).then(function (savedTemplate) {
 
+                    // add icon
+                    savedTemplate.icon = "icon-layout";
+                    
                     vm.availableTemplates.push(savedTemplate);
                     vm.canCreateTemplate = false;
 
@@ -54,25 +64,27 @@
                         $scope.model.defaultTemplate = savedTemplate;
                     }
 
+                    vm.createTemplateButtonState = "success";
+
+                }, function() {
+                    vm.createTemplateButtonState = "error";
                 });
 
+            }, function() {
+                vm.createTemplateButtonState = "error";
             });
         };
 
         function checkIfTemplateExists() {
-            entityResource.getAll("Template").then(function (templates) {
-
-                vm.availableTemplates = templates;
-
-                var existingTemplate = vm.availableTemplates.find(function (availableTemplate) {
-                    return availableTemplate.name === $scope.model.name;
-                });
-
-                vm.canCreateTemplate = existingTemplate ? false : true;
-
+            var existingTemplate = vm.availableTemplates.find(function (availableTemplate) {
+                return availableTemplate.name === $scope.model.name;
             });
+
+            vm.canCreateTemplate = existingTemplate ? false : true;
         }
 
+        onInit();
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.DocumentType.TemplatesController", TemplatesController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
index 0f7387e855..8cc1081b3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
@@ -7,20 +7,26 @@
 
     <div class="sub-view-column-right">
 
-        <umb-grid-selector ng-if="vm.availableTemplates"
-                           selected-items="model.allowedTemplates"
-                           available-items="vm.availableTemplates"
-                           default-item="model.defaultTemplate"
-                           item-name="template"
-                           name="model.name"
-                           alias="model.alias"
-                           update-placeholder="vm.updateTemplatePlaceholder">
+        <umb-grid-selector
+            ng-if="vm.availableTemplates"
+            selected-items="model.allowedTemplates"
+            available-items="vm.availableTemplates"
+            default-item="model.defaultTemplate"
+            item-name="template"
+            name="model.name"
+            alias="model.alias"
+            update-placeholder="vm.updateTemplatePlaceholder">
         </umb-grid-selector>
 
-        <button type="button" ng-click="vm.createTemplate()" class="btn btn-info -center" ng-show="model.allowedTemplates.length == 0 && vm.canCreateTemplate">
-            <i class="icon icon-add"></i>
-            <localize key="shortcuts_addTemplate">Add template</localize>
-        </button>
+        <umb-button
+            ng-if="vm.canCreateTemplate"
+            type="button"
+            button-style="info"
+            action="vm.createTemplate()"
+            state="vm.createTemplateButtonState"
+            label-key="settings_createMatchingTemplate">
+        </umb-button>
+
     </div>
 
 </div>