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 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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>