From 4d1954cc842e6eb76573a6ce44c985e9d5b399ad Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 22 Jun 2015 09:28:50 +0200
Subject: [PATCH] use alias directive in header and property settings dialog

---
 .../src/views/components/editor/umb-editor-header.html     | 7 +------
 .../dialogs/editpropertysettings/editpropertysettings.html | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

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 9974b0f3f6..eae1133591 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
@@ -18,12 +18,7 @@
                 -->
                 <div class="umb-panel-header-name-wrapper">
                     <input type="text" class="umb-panel-header-name" ng-model="name" placeholder="Enter name..." ng-class="{'name-is-empty': name===null || name===''}" umb-auto-resize />
-
-                    <umb-locked-field ng-model="alias"></umb-locked-field>
-
-                    <!--
-                    <div class="umb-panel-header-alias"><i class="icon icon-lock"></i>{{ alias }}</div>-->
-
+                    <umb-generate-alias alias="alias" alias-from="name" enable-lock="true"></umb-generate-alias>
                 </div>
 
                 <input type="text" class="umb-panel-header-description" ng-model="description" placeholder="Enter description..." />
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
index 0400eed2ac..dc424c1061 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/editpropertysettings/editpropertysettings.html
@@ -8,7 +8,7 @@
                    ng-model="model.property.label"
                    placeholder="Enter a name..." umb-auto-focus />
 
-            <umb-locked-field ng-model="model.property.alias"></umb-locked-field>
+            <umb-generate-alias enable-lock="true" alias-from="model.property.label" alias="model.property.alias"></umb-generate-alias>
 
         </div>