From 5fff1e4ac51080b47bcb5dda6979e949e2c09756 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Sep 2015 15:53:24 +0200
Subject: [PATCH] Fixes umb-editor-header to toggle visibility of certain
 fields based on boolean toggles since we cannot rely on model values being
 undefined when there are validators present because validators change the
 model value to undefined.

---
 .../editor/umbeditorheader.directive.js          |  3 +++
 .../src/views/common/dashboard.html              |  5 ++++-
 .../components/editor/umb-editor-header.html     | 16 +++++++++++-----
 .../src/views/content/edit.html                  |  5 ++++-
 .../src/views/content/recyclebin.html            |  5 ++++-
 .../src/views/datatype/edit.html                 |  5 ++++-
 .../src/views/media/edit.html                    |  5 ++++-
 .../src/views/media/recyclebin.html              |  5 ++++-
 .../src/views/member/edit.html                   |  5 ++++-
 .../src/views/member/list.html                   |  5 ++++-
 10 files changed, 46 insertions(+), 13 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 b037ce3e9a..aa69c76670 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
@@ -46,8 +46,11 @@
             nameLocked: "=",
             menu: "=",
             icon: "=",
+            hideIcon: "@",
             alias: "=",
+            hideAlias: "@",
             description: "=",
+            hideDescription: "@",
             navigation: "="
          },
          link: link
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
index 97a109d6fe..452743d19f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
@@ -12,7 +12,10 @@
          <umb-editor-header
             name="dashboard.name"
             name-locked="page.nameLocked"
-            tabs="dashboard.tabs">
+            tabs="dashboard.tabs"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
          <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index cd8fb83ac5..f99eab3b1a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -6,19 +6,25 @@
 
             <div class="umb-panel-header-left-side">
 
-               <div class="umb-panel-header-icon" ng-if="icon!==undefined" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}">
+               <div class="umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}">
                    <i class="icon {{$parent.icon}}"  ng-if="$parent.icon!=='' && $parent.icon!==null"></i>
                    <div class="umb-panel-header-icon-text" ng-if="$parent.icon==='' || $parent.icon===null">Add icon</div>
                </div>
 
                <div class="umb-panel-header-title-wrapper">
 
-                  <input type="text" class="umb-panel-header-name-input" placeholder="Enter name..." ng-if="name!==undefined && !nameLocked" ng-model="$parent.name"  ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" umb-auto-focus focus-on-filled="true" />
-                  <div class="umb-panel-header-name" ng-if="name!==undefined && nameLocked">{{ name }}</div>
+                  <input type="text" class="umb-panel-header-name-input" placeholder="Enter name..." 
+                         ng-if="!nameLocked" 
+                         ng-model="$parent.name"  
+                         ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}" 
+                         umb-auto-focus 
+                         focus-on-filled="true"
+                         required />
+                  <div class="umb-panel-header-name" ng-if="nameLocked">{{ name }}</div>
 
-                  <umb-generate-alias class="umb-panel-header-alias" ng-if="alias!==undefined" alias="$parent.alias" alias-from="$parent.name" enable-lock="true"></umb-generate-alias>
+                  <umb-generate-alias class="umb-panel-header-alias" ng-if="!hideAlias" alias="$parent.alias" alias-from="$parent.name" enable-lock="true"></umb-generate-alias>
 
-                  <input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-if="description!==undefined" ng-model="$parent.description" />
+                  <input type="text" class="umb-panel-header-description" placeholder="Enter description..." ng-if="!hideDescription" ng-model="$parent.description" />
 
                </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index cbbad8267d..0b1e3b2202 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -13,7 +13,10 @@
          <umb-editor-header
             menu="page.menu"
             name="content.name"
-            tabs="content.tabs">
+            tabs="content.tabs"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
index 19976aa6f7..f4c22c0220 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
@@ -2,7 +2,10 @@
 
    <umb-editor-header
       name="page.name"
-      name-locked="page.nameLocked">
+      name-locked="page.nameLocked"
+      hide-icon="true"
+      hide-description="true"
+      hide-alias="true" >
    </umb-editor-header>
 
    <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
index 8e32589c35..1c80fa44c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
@@ -13,7 +13,10 @@
          <umb-editor-header
             menu="page.menu"
             name="content.name"
-            name-locked="page.nameLocked">
+            name-locked="page.nameLocked"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index b5e8665227..9bebaa8524 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -12,7 +12,10 @@
          <umb-editor-header
             name="content.name"
             tabs="content.tabs"
-            menu="page.menu">
+            menu="page.menu"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
          <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
index ef1b88bcf0..bfdfcbf8bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
@@ -2,7 +2,10 @@
 
    <umb-editor-header
       name="page.name"
-      name-locked="page.nameLocked">
+      name-locked="page.nameLocked"
+      hide-icon="true"
+      hide-description="true"
+      hide-alias="true">
    </umb-editor-header>
 
    <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
index 08abe59050..3492275c08 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html
@@ -13,7 +13,10 @@
             name="content.name"
             name-locked="page.nameLocked"
             tabs="content.tabs"
-            menu="page.menu">
+            menu="page.menu"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
          <umb-editor-container>
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/list.html b/src/Umbraco.Web.UI.Client/src/views/member/list.html
index 99fc997f16..7976677432 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/list.html
@@ -10,7 +10,10 @@
             name="content.name"
             name-locked="page.lockedName"
             tabs="content.tabs"
-            menu="page.menu">
+            menu="page.menu"
+            hide-icon="true"
+            hide-description="true"
+            hide-alias="true">
          </umb-editor-header>
 
          <umb-editor-container>