From b22ae28acc7b1abb9460d34e663198fb0c91ca5e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 1 Feb 2016 18:24:30 +0100
Subject: [PATCH 01/12] Fixes: U4-7871 Media picker - add functionality to go
 to media item when an image has been picked

---
 .../src/less/property-editors.less            | 41 +++++++++++++++++--
 .../mediapicker/mediapicker.controller.js     |  6 ++-
 .../mediapicker/mediapicker.html              | 21 +++++++---
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index b3cb034596..7ea8cfe949 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -200,10 +200,6 @@ ul.color-picker li a  {
     border: 1px solid #f8f8f8;
 }
 
-.umb-sortable-thumbnails li:hover a {
-  display: block;
-}
-
 .umb-sortable-thumbnails li img {
   max-width:100%;
   max-height:100%;
@@ -228,6 +224,43 @@ ul.color-picker li a  {
     display: block;
 }
 
+.umb-sortable-thumbnails .umb-sortable-thumbnails__actions {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+    text-decoration: none;
+    display: flex;
+    flex-direction: row;
+    opacity: 0;
+    visibility: hidden;
+}
+
+.umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions  {
+  opacity: 1;
+  visibility: visible;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action {
+    font-size: 16px;
+    background: white;
+    height: 25px;
+    width: 25px;
+    border-radius: 15px;
+    color: @grayDarker;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 5px;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
+    color: red;
+}
+
+.umb-sortable-thumbnails .umb-sortable-thumbnails__action:hover {
+    text-decoration: none;
+}
+
 
 //
 // Cropper
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index f73920a377..bf82efae24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
-    function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService) {
+    function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location) {
 
         //check the pre-values for multi-picker
         var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
@@ -56,6 +56,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.sync();
         };
 
+        $scope.goToItem = function(item) {
+            $location.path('media/media/edit/' + item.id);
+        };
+
        $scope.add = function() {
 
            $scope.mediaPickerOverlay = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 9af1c7b10d..096685f1a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -2,14 +2,23 @@
 
 	<ul ui-sortable="sortableOptions" ng-model="images" class="umb-sortable-thumbnails">
 		<li style="width: 120px; height: 100px; overflow: hidden;" ng-repeat="image in images">
-				<img ng-src="{{image.thumbnail}}" alt="" ng-show="image.thumbnail">
 
-				<span class="icon-holder" ng-hide="image.thumbnail">
-					<i class="icon {{image.icon}} large" ></i>
-					<small>{{image.name}}</small>
-				</span>
+			<img ng-src="{{image.thumbnail}}" alt="" ng-show="image.thumbnail">
+
+			<span class="icon-holder" ng-hide="image.thumbnail">
+				<i class="icon {{image.icon}} large" ></i>
+				<small>{{image.name}}</small>
+			</span>
+
+			<div class="umb-sortable-thumbnails__actions">
+				<a class="umb-sortable-thumbnails__action" href="" ng-click="goToItem(image)">
+					<i class="icon icon-edit"></i>
+				</a>
+				<a class="umb-sortable-thumbnails__action -red" href="" ng-click="remove($index)">
+					<i class="icon icon-delete"></i>
+				</a>
+			</div>
 
-				<a href class="picked-image" ng-click="remove($index)"><i class="icon icon-delete"></i></a>
 		</li>
 	</ul>
 

From ae26a19d4a0640d1184ae242fe7f97ee7b748f5f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 2 Feb 2016 11:41:52 +0100
Subject: [PATCH 02/12] Fixes: U4-7675 Changing doc type icon doesn't set dirty
 property for form

---
 .../components/editor/umbeditorheader.directive.js           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index bf87d764a6..27a1ec4e6d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -15,6 +15,10 @@
                     } else {
                        scope.icon = model.icon;
                     }
+
+                    // set form to dirty
+                    ctrl.$setDirty();
+
                     scope.dialogModel.show = false;
                     scope.dialogModel = null;
                 }
