From 7e49cc0f25a7e673baad2e156bf812b0a35847f0 Mon Sep 17 00:00:00 2001
From: Niels Hartvig <nh@umbraco.dk>
Date: Tue, 1 Aug 2017 16:19:32 +0200
Subject: [PATCH 1/2] Implements U4-10219 and U4-10218

---
 .../src/views/contentblueprints/intro.html       | 12 ++++++++++++
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml    | 16 ++++++++--------
 .../Trees/ContentBlueprintTreeController.cs      | 10 ++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
new file mode 100644
index 0000000000..62e7b95b11
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
@@ -0,0 +1,12 @@
+<div>
+    <em>This is a non designed placeholder for beta release.</em>
+    
+    <h1>What is Content Templates?</h1>
+    <p>Content Templates are pre-defined content that can be selected when creating a new Content Node.</p>
+    <h2>How do I create a Content Template?</h2>
+    <p>Simply right-click a content node and select "Create Content Template" to create a new Content Template. Once given a name, editors can start
+        using the Content Template as a foundation for their new page.</p>
+    <h2>How do I manage Content Templates</h2>
+    <p>You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Simply expand the Document Type which the 
+    Content Template is based on and click it to edit or delete it.</p>
+</div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 289260b2a6..150cb4c1bf 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -38,7 +38,7 @@
     <key alias="sort">Sort</key>
     <key alias="translate">Translate</key>
     <key alias="update">Update</key>
-    <key alias="createblueprint">Create blueprint</key>
+    <key alias="createblueprint">Create Content Template</key>
   </area>
   <area alias="actionCategories">
     <key alias="content">Content</key>
@@ -64,7 +64,7 @@
     <key alias="sort">Allow access to change the sort order for nodes</key>
     <key alias="translate">Allow access to translate a node</key>
     <key alias="update">Allow access to save a node</key>
-    <key alias="createblueprint">Allow access to create a content template</key>
+    <key alias="createblueprint">Allow access to create a Content Template</key>
   </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">Permission denied.</key>
@@ -210,12 +210,12 @@
     <key alias="nestedContentEditorNotSupported">Property %0% uses editor %1% which is not supported by Nested Content.</key>
     <key alias="addTextBox">Add another text box</key>
     <key alias="removeTextBox">Remove this text box</key>
-    <key alias="createBlueprintFrom">Create a blueprint from %0%</key>
+    <key alias="createBlueprintFrom">Create a Content Template from %0%</key>
     <key alias="blankBlueprint">Blank</key>
-    <key alias="selectBlueprint">Select a blueprint</key>
-    <key alias="createdBlueprintHeading">Blueprint created</key>
-    <key alias="createdBlueprintMessage">Blueprint was created from %0%</key>
-    <key alias="duplicateBlueprintMessage">Another Blueprint with the same name already exists.</key>
+    <key alias="selectBlueprint">Select a Content Template</key>
+    <key alias="createdBlueprintHeading">Content Template created</key>
+    <key alias="createdBlueprintMessage">A Content Template was created from %0%</key>
+    <key alias="duplicateBlueprintMessage">Another Content Template with the same name already exists.</key>
     <key alias="contentRoot">Content root</key>
   </area>
   <area alias="media">
@@ -1530,7 +1530,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="treeHeaders">
     <key alias="content">Content</key>
-    <key alias="contentBlueprints">Content Blueprints</key>
+    <key alias="contentBlueprints">Content Templates</key>
     <key alias="media">Media</key>
     <key alias="cacheBrowser">Cache Browser</key>
     <key alias="contentRecycleBin">Recycle Bin</key>
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 8c9f40493e..43c7dcce4b 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -32,6 +32,16 @@ namespace Umbraco.Web.Trees
     [CoreTree]
     public class ContentBlueprintTreeController : TreeController
     {
+
+        protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
+        {
+            var root = base.CreateRootNode(queryStrings);
+
+            //this will load in a custom UI instead of the dashboard for the root node
+            root.RoutePath = string.Format("{0}/{1}/{2}", Constants.Applications.Settings, Constants.Trees.ContentBlueprints, "intro");
+
+            return root;
+        }
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
         {
             var nodes = new TreeNodeCollection();

From 9d3a1fe529a96665b7735fa63003d0f7f8a75cad Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 2 Aug 2017 12:26:33 +1000
Subject: [PATCH 2/2] updates design so it works and some wording for
 blueprints intro

---
 .../src/views/contentblueprints/intro.html    | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
index 62e7b95b11..06d17350ff 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
@@ -1,12 +1,32 @@
-<div>
-    <em>This is a non designed placeholder for beta release.</em>
+<div class="clearfix">
+    <umb-editor-view footer="false">
+
+        <umb-editor-header name="'Content Templates'"
+                           name-locked="true"
+                           hide-icon="true"
+                           hide-description="true"                           
+                           hide-alias="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+
+            <div>
+                <em><small>TODO: This is a non designed placeholder for beta release - please update me!</small></em>
     
-    <h1>What is Content Templates?</h1>
-    <p>Content Templates are pre-defined content that can be selected when creating a new Content Node.</p>
-    <h2>How do I create a Content Template?</h2>
-    <p>Simply right-click a content node and select "Create Content Template" to create a new Content Template. Once given a name, editors can start
-        using the Content Template as a foundation for their new page.</p>
-    <h2>How do I manage Content Templates</h2>
-    <p>You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Simply expand the Document Type which the 
-    Content Template is based on and click it to edit or delete it.</p>
+                <h3>What are Content Templates?</h3>
+                <p>Content Templates are pre-defined content that can be selected when creating a new Content node.</p>
+                <h3>How do I create a Content Template?</h3>
+                <p>Simply right-click a content node and select "Create Content Template" to create a new Content Template. Once given a name, editors can start
+                    using the Content Template as a foundation for their new page.</p>
+                <h3>How do I manage Content Templates</h3>
+                <p>You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Just expand the Document Type which the 
+                    Content Template is based on and click it to edit or delete it.</p>
+            </div>
+
+        </umb-editor-container>
+
+    </umb-editor-view>
 </div>
+
+
+