@@ -23,6 +27,7 @@
       }
 
       var directive = {
+          require: '^form',
          transclude: true,
          restrict: 'E',
          replace: true,

From 4360d49531aa25c078f5dea060e9d66a4158769a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 2 Feb 2016 11:42:36 +0100
Subject: [PATCH 03/12] fix file indention

---
 .../editor/umbeditorheader.directive.js       | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 27a1ec4e6d..e425bde042 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -1,57 +1,57 @@
 (function() {
-   'use strict';
+    'use strict';
 
-   function EditorHeaderDirective(iconHelper) {
+    function EditorHeaderDirective(iconHelper) {
 
-      function link(scope, el, attr, ctrl) {
+        function link(scope, el, attr, ctrl) {
 
-         scope.openIconPicker = function() {
-            scope.dialogModel = {
-                view: "iconpicker",
-                show: true,
-                submit: function(model) {
-                    if (model.color) {
-                       scope.icon = model.icon + " " + model.color;
-                    } else {
-                       scope.icon = model.icon;
+            scope.openIconPicker = function() {
+                scope.dialogModel = {
+                    view: "iconpicker",
+                    show: true,
+                    submit: function(model) {
+                        if (model.color) {
+                            scope.icon = model.icon + " " + model.color;
+                        } else {
+                            scope.icon = model.icon;
+                        }
+
+                        // set form to dirty
+                        ctrl.$setDirty();
+
+                        scope.dialogModel.show = false;
+                        scope.dialogModel = null;
                     }
-
-                    // set form to dirty
-                    ctrl.$setDirty();
-
-                    scope.dialogModel.show = false;
-                    scope.dialogModel = null;
-                }
+                };
             };
-         };
-      }
+        }
 
-      var directive = {
-          require: '^form',
-         transclude: true,
-         restrict: 'E',
-         replace: true,
-         templateUrl: 'views/components/editor/umb-editor-header.html',
-         scope: {
-            tabs: "=",
-            actions: "=",
-            name: "=",
-            nameLocked: "=",
-            menu: "=",
-            icon: "=",
-            hideIcon: "@",
-            alias: "=",
-            hideAlias: "@",
-            description: "=",
-            hideDescription: "@",
-            navigation: "="
-         },
-         link: link
-      };
+        var directive = {
+            require: '^form',
+            transclude: true,
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'views/components/editor/umb-editor-header.html',
+            scope: {
+                tabs: "=",
+                actions: "=",
+                name: "=",
+                nameLocked: "=",
+                menu: "=",
+                icon: "=",
+                hideIcon: "@",
+                alias: "=",
+                hideAlias: "@",
+                description: "=",
+                hideDescription: "@",
+                navigation: "="
+            },
+            link: link
+        };
 
-      return directive;
-   }
+        return directive;
+    }
 
-   angular.module('umbraco.directives').directive('umbEditorHeader', EditorHeaderDirective);
+    angular.module('umbraco.directives').directive('umbEditorHeader', EditorHeaderDirective);
 
 })();

From cb978e2feeca3007170bb35100463760b0061069 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 09:44:10 +0100
Subject: [PATCH 04/12] prevent enter submit in document type editor

---
 .../src/views/documenttypes/edit.html         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index c3c2a7f4ab..f143f5e73a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -2,9 +2,7 @@
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
+    <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
@@ -34,14 +32,15 @@
 
                <umb-editor-footer-content-right>
 
-                <umb-button 
-                            ng-if="!vm.page.modelsBuilder"
-                            type="submit"
-                            state="vm.page.saveButtonState"
-                            button-style="success"
-                            shortcut="ctrl+s"
-                            label="Save"
-                            label-key="buttons_save">
+                <umb-button
+                    ng-if="!vm.page.modelsBuilder"
+                    type="button"
+                    action="vm.save()"
+                    state="vm.page.saveButtonState"
+                    button-style="success"
+                    shortcut="ctrl+s"
+                    label="Save"
+                    label-key="buttons_save">
                 </umb-button>
                        
 

From 7d4fbe4267703dc214fe9a09210198553f844d3a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 09:50:59 +0100
Subject: [PATCH 05/12] fix document type html indention

---
 .../src/views/documenttypes/edit.html         | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index f143f5e73a..ce694ff5ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -7,55 +7,55 @@
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container>
 
-               <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                <umb-editor-sub-views
+                    ng-if="!vm.page.loading"
+                    sub-views="vm.page.navigation"
+                    model="vm.contentType">
+                </umb-editor-sub-views>
 
             </umb-editor-container>
 
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                <umb-button
-                    ng-if="!vm.page.modelsBuilder"
-                    type="button"
-                    action="vm.save()"
-                    state="vm.page.saveButtonState"
-                    button-style="success"
-                    shortcut="ctrl+s"
-                    label="Save"
-                    label-key="buttons_save">
-                </umb-button>
-                       
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button" action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
-                <umb-button-group
-                      ng-if="vm.page.modelsBuilder"              
-                      default-button="vm.page.defaultButton"
-                      sub-buttons="vm.page.subButtons"
-                      state="vm.page.saveButtonState"
-                      direction="up"
-                      float="right">
-                </umb-button-group>
-
-
-               </umb-editor-footer-content-right>
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 

From 573890b7cea5c8dfeed6888a85b92db791ad6fc8 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 09:56:14 +0100
Subject: [PATCH 06/12] prevent enter submit in media types

---
 src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index b6c507ec0c..7dcbebd041 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -2,9 +2,7 @@
 
    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
+    <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
@@ -40,7 +38,8 @@
                <umb-editor-footer-content-right>
 
                    <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="submit"
+                               type="button"
+                               action="vm.save()"
                                state="vm.page.saveButtonState"
                                button-style="success"
                                shortcut="ctrl+s"

From bd393dffd4b099678db84d09b5c3e0e8bf64ae27 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 09:59:08 +0100
Subject: [PATCH 07/12] fix media types html indention

---
 .../src/views/mediatypes/edit.html            | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index 7dcbebd041..c1a3f69241 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -1,69 +1,71 @@
 <div ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
 
-   <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
+    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
     <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container class="editors-document-type-container">
 
                 <div class="editors-document-type-canvas">
 
-                    <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                    <umb-editor-sub-views
+                        ng-if="!vm.page.loading"
+                        sub-views="vm.page.navigation"
+                        model="vm.contentType">
+                    </umb-editor-sub-views>
 
                 </div>
 
             </umb-editor-container>
 
-
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                   <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="button"
-                               action="vm.save()"
-                               state="vm.page.saveButtonState"
-                               button-style="success"
-                               shortcut="ctrl+s"
-                               label="Save"
-                               label-key="buttons_save">
-                   </umb-button>
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button"
+                        action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
-                   <umb-button-group ng-if="vm.page.modelsBuilder"
-                                     default-button="vm.page.defaultButton"
-                                     sub-buttons="vm.page.subButtons"
-                                     state="vm.page.saveButtonState"
-                                     direction="up"
-                                     float="right">
-                   </umb-button-group>
-
-               </umb-editor-footer-content-right>
-
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 
         </umb-editor-view>
 
-
     </form>
 
 </div>

From 61ba602b4bc3fb40bbaf9d9cee5ed3ce89567c6f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 10:05:01 +0100
Subject: [PATCH 08/12] prevent enter submit in member types

---
 .../src/views/membertypes/edit.html                      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
index 64ffe504b1..f5f7a44e07 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
@@ -2,10 +2,8 @@
 
    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
-          
+    <form novalidate name="contentTypeForm" val-form-manager>
+
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
@@ -38,7 +36,8 @@
                <umb-editor-footer-content-right>
 
                    <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="submit"
+                               type="button"
+                               action="vm.save()"
                                state="vm.page.saveButtonState"
                                button-style="success"
                                shortcut="ctrl+s"

From e22c6d9c046c5df8d82886309e2bf9c8b37f7f91 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 10:16:39 +0100
Subject: [PATCH 09/12] fix member types html indention

---
 .../src/views/membertypes/edit.html           | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
index f5f7a44e07..eb34aae6cc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
@@ -1,66 +1,69 @@
 <div ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
 
-   <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
+    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
     <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container class="editors-document-type-container">
 
                 <div class="editors-document-type-canvas">
-                    <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                    <umb-editor-sub-views
+                        ng-if="!vm.page.loading"
+                        sub-views="vm.page.navigation"
+                        model="vm.contentType">
+                    </umb-editor-sub-views>
                 </div>
 
             </umb-editor-container>
 
-
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                   <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="button"
-                               action="vm.save()"
-                               state="vm.page.saveButtonState"
-                               button-style="success"
-                               shortcut="ctrl+s"
-                               label="Save"
-                               label-key="buttons_save">
-                   </umb-button>
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button"
+                        action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
-                   <umb-button-group ng-if="vm.page.modelsBuilder"
-                                     default-button="vm.page.defaultButton"
-                                     sub-buttons="vm.page.subButtons"
-                                     state="vm.page.saveButtonState"
-                                     direction="up"
-                                     float="right">
-                   </umb-button-group>
-
-               </umb-editor-footer-content-right>
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 
         </umb-editor-view>
 
-
     </form>
 
 </div>

From edaa335b18c004fe4936dc2b47bae067096fb1cf Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 11:55:19 +0100
Subject: [PATCH 10/12] Fixes: U4-7744 Better validation message when
 Reordering tabs

---
 .../components/umbgroupsbuilder.directive.js  | 50 +++++++++++++++----
 .../less/components/umb-group-builder.less    | 13 +++--
 .../views/components/umb-groups-builder.html  |  8 ++-
 .../umbraco/config/lang/en_us.xml             | 19 +++----
 4 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 81c6a6612e..328884cfa1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -1,10 +1,13 @@
 (function() {
   'use strict';
 
-  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout) {
+  function GroupsBuilderDirective(contentTypeHelper, contentTypeResource, mediaTypeResource, dataTypeHelper, dataTypeResource, $filter, iconHelper, $q, $timeout, notificationsService, localizationService) {
 
     function link(scope, el, attr, ctrl) {
 
+        var validationTranslated = "";
+        var tabNoSortOrderTranslated = "";
+
       scope.sortingMode = false;
       scope.toolbar = [];
       scope.sortableOptionsGroup = {};
@@ -25,6 +28,14 @@
           // add init tab
           addInitGroup(scope.model.groups);
 
+          // localize texts
+          localizationService.localize("validation_validation").then(function(value) {
+              validationTranslated = value;
+          });
+
+          localizationService.localize("contentTypeEditor_tabHasNoSortOrder").then(function(value) {
+              tabNoSortOrderTranslated = value;
+          });
       }
 
       function setSortingOptions() {
@@ -202,13 +213,30 @@
 
       scope.toggleSortingMode = function(tool) {
 
-         scope.sortingMode = !scope.sortingMode;
+          if (scope.sortingMode === true) {
 
-         if(scope.sortingMode === true) {
-            scope.sortingButtonKey = "general_reorderDone";
-         } else {
-            scope.sortingButtonKey = "general_reorder";
-         }
+              var sortOrderMissing = false;
+
+              for (var i = 0; i < scope.model.groups.length; i++) {
+                  var group = scope.model.groups[i];
+                  if (group.tabState !== "init" && group.sortOrder === undefined) {
+                      sortOrderMissing = true;
+                      group.showSortOrderMissing = true;
+                      notificationsService.error(validationTranslated + ": " + group.name + " " + tabNoSortOrderTranslated);
+                  }
+              }
+
+              if (!sortOrderMissing) {
+                  scope.sortingMode = false;
+                  scope.sortingButtonKey = "general_reorder";
+              }
+
+          } else {
+
+              scope.sortingMode = true;
+              scope.sortingButtonKey = "general_reorderDone";
+
+          }
 
       };
 
@@ -394,8 +422,12 @@
         }
       };
 
-      scope.changeSortOrderValue = function() {
-        scope.model.groups = $filter('orderBy')(scope.model.groups, 'sortOrder');
+      scope.changeSortOrderValue = function(group) {
+
+          if (group.sortOrder !== undefined) {
+              group.showSortOrderMissing = false;
+          }
+          scope.model.groups = $filter('orderBy')(scope.model.groups, 'sortOrder');
       };
 
       function addInitGroup(groups) {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 56698c6c9c..c007db6551 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -90,7 +90,6 @@
   font-weight: bold;
   display: flex;
   align-items: center;
-  margin-right: 10px;
 }
 
 .umb-group-builder__group-title-icon {
@@ -134,6 +133,15 @@ input.umb-group-builder__group-title-input {
   display: inline-block;
   position: relative;
   top: 2px;
+  margin-left: 10px;
+}
+
+.umb-group-builder__group-sort-order {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+    position: relative;
+    top: 2px;
 }
 
 input.umb-group-builder__group-sort-value {
@@ -141,10 +149,7 @@ input.umb-group-builder__group-sort-value {
   padding: 0px 0 0px 5px;
   width: 40px;
   margin-bottom: 0;
-  margin-right: 10px;
   border-color: #d9d9d9;
-  position: relative;
-  top: 2px;
 }
 
 /* ---------- PROPERTIES ---------- */
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index fd169ca86a..c58ebcf364 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -84,7 +84,13 @@
                         </div>
                     </ng-form>
 
-                    <input type="number" class="umb-group-builder__group-sort-value" ng-if="sortingMode" ng-model="tab.sortOrder" ng-disabled="tab.inherited" on-blur="changeSortOrderValue()" />
+                    <ng-form name="groupSortOrderForm">
+                        <div class="umb-group-builder__group-sort-order" ng-if="sortingMode">
+                            <input name="groupSortOrder" type="number" class="umb-group-builder__group-sort-value" ng-model="tab.sortOrder" ng-disabled="tab.inherited" on-blur="changeSortOrderValue(tab)" required />
+                            <div class="umb-validation-label -arrow-left" ng-if="groupSortOrderForm.groupSortOrder.$error.required && tab.showSortOrderMissing"><localize key="required"></localize></div>
+                            <div class="umb-validation-label -arrow-left" ng-if="!tab.showSortOrderMissing" val-msg-for="groupSortOrder" val-toggle-msg="required"><localize key="required"></localize></div>
+                        </div>
+                    </ng-form>
 
                     <div class="umb-group-builder__group-inherited-label" ng-if="tab.inherited">
                         <i class="icon icon-merge"></i>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index cd0067bf78..b94a6b4dab 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1037,37 +1037,38 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="compositionsDescription">Inherit tabs and properties from an existing document type. New tabs will be added to the current document type or merged if a tab with an identical name exists.</key>
     <key alias="compositionInUse">This content type is used in a composition, and therefore cannot be composed itself.</key>
     <key alias="noAvailableCompositions">There are no content types available to use as a composition.</key>
-    
+
     <key alias="availableEditors">Available editors</key>
     <key alias="reuse">Reuse</key>
     <key alias="editorSettings">Editor settings</key>
-    
+
     <key alias="configuration">Configuration</key>
-    
+
     <key alias="yesDelete">Yes, delete</key>
-    
+
     <key alias="movedUnderneath">was moved underneath</key>
     <key alias="folderToMove">Select the folder to move</key>
     <key alias="structureBelow">to in the tree structure below</key>
-    
+
     <key alias="allDocumentTypes">All Document types</key>
     <key alias="allDocuments">All Documents</key>
     <key alias="allMediaItems">All media items</key>
-    
+
     <key alias="usingThisDocument">using this document type will be deleted permanently, please confirm you want to delete these as well.</key>
     <key alias="usingThisMedia">using this media type will be deleted permanently, please confirm you want to delete these as well.</key>
     <key alias="usingThisMember">using this member type will be deleted permanently, please confirm you want to delete these as well</key>
-    
+
     <key alias="andAllDocuments">and all documents using this type</key>
     <key alias="andAllMediaItems">and all media items using this type</key>
     <key alias="andAllMembers">and all members using this type</key>
-    
+
     <key alias="thisEditorUpdateSettings">using this editor will get updated with the new settings</key>
 
     <key alias="memberCanEdit">Member can edit</key>
     <key alias="showOnMemberProfile">Show on member profile</key>
+    <key alias="tabHasNoSortOrder">tab has no sort order</key>
   </area>
-  
+
   <area alias="templateEditor">
     <key alias="alternativeField">Alternative field</key>
     <key alias="alternativeText">Alternative Text</key>

From 00a7c97c5e68187814fb45347afa2f99270301ea Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@umbraco.com>
Date: Wed, 3 Feb 2016 13:13:56 +0100
Subject: [PATCH 11/12] Fixed background and word-break in member type builder

---
 .../src/less/components/umb-group-builder.less           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index 3012b5a30b..a0a1bad1dd 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -21,7 +21,6 @@
 }
 
 .umb-group-builder__group.-inherited {
-  background: #FDFDFD;
   border-color: #F2F2F2;
   animation: fadeIn 0.5s;
 }
@@ -109,7 +108,6 @@
 
 .umb-group-builder__group-title.-inherited {
   border-color: #F2F2F2;
-  background: #FDFDFD;
 }
 
 input.umb-group-builder__group-title-input {
@@ -182,7 +180,6 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__property.-inherited {
   border: transparent;
-  background: #FDFDFD;
   animation: fadeIn 0.5s;
 }
 
@@ -223,6 +220,7 @@ input.umb-group-builder__group-sort-value {
 .umb-group-builder__property-meta {
   flex: 0 0 175px;
   margin-right: 20px;
+  word-break: break-word;
 }
 
 .umb-group-builder__property-meta.-full-width {
@@ -232,7 +230,9 @@ input.umb-group-builder__group-sort-value {
 .umb-group-builder__property-meta-alias {
   font-size: 10px;
   color: @gray;
-  word-wrap: break-word;
+  word-break: break-word;
+  line-height: 1.5;
+  margin-bottom: 5px;
 }
 
 .umb-group-builder__property-meta-label textarea {
@@ -256,6 +256,7 @@ input.umb-group-builder__group-sort-value {
 
 .umb-group-builder__property-meta-description textarea {
   font-size: 12px;
+  line-height: 1.5;
   color: @grayDark;
   margin-bottom: 0;
   padding: 0;

From 5f2150ddf7448e1b5058a6492801a9b30b3b8724 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 3 Feb 2016 13:28:23 +0100
Subject: [PATCH 12/12] remove word-break from meta because it hides property
 alias

---
 .../src/less/components/umb-group-builder.less                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
index ef6cc07046..868fbb3437 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
@@ -225,7 +225,6 @@ input.umb-group-builder__group-sort-value {
 .umb-group-builder__property-meta {
   flex: 0 0 175px;
   margin-right: 20px;
-  word-break: break-word;
 }
 
 .umb-group-builder__property-meta.-full-width {