From 431f91b90032dec0ca2ec5f36f1851e2e8b6febb Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Mon, 30 Jan 2017 14:57:08 +0100
Subject: [PATCH 01/15] Adds an api endpoint for getting the available snippets
  in the Umbraco folder

---
 src/Umbraco.Web/Editors/CodeFileController.cs | 36 +++++++++++++++++++
 .../Models/ContentEditing/SnippetDisplay.cs   | 14 ++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 3 files changed, 51 insertions(+)
 create mode 100644 src/Umbraco.Web/Models/ContentEditing/SnippetDisplay.cs

diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 60dcf624a0..4f1be8563a 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -1,7 +1,10 @@
 using AutoMapper;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
@@ -100,6 +103,39 @@ namespace Umbraco.Web.Editors
             throw new HttpResponseException(HttpStatusCode.NotFound);
         }
 
+        /// <summary>
+        /// Used to get a list of available templates/snippets to base a new Partial View og Partial View Macro from
+        /// </summary>
+        /// <param name="type">This is a string but will be 'partialViews', 'partialViewMacros'</param>
+        /// <returns>Returns a list of <see cref="SnippetDisplay"/> if a correct type is sent</returns>
+        public IEnumerable<SnippetDisplay> GetSnippets(string type)
+        {
+            if (string.IsNullOrWhiteSpace(type))
+            {
+                throw new HttpResponseException(HttpStatusCode.BadRequest);
+            }
+
+            IEnumerable<string> snippets;
+            switch (type)
+            {
+                case Core.Constants.Trees.PartialViews:
+                    snippets = Services.FileService.GetPartialViewSnippetNames(
+                        //ignore these - (this is taken from the logic in "PartialView.ascx.cs")
+                        "Gallery",
+                        "ListChildPagesFromChangeableSource",
+                        "ListChildPagesOrderedByProperty",
+                        "ListImagesFromMediaFolder");
+                    break;
+                case Core.Constants.Trees.PartialViewMacros:
+                    snippets = Services.FileService.GetPartialViewSnippetNames();
+                    break;
+                default:
+                    throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            return snippets.Select(snippet => new SnippetDisplay() {Name = snippet.SplitPascalCasing().ToFirstUpperInvariant(), FileName = snippet});
+        }
+
         /// <summary>
         /// Used to delete a specific file from disk via the FileService
         /// </summary>
diff --git a/src/Umbraco.Web/Models/ContentEditing/SnippetDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/SnippetDisplay.cs
new file mode 100644
index 0000000000..e05f8c5c89
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/SnippetDisplay.cs
@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    [DataContract(Name = "scriptFile", Namespace = "")]
+    public class SnippetDisplay
+    {
+        [DataMember(Name = "name", IsRequired = true)]
+        public string Name { get; set; }
+
+        [DataMember(Name = "fileName", IsRequired = true)]
+        public string FileName { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 68bb81fad7..f65ac1fce2 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -339,6 +339,7 @@
     <Compile Include="Models\ContentEditing\PropertyGroupBasic.cs" />
     <Compile Include="Models\ContentEditing\PropertyTypeBasic.cs" />
     <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
+    <Compile Include="Models\ContentEditing\SnippetDisplay.cs" />
     <Compile Include="Models\ContentEditing\TemplateDisplay.cs" />
     <Compile Include="Models\LocalPackageInstallModel.cs" />
     <Compile Include="Models\Mapping\CodeFileDisplayMapper.cs" />

From 6bd1a77b967cc992d31a115cef8a16271fe50636 Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Tue, 31 Jan 2017 10:10:05 +0100
Subject: [PATCH 02/15] Simple wiring up of the create menu for partialview,
 partialviewmacro and script

---
 .../src/views/partialviewmacros/create.controller.js      | 8 ++++++++
 .../src/views/partialviewmacros/create.html               | 5 +++++
 .../src/views/partialviews/create.controller.js           | 8 ++++++++
 .../src/views/partialviews/create.html                    | 5 +++++
 .../src/views/scripts/create.controller.js                | 8 ++++++++
 src/Umbraco.Web.UI.Client/src/views/scripts/create.html   | 5 +++++
 src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs  | 5 ++++-
 src/Umbraco.Web/Trees/PartialViewsTreeController.cs       | 5 ++++-
 src/Umbraco.Web/Trees/ScriptTreeController.cs             | 5 ++++-
 9 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/scripts/create.html

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
new file mode 100644
index 0000000000..a350a626f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -0,0 +1,8 @@
+(function () {
+    "use strict";
+
+    function PartialViewMacrosCreateController() {
+    }
+
+    angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.CreateController", PartialViewMacrosCreateController);
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
new file mode 100644
index 0000000000..9e5504aa0c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -0,0 +1,5 @@
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.PartialViewMacros.CreateController" ng-cloak>
+    <div class="umb-pane">
+        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
new file mode 100644
index 0000000000..cbd1af039a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
@@ -0,0 +1,8 @@
+(function () {
+    "use strict";
+
+    function PartialViewsCreateController() {
+    }
+
+    angular.module("umbraco").controller("Umbraco.Editors.PartialViews.CreateController", PartialViewsCreateController);
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
new file mode 100644
index 0000000000..e5edc326f4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -0,0 +1,5 @@
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.PartialViews.CreateController" ng-cloak>
+    <div class="umb-pane">
+        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
new file mode 100644
index 0000000000..419a037fa3
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -0,0 +1,8 @@
+(function () {
+    "use strict";
+
+    function ScriptsCreateController() {
+    }
+
+    angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController);
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
new file mode 100644
index 0000000000..99cf043e35
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -0,0 +1,5 @@
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController" ng-cloak>
+    <div class="umb-pane">
+        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+    </div>
+</div>
diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index 10daa56dbe..688787e338 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -34,7 +34,10 @@ namespace Umbraco.Web.Trees
 
             if (id == Constants.System.Root.ToInvariantString())
             {
-
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
                 //refresh action
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
 
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index 7a88def826..3913c41a32 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -33,7 +33,10 @@ namespace Umbraco.Web.Trees
 
             if (id == Constants.System.Root.ToInvariantString())
             {
-
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
                 //refresh action
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
 
diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs
index ae19dbcf48..90174b6931 100644
--- a/src/Umbraco.Web/Trees/ScriptTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs
@@ -30,7 +30,10 @@ namespace Umbraco.Web.Trees
 
             if (id == Constants.System.Root.ToInvariantString())
             {
-
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
                 //refresh action
                 menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
 

From d22afe07db387db5b857f263ad25be9e8e2c0bae Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 31 Jan 2017 12:40:56 +0100
Subject: [PATCH 03/15] add UI for scripts create dialog

---
 .../src/views/scripts/create.controller.js    | 29 +++++++++-
 .../src/views/scripts/create.html             | 54 +++++++++++++++++--
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index 419a037fa3..4e4a317591 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -1,7 +1,34 @@
 (function () {
     "use strict";
 
-    function ScriptsCreateController() {
+    function ScriptsCreateController($scope, $location, navigationService) {
+
+        var vm = this;
+        var node = $scope.dialogOptions.currentNode;
+
+        vm.creatingFolder = false;
+        vm.folderName = "";
+        vm.fileExtension = "";
+
+        vm.createFile = createFile;
+        vm.showCreateFolder = showCreateFolder;
+        vm.createFolder = createFolder;
+
+        function createFile(fileExtension) {
+            $location.search('create', null);
+            $location.search('fileExtension', null);
+            $location.path("/settings/scripts/edit/" + node.id).search("create", "true").search("fileExtension", fileExtension);
+            navigationService.hideMenu();
+        }
+
+        function showCreateFolder() {
+            vm.creatingFolder = true;
+        }
+
+        function createFolder() {
+            alert("create folder");
+        }
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 99cf043e35..2836d44d2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -1,5 +1,53 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController" ng-cloak>
-    <div class="umb-pane">
-        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
+
+    <div class="umb-pane" ng-if="!vm.creatingFolder">
+        <h5><localize key="create_createUnder">Create new partial view under</localize> {{currentNode.name}}</h5>
+
+        <ul class="umb-actions umb-actions-child">
+            <li>
+                <a href="" umb-auto-focus ng-click="vm.createFile('.js')">
+                    <i class="large icon-script"></i>
+                    <span class="menu-label">.js file</span>
+                </a>
+            </li>
+            <li>
+                <a href="" ng-click="vm.createFile('.xml')">
+                    <i class="large icon-script"></i>
+                    <span class="menu-label">.xml file</span>
+                </a>
+            </li>
+            <li>
+                <a href="" ng-click="vm.showCreateFolder()">
+                    <i class="large icon-folder"></i>
+                    <span class="menu-label"><localize key="general_folder"></localize></span>
+                </a>
+            </li>
+        </ul>
+
     </div>
+
+    <div class="umb-pane" ng-if="vm.creatingFolder">
+        <form novalidate name="createFolderForm"
+              ng-submit="vm.createFolder()"
+              val-form-manager>
+            
+            <div ng-show="error">
+                <h5 class="text-error">{{error.errorMsg}}</h5>
+                <p class="text-error">{{error.data.message}}</p>
+            </div>
+
+            <umb-control-group label="Enter a folder name" hide-label="false">
+                <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+            </umb-control-group>
+
+            <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+        </form>
+    </div>
+
+</div>
+
+<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!vm.creatingFolder">
+    <button class="btn" ng-click="nav.hideDialog(true)">
+        <localize key="buttons_somethingElse">Do something else</localize>
+    </button>
 </div>

From 4cd287616e655692f6ec9411bb2588e464c8fd6d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 31 Jan 2017 14:44:52 +0100
Subject: [PATCH 04/15] add UI for partial view macros create dialog

---
 .../src/common/resources/codefile.resource.js | 30 ++++++++
 .../partialviewmacros/create.controller.js    | 51 ++++++++++++-
 .../src/views/partialviewmacros/create.html   | 76 ++++++++++++++++++-
 3 files changed, 153 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
index 4655b6fa3b..e8657ecd73 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
@@ -176,7 +176,37 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
                          "PostSave"),
                          codeFile),
                 "Failed to save data for code file " + codeFile.virtualPath);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.codefileResource#getSnippets
+         * @methodOf umbraco.resources.codefileResource
+         *
+         * @description
+         * Gets code snippets for a given file type
+         * 
+         * ##usage
+         * <pre>
+         * codefileResource.getSnippets(fileType)
+         *    .then(function(snippets) {
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} file type: (partialViews, partialViewMacros)
+         * @returns {Promise} resourcePromise object.
+         *
+         */
+        getSnippets: function (fileType) {
+            return umbRequestHelper.resourcePromise(
+                 $http.get(
+                     umbRequestHelper.getApiUrl(
+                         "codeFileApiBaseUrl",
+                         "GetSnippets?type=" + fileType )),
+                "Failed to get snippet for" + fileType);
         }
+
     };
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
index a350a626f4..e822c19d09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -1,7 +1,56 @@
 (function () {
     "use strict";
 
-    function PartialViewMacrosCreateController() {
+    function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService) {
+
+        var vm = this;
+        var node = $scope.dialogOptions.currentNode;
+
+        vm.snippets = [];
+        vm.showSnippets = false;
+        vm.creatingFolder = false;
+
+        vm.createPartialViewMacro = createPartialViewMacro;
+        vm.showCreateFolder = showCreateFolder;
+        vm.createFolder = createFolder;
+        vm.showCreateFromSnippet = showCreateFromSnippet;
+
+        function onInit() {
+            codefileResource.getSnippets('partialViewMacros')
+                .then(function(snippets) {
+                    vm.snippets = snippets;
+                });
+        }
+
+        function createPartialViewMacro(selectedSnippet) {
+
+            var snippet = null;
+
+            if(selectedSnippet && selectedSnippet.fileName) {
+                snippet = selectedSnippet.fileName;
+            }
+
+            $location.search('create', null);
+            $location.search('snippet', null);
+            $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet);
+            navigationService.hideMenu();
+
+        }
+
+        function showCreateFolder() {
+            vm.creatingFolder = true;
+        }
+
+        function createFolder() {
+            alert("create folder");
+        }
+        
+        function showCreateFromSnippet() {
+            vm.showSnippets = true;
+        }
+        
+        onInit();
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.CreateController", PartialViewMacrosCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 9e5504aa0c..0c3c0fc385 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -1,5 +1,75 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.PartialViewMacros.CreateController" ng-cloak>
-    <div class="umb-pane">
-        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+<div ng-controller="Umbraco.Editors.PartialViewMacros.CreateController as vm" ng-cloak>
+
+    <div class="umbracoDialog umb-dialog-body with-footer">
+
+        <div class="umb-pane" ng-if="!vm.creatingFolder">
+            
+            <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+
+            <!-- Main options -->
+            <div ng-if="!vm.showSnippets">
+                <ul class="umb-actions umb-actions-child">
+                    <li>
+                        <a href="" ng-click="vm.createPartialViewMacro()" umb-auto-focus>
+                            <i class="large icon-article"></i>
+                            <span class="menu-label">New Empty Partial View Macro</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon-article"></i>
+                            <span class="menu-label">New Partial View Macro from Snippet</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFolder()">
+                            <i class="large icon-folder"></i>
+                            <span class="menu-label"><localize key="general_folder"></localize></span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+            <!-- Snippets list -->
+            <div ng-if="vm.showSnippets">
+                <ul class="umb-actions umb-actions-child">
+                    <li ng-repeat="snippet in vm.snippets">
+                        <a href="" ng-click="vm.createPartialViewMacro(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article" style="font-size: 20px;"></i>
+                            <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+        </div>
+
+        <!-- Create folder -->
+        <div class="umb-pane" ng-if="vm.creatingFolder">
+            <form novalidate name="createFolderForm"
+                ng-submit="vm.createFolder()"
+                val-form-manager>
+                
+                <div ng-show="error">
+                    <h5 class="text-error">{{error.errorMsg}}</h5>
+                    <p class="text-error">{{error.data.message}}</p>
+                </div>
+
+                <umb-control-group label="Enter a folder name" hide-label="false">
+                    <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                </umb-control-group>
+
+                <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+            </form>
+        </div>
+
     </div>
+
+    <!-- Dialog footer -->
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <button class="btn" ng-click="nav.hideDialog(true)">
+            <localize key="buttons_somethingElse">Do something else</localize>
+        </button>
+    </div>
+
 </div>

From d4fab66411f2d12edc24f41cbf7229f5ad66ce6c Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 31 Jan 2017 15:00:37 +0100
Subject: [PATCH 05/15] add UI for partial views create dialog

---
 .../views/partialviews/create.controller.js   | 51 ++++++++++++-
 .../src/views/partialviews/create.html        | 76 ++++++++++++++++++-
 2 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
index cbd1af039a..71c5e5d080 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
@@ -1,7 +1,56 @@
 (function () {
     "use strict";
 
-    function PartialViewsCreateController() {
+    function PartialViewsCreateController($scope, codefileResource, $location, navigationService) {
+
+        var vm = this;
+        var node = $scope.dialogOptions.currentNode;
+
+        vm.snippets = [];
+        vm.showSnippets = false;
+        vm.creatingFolder = false;
+
+        vm.createPartialView = createPartialView;
+        vm.showCreateFolder = showCreateFolder;
+        vm.createFolder = createFolder;
+        vm.showCreateFromSnippet = showCreateFromSnippet;
+
+        function onInit() {
+            codefileResource.getSnippets('partialViews')
+                .then(function(snippets) {
+                    vm.snippets = snippets;
+                });
+        }
+
+        function createPartialView(selectedSnippet) {
+
+            var snippet = null;
+
+            if(selectedSnippet && selectedSnippet.fileName) {
+                snippet = selectedSnippet.fileName;
+            }
+
+            $location.search('create', null);
+            $location.search('snippet', null);
+            $location.path("/settings/partialviews/edit/" + node.id).search("create", "true").search("snippet", snippet);
+            navigationService.hideMenu();
+
+        }
+
+        function showCreateFolder() {
+            vm.creatingFolder = true;
+        }
+
+        function createFolder() {
+            alert("create folder");
+        }
+        
+        function showCreateFromSnippet() {
+            vm.showSnippets = true;
+        }
+        
+        onInit();
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.PartialViews.CreateController", PartialViewsCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index e5edc326f4..eb8fe4ed2b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -1,5 +1,75 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.PartialViews.CreateController" ng-cloak>
-    <div class="umb-pane">
-        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+<div ng-controller="Umbraco.Editors.PartialViews.CreateController as vm" ng-cloak>
+
+    <div class="umbracoDialog umb-dialog-body with-footer">
+
+        <div class="umb-pane" ng-if="!vm.creatingFolder">
+            
+            <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+
+            <!-- Main options -->
+            <div ng-if="!vm.showSnippets">
+                <ul class="umb-actions umb-actions-child">
+                    <li>
+                        <a href="" ng-click="vm.createPartialView()" umb-auto-focus>
+                            <i class="large icon-article"></i>
+                            <span class="menu-label">New Empty Partial View</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFromSnippet()">
+                            <i class="large icon-article"></i>
+                            <span class="menu-label">New Partial View from Snippet</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="" ng-click="vm.showCreateFolder()">
+                            <i class="large icon-folder"></i>
+                            <span class="menu-label"><localize key="general_folder"></localize></span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+            <!-- Snippets list -->
+            <div ng-if="vm.showSnippets">
+                <ul class="umb-actions umb-actions-child">
+                    <li ng-repeat="snippet in vm.snippets">
+                        <a href="" ng-click="vm.createPartialView(snippet)" style="padding-top: 6px; padding-bottom: 6px;">
+                            <i class="icon-article" style="font-size: 20px;"></i>
+                            <span class="menu-label" style="margin-left: 0; padding-left: 5px;">{{ snippet.name }}</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+        </div>
+
+        <!-- Create folder -->
+        <div class="umb-pane" ng-if="vm.creatingFolder">
+            <form novalidate name="createFolderForm"
+                ng-submit="vm.createFolder()"
+                val-form-manager>
+                
+                <div ng-show="error">
+                    <h5 class="text-error">{{error.errorMsg}}</h5>
+                    <p class="text-error">{{error.data.message}}</p>
+                </div>
+
+                <umb-control-group label="Enter a folder name" hide-label="false">
+                    <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                </umb-control-group>
+
+                <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+            </form>
+        </div>
+
     </div>
+
+    <!-- Dialog footer -->
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <button class="btn" ng-click="nav.hideDialog(true)">
+            <localize key="buttons_somethingElse">Do something else</localize>
+        </button>
+    </div>
+
 </div>

From 6a1d7d258635651ff2b9a093048e49c671f85e87 Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Wed, 1 Feb 2017 12:33:20 +0100
Subject: [PATCH 06/15] Adds GetScaffold in CodeFileController to simplify
 initial view in backoffice

Refactored the FileService a bit to be able to get content of the snippets without duplicate code
---
 src/Umbraco.Core/Services/FileService.cs      | 82 +++++++++++--------
 src/Umbraco.Core/Services/IFileService.cs     | 14 ++++
 src/Umbraco.Web/Editors/CodeFileController.cs | 42 ++++++++++
 3 files changed, 106 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 6360ad8988..2105f7af2c 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -744,40 +744,9 @@ namespace Umbraco.Core.Services
             if (CreatingPartialView.IsRaisedEventCancelled(new NewEventArgs<IPartialView>(partialView, true, partialView.Alias, -1), this))
                 return Attempt<IPartialView>.Fail();
 
-            string partialViewHeader;
-            switch (partialViewType)
-            {
-                case PartialViewType.PartialView:
-                    partialViewHeader = PartialViewHeader;
-                    break;
-                case PartialViewType.PartialViewMacro:
-                    partialViewHeader = PartialViewMacroHeader;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException("partialViewType");
-            }
-
             if (snippetName.IsNullOrWhiteSpace() == false)
             {
-                //create the file
-                var snippetPathAttempt = TryGetSnippetPath(snippetName);
-                if (snippetPathAttempt.Success == false)
-                {
-                    throw new InvalidOperationException("Could not load snippet with name " + snippetName);
-                }
-
-                using (var snippetFile = new StreamReader(System.IO.File.OpenRead(snippetPathAttempt.Result)))
-                {
-                    var snippetContent = snippetFile.ReadToEnd().Trim();
-
-                    //strip the @inherits if it's there
-                    snippetContent = StripPartialViewHeader(snippetContent);
-                    
-                    var content = string.Format("{0}{1}{2}",
-                        partialViewHeader, 
-                        Environment.NewLine, snippetContent);
-                    partialView.Content = content;
-                }
+                partialView.Content = GetPartialViewMacroSnippetContent(snippetName, partialViewType);
             }
 
             var uow = _fileUowProvider.GetUnitOfWork();
@@ -914,6 +883,55 @@ namespace Umbraco.Core.Services
             }
         }
 
+        public string GetPartialViewSnippetContent(string snippetName)
+        {
+            return GetPartialViewMacroSnippetContent(snippetName, PartialViewType.PartialView);
+        }
+
+        public string GetPartialViewMacroSnippetContent(string snippetName)
+        {
+            return GetPartialViewMacroSnippetContent(snippetName, PartialViewType.PartialViewMacro);
+        }
+
+        private string GetPartialViewMacroSnippetContent(string snippetName, PartialViewType partialViewType)
+        {
+            if (snippetName.IsNullOrWhiteSpace())
+                throw new ArgumentNullException("snippetName");
+
+            string partialViewHeader;
+            switch (partialViewType)
+            {
+                case PartialViewType.PartialView:
+                    partialViewHeader = PartialViewHeader;
+                    break;
+                case PartialViewType.PartialViewMacro:
+                    partialViewHeader = PartialViewMacroHeader;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("partialViewType");
+            }
+
+            // Try and get the snippet path
+            var snippetPathAttempt = TryGetSnippetPath(snippetName);
+            if (snippetPathAttempt.Success == false)
+            {
+                throw new InvalidOperationException("Could not load snippet with name " + snippetName);
+            }
+
+            using (var snippetFile = new StreamReader(System.IO.File.OpenRead(snippetPathAttempt.Result)))
+            {
+                var snippetContent = snippetFile.ReadToEnd().Trim();
+
+                //strip the @inherits if it's there
+                snippetContent = StripPartialViewHeader(snippetContent);
+
+                var content = string.Format("{0}{1}{2}",
+                    partialViewHeader,
+                    Environment.NewLine, snippetContent);
+                return content;
+            }
+        }
+
         public void SetPartialViewMacroFileContent(string filepath, Stream content)
         {
             using (var repository = GetPartialViewRepository(PartialViewType.PartialViewMacro, UowProvider.GetUnitOfWork()))
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index 5115a25087..453d199bfe 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -331,6 +331,13 @@ namespace Umbraco.Core.Services
         /// <returns>The content of the macro partial view.</returns>
         Stream GetPartialViewMacroFileContentStream(string filepath);
 
+        /// <summary>
+        /// Gets the content of a macro partial view snippet as a string
+        /// </summary>
+        /// <param name="snippetName">The name of the snippet</param>
+        /// <returns></returns>
+        string GetPartialViewMacroSnippetContent(string snippetName);
+
         /// <summary>
         /// Sets the content of a macro partial view.
         /// </summary>
@@ -352,6 +359,13 @@ namespace Umbraco.Core.Services
         /// <returns>The content of the partial view.</returns>
         Stream GetPartialViewFileContentStream(string filepath);
 
+        /// <summary>
+        /// Gets the content of a partial view snippet as a string.
+        /// </summary>
+        /// <param name="snippetName">The name of the snippet</param>
+        /// <returns>The content of the partial view.</returns>
+        string GetPartialViewSnippetContent(string snippetName);
+
         /// <summary>
         /// Sets the content of a partial view.
         /// </summary>
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 4f1be8563a..f8d6692e3c 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -33,11 +33,13 @@ namespace Umbraco.Web.Editors
             {
                 case Core.Constants.Trees.PartialViews:
                     var view = new PartialView(display.VirtualPath);
+                    view.Content = display.Content;
                     var result = Services.FileService.CreatePartialView(view, display.Snippet, Security.CurrentUser.Id);
                     return result.Success == true ? Request.CreateResponse(HttpStatusCode.OK) : Request.CreateNotificationValidationErrorResponse(result.Exception.Message);
 
                 case Core.Constants.Trees.PartialViewMacros:
                     var viewMacro = new PartialView(display.VirtualPath);
+                    viewMacro.Content = display.Content;
                     var resultMacro = Services.FileService.CreatePartialViewMacro(viewMacro, display.Snippet, Security.CurrentUser.Id);
                     return resultMacro.Success == true ? Request.CreateResponse(HttpStatusCode.OK) : Request.CreateNotificationValidationErrorResponse(resultMacro.Exception.Message);
 
@@ -136,6 +138,46 @@ namespace Umbraco.Web.Editors
             return snippets.Select(snippet => new SnippetDisplay() {Name = snippet.SplitPascalCasing().ToFirstUpperInvariant(), FileName = snippet});
         }
 
+        /// <summary>
+        /// Used to scaffold the json object for the editors for 'scripts', 'partialViews', 'partialViewMacros'
+        /// </summary>
+        /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros'</param>
+        /// <param name="snippetName"></param>
+        /// <returns></returns>
+        public CodeFileDisplay GetScaffold(string type, string snippetName = null)
+        {
+            if (string.IsNullOrWhiteSpace(type))
+            {
+                throw new HttpResponseException(HttpStatusCode.BadRequest);
+            }
+
+            CodeFileDisplay codeFileDisplay;
+
+            switch (type)
+            {
+                case Core.Constants.Trees.PartialViews:
+                    codeFileDisplay = Mapper.Map<IPartialView, CodeFileDisplay>(new PartialView(string.Empty));
+                    if (snippetName.IsNullOrWhiteSpace() == false)
+                        codeFileDisplay.Content = Services.FileService.GetPartialViewSnippetContent(snippetName);
+                    break;
+                case Core.Constants.Trees.PartialViewMacros:
+                    codeFileDisplay = Mapper.Map<IPartialView, CodeFileDisplay>(new PartialView(string.Empty));
+                    if (snippetName.IsNullOrWhiteSpace() == false)
+                        codeFileDisplay.Content = Services.FileService.GetPartialViewMacroSnippetContent(snippetName);
+                    break;
+                case Core.Constants.Trees.Scripts:
+                    codeFileDisplay = Mapper.Map<Script, CodeFileDisplay>(new Script(string.Empty));
+                    break;
+                default:
+                    throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Unsupported editortype"));
+            }
+
+            codeFileDisplay.FileType = type;
+            codeFileDisplay.VirtualPath = "-1";
+
+            return codeFileDisplay;
+        }
+
         /// <summary>
         /// Used to delete a specific file from disk via the FileService
         /// </summary>

From e439302b933d3262da62ead5e93c16432ad2cfe4 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 1 Feb 2017 13:54:16 +0100
Subject: [PATCH 07/15] add support for getScaffold for scripts, partialViews
 and partialViewMacros editor

---
 .../src/common/resources/codefile.resource.js | 68 +++++++++----------
 .../partialviewmacros/edit.controller.js      | 11 ++-
 .../src/views/partialviews/edit.controller.js | 12 +++-
 .../src/views/scripts/edit.controller.js      |  2 +-
 4 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
index e8657ecd73..7e98f17795 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
@@ -77,39 +77,6 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
                "Failed to retrieve data for template with alias: " + alias);
         },
 
-
-        /**
-         * @ngdoc method
-         * @name umbraco.resources.codefileResource#getScaffold
-         * @methodOf umbraco.resources.codefileResource
-         *
-         * @description
-         * Returns a scaffold of an empty codefile item
-         *
-         * The scaffold is used to build editors for code file editors that has not yet been populated with data.
-         *
-         * ##usage
-         * <pre>
-         * codefileResource.getScaffold()
-         *    .then(function(template) {
-         *        alert('its here!');
-         *    });
-         * </pre>
-         *
-         * @returns {Promise} resourcePromise object containing the codefile scaffold.
-         *
-         */
-        getScaffold: function (id) {
-
-            return umbRequestHelper.resourcePromise(
-               $http.get(
-                   umbRequestHelper.getApiUrl(
-                       "templateApiBaseUrl",
-                       "GetScaffold",
-                        [{ id: id }])),
-               "Failed to retrieve data for empty template");
-        },
-
         /**
          * @ngdoc method
          * @name umbraco.resources.codefileResource#deleteByPath
@@ -188,7 +155,7 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
          * 
          * ##usage
          * <pre>
-         * codefileResource.getSnippets(fileType)
+         * codefileResource.getSnippets("partialViews")
          *    .then(function(snippets) {
          *        alert('its here!');
          *    });
@@ -205,6 +172,39 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
                          "codeFileApiBaseUrl",
                          "GetSnippets?type=" + fileType )),
                 "Failed to get snippet for" + fileType);
+        },
+
+        /**
+         * @ngdoc method
+         * @name umbraco.resources.codefileResource#getScaffold
+         * @methodOf umbraco.resources.codefileResource
+         *
+         * @description
+         * Returns a scaffold of an empty codefile item.
+         * 
+         * The scaffold is used to build editors for code file editors that has not yet been populated with data.
+         * 
+         * ##usage
+         * <pre>
+         * codefileResource.getScaffold("partialViews", "Breadcrumb")
+         *    .then(function(data) {
+         *        alert('its here!');
+         *    });
+         * </pre>
+         *
+         * @param {string} File type: (scripts, partialViews, partialViewMacros).
+         * @param {string} Snippet name (Ex. Breadcrumb).
+         * @returns {Promise} resourcePromise object.
+         *
+         */
+
+        getScaffold: function (type, snippetName) {
+            return umbRequestHelper.resourcePromise(
+                 $http.get(
+                     umbRequestHelper.getApiUrl(
+                         "codeFileApiBaseUrl",
+                         "GetScaffold?type=" + type + "&snippetName=" + snippetName)),
+                "Failed to get scaffold for" + type);
         }
 
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
index c402f42ee7..a02de75b75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
@@ -227,10 +227,19 @@
         function init() {
             //we need to load this somewhere, for now its here.
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css");
+            
             if ($routeParams.create) {
-                codefileResource.getScaffold().then(function (partialViewMacro) {
+                
+                var snippet = "Empty";
+
+                if($routeParams.snippet) {
+                    snippet = $routeParams.snippet;
+                }
+
+                codefileResource.getScaffold("partialViewMacros", snippet).then(function (partialViewMacro) {
                     ready(partialViewMacro);
                 });
+
             } else {
                 codefileResource.getByPath('partialViewMacros', $routeParams.id).then(function (partialViewMacro) {
                     ready(partialViewMacro);
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index 11dba8a63e..d578e0a8af 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -227,15 +227,25 @@
         function init() {
             //we need to load this somewhere, for now its here.
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css");
+
             if ($routeParams.create) {
-                codefileResource.getScaffold().then(function (partialView) {
+                
+                var snippet = "Empty";
+
+                if($routeParams.snippet) {
+                    snippet = $routeParams.snippet;
+                }
+
+                codefileResource.getScaffold("partialViews", snippet).then(function (partialView) {
                     ready(partialView);
                 });
+                
             } else {
                 codefileResource.getByPath('partialViews', $routeParams.id).then(function (partialView) {
                     ready(partialView);
                 });
             }
+
         }
 
         function ready(partialView) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
index cd10ae75d5..1470833aad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
@@ -79,7 +79,7 @@
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css");
 
             if ($routeParams.create) {
-                codefileResource.getScaffold().then(function (script) {
+                codefileResource.getScaffold("scripts").then(function(script) {
                     ready(script);
                 });
             } else {

From c9082ce511061f343cf98f089ae32a1ab7f9e7dc Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Wed, 1 Feb 2017 15:46:22 +0100
Subject: [PATCH 08/15] Changed PostSave method in CodeFileController to create
 or update instead of only updating - this is for keeping consistency with how
 other new editors work

---
 src/Umbraco.Web/Editors/CodeFileController.cs | 112 +++++++++++-------
 1 file changed, 71 insertions(+), 41 deletions(-)

diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index f8d6692e3c..4875787a9e 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Web.Http;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.ContentEditing;
@@ -223,7 +224,7 @@ namespace Umbraco.Web.Editors
         }
 
         /// <summary>
-        /// Used to save/update an existing file after its initial creation
+        /// Used to create or update a 'partialview', 'partialviewmacro' or 'script' file
         /// </summary>
         /// <param name="display"></param>
         /// <returns>The updated CodeFileDisplay model</returns>
@@ -239,67 +240,43 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
 
-
             switch (display.FileType)
             {
                 case Core.Constants.Trees.PartialViews:
-                    var view = Services.FileService.GetPartialView(display.VirtualPath);
-                    if (view != null)
-                    {
-                        // might need to find the path
-                        var orgPath = view.OriginalPath.Substring(0, view.OriginalPath.IndexOf(view.Name));
-                        view.Path = orgPath + display.Name;
 
-                        view.Content = display.Content;
-                        var result = Services.FileService.SavePartialView(view, Security.CurrentUser.Id);
-                        if (result.Success == true)
-                        {
-                            return Mapper.Map(view, display);
-                        }
+                    var partialViewResult = CreateOrUpdatePartialView(display);
+                    if (partialViewResult.Success)
+                        return Mapper.Map(partialViewResult.Result, display);
 
-                        display.AddErrorNotification(
-                            Services.TextService.Localize("speechBubbles/partialViewErrorHeader"),
-                            Services.TextService.Localize("speechBubbles/partialViewErrorText"));
-                    }
-                    else
-                    {
-                        throw new HttpResponseException(HttpStatusCode.NotFound);
-                    }
+                    display.AddErrorNotification(
+                        Services.TextService.Localize("speechBubbles/partialViewErrorHeader"),
+                        Services.TextService.Localize("speechBubbles/partialViewErrorText"));
                     break;
 
                 case Core.Constants.Trees.PartialViewMacros:
-                    var viewMacro = Services.FileService.GetPartialViewMacro(display.VirtualPath);
-                    if (viewMacro != null)
-                    {
-                        viewMacro.Content = display.Content;
-                        viewMacro.Path = display.Name;
-                        var result = Services.FileService.SavePartialViewMacro(viewMacro, Security.CurrentUser.Id);
-                        if (result.Success == false)
-                        {
-                            display.AddErrorNotification(
+                    var partialViewMacroResult = CreateOrUpdatePartialViewMacro(display);
+                    if (partialViewMacroResult.Success)
+                        return Mapper.Map(partialViewMacroResult.Result, display);
+
+                    display.AddErrorNotification(
                                 Services.TextService.Localize("speechBubbles/macroPartialViewErrorHeader"),
                                 Services.TextService.Localize("speechBubbles/macroPartialViewErrorText"));
-                        }
-                    }
-                    else
-                    {
-                        throw new HttpResponseException(HttpStatusCode.NotFound);
-                    }
                     break;
 
                 case Core.Constants.Trees.Scripts:
                     var script = Services.FileService.GetScriptByName(display.VirtualPath);
                     if (script != null)
                     {
-                        script.Content = display.Content;
                         script.Path = display.Name;
-                        Services.FileService.SaveScript(script, Security.CurrentUser.Id);
-
                     }
                     else
                     {
-                        throw new HttpResponseException(HttpStatusCode.NotFound);
+                        script = new Script(display.Name);
                     }
+
+                    script.Content = display.Content;
+
+                    Services.FileService.SaveScript(script, Security.CurrentUser.Id);
                     break;
 
                 default:
@@ -308,5 +285,58 @@ namespace Umbraco.Web.Editors
 
             return display;
         }
+
+        private Attempt<IPartialView> CreateOrUpdatePartialView(CodeFileDisplay display)
+        {
+            Attempt<IPartialView> partialViewResult;
+            var view = Services.FileService.GetPartialView(display.VirtualPath ?? string.Empty);
+            if (view != null)
+            {
+                // might need to find the path
+                var orgPath = view.OriginalPath.Substring(0, view.OriginalPath.IndexOf(view.Name));
+                view.Path = orgPath + display.Name;
+
+                view.Content = display.Content;
+                partialViewResult = Services.FileService.SavePartialView(view, Security.CurrentUser.Id);
+            }
+            else
+            {
+                var fileName = EnsurePartialViewExtension(display.Name);
+                view = new PartialView(fileName);
+                view.Content = display.Content;
+                partialViewResult = Services.FileService.CreatePartialView(view, display.Snippet, Security.CurrentUser.Id);
+            }
+
+            return partialViewResult;
+        }
+
+        private Attempt<IPartialView> CreateOrUpdatePartialViewMacro(CodeFileDisplay display)
+        {
+            Attempt<IPartialView> partialViewMacroResult;
+            var viewMacro = Services.FileService.GetPartialViewMacro(display.VirtualPath);
+            if (viewMacro != null)
+            {
+                viewMacro.Content = display.Content;
+                viewMacro.Path = display.Name;
+                partialViewMacroResult = Services.FileService.SavePartialViewMacro(viewMacro, Security.CurrentUser.Id);
+            }
+            else
+            {
+                var fileName = EnsurePartialViewExtension(display.Name);
+                viewMacro = new PartialView(fileName);
+                viewMacro.Content = display.Content;
+                partialViewMacroResult = Services.FileService.CreatePartialViewMacro(viewMacro, display.Snippet, Security.CurrentUser.Id);
+            }
+
+            return partialViewMacroResult;
+        }
+
+        private string EnsurePartialViewExtension(string value)
+        {
+            if (value.EndsWith(".cshtml") == false)
+                value += ".cshtml";
+
+            return value;
+        }
     }
 }

From 6bf5f4dbdfea1d37c2faa4594627b7739723b9a7 Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Thu, 2 Feb 2017 09:20:42 +0100
Subject: [PATCH 09/15] Fixed up tree menus for scripts, partialviews and
 partialviewmacros

---
 .../Trees/PartialViewMacrosTreeController.cs        | 10 ++++++++++
 src/Umbraco.Web/Trees/PartialViewsTreeController.cs | 10 ++++++++++
 src/Umbraco.Web/Trees/ScriptTreeController.cs       | 13 ++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index 688787e338..61d9c17cef 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -44,6 +44,16 @@ namespace Umbraco.Web.Trees
                 return menu;
             }
 
+            if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false)
+            {
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
+                //refresh action
+                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
+            }
+
             // TODO: Wire up new delete dialog
             menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
             return menu;
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index 3913c41a32..96da9a2e33 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -43,6 +43,16 @@ namespace Umbraco.Web.Trees
                 return menu;
             }
 
+            if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false)
+            {
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
+                //refresh action
+                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
+            }
+
             // TODO: Wire up new delete dialog
             menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
             return menu;
diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs
index 90174b6931..c7d4e728aa 100644
--- a/src/Umbraco.Web/Trees/ScriptTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core;
+using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.IO;
 using umbraco.BusinessLogic.Actions;
 using Umbraco.Web.Models.Trees;
@@ -40,6 +41,16 @@ namespace Umbraco.Web.Trees
                 return menu;
             }
 
+            if (id.EndsWith(FileSearchPattern.TrimStart("*")) == false)
+            {
+                //set the default to create
+                menu.DefaultMenuAlias = ActionNew.Instance.Alias;
+                //create action
+                menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
+                //refresh action
+                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
+            }
+
             // TODO: Wire up new delete dialog
             menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
             return menu;

From c073191f69f952e05568dbdce4b59400fd33b17e Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Thu, 2 Feb 2017 11:47:46 +0100
Subject: [PATCH 10/15] Fixes creation of codefiles in folders

---
 .../src/common/resources/codefile.resource.js |  4 +--
 .../partialviewmacros/edit.controller.js      |  2 +-
 .../src/views/partialviews/edit.controller.js |  2 +-
 .../src/views/scripts/edit.controller.js      |  2 +-
 src/Umbraco.Web/Editors/CodeFileController.cs | 32 ++++++++++++++-----
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
index 859255e887..e83bb4f14e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
@@ -198,12 +198,12 @@ function codefileResource($q, $http, umbDataFormatter, umbRequestHelper) {
          *
          */
 
-        getScaffold: function (type, snippetName) {
+        getScaffold: function (type, id, snippetName) {
             return umbRequestHelper.resourcePromise(
                  $http.get(
                      umbRequestHelper.getApiUrl(
                          "codeFileApiBaseUrl",
-                         "GetScaffold?type=" + type + "&snippetName=" + snippetName)),
+                         "GetScaffold?type=" + type + "&id=" + id + "&snippetName=" + snippetName)),
                 "Failed to get scaffold for" + type);
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
index a02de75b75..4860773b02 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
@@ -236,7 +236,7 @@
                     snippet = $routeParams.snippet;
                 }
 
-                codefileResource.getScaffold("partialViewMacros", snippet).then(function (partialViewMacro) {
+                codefileResource.getScaffold("partialViewMacros", $routeParams.id, snippet).then(function (partialViewMacro) {
                     ready(partialViewMacro);
                 });
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index c763a81902..a493ed30c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -236,7 +236,7 @@
                     snippet = $routeParams.snippet;
                 }
 
-                codefileResource.getScaffold("partialViews", snippet).then(function (partialView) {
+                codefileResource.getScaffold("partialViews", $routeParams.id, snippet).then(function (partialView) {
                     ready(partialView);
                 });
                 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
index 1470833aad..d2a5fcbc0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js
@@ -79,7 +79,7 @@
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css");
 
             if ($routeParams.create) {
-                codefileResource.getScaffold("scripts").then(function(script) {
+                codefileResource.getScaffold("scripts", $routeParams.id).then(function (script) {
                     ready(script);
                 });
             } else {
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 3948c4853c..72e318010e 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Web;
 using System.Web.Http;
 using Umbraco.Core;
 using Umbraco.Core.IO;
@@ -148,9 +149,10 @@ namespace Umbraco.Web.Editors
         /// Used to scaffold the json object for the editors for 'scripts', 'partialViews', 'partialViewMacros'
         /// </summary>
         /// <param name="type">This is a string but will be 'scripts' 'partialViews', 'partialViewMacros'</param>
+        /// <param name="id"></param>
         /// <param name="snippetName"></param>
         /// <returns></returns>
-        public CodeFileDisplay GetScaffold(string type, string snippetName = null)
+        public CodeFileDisplay GetScaffold(string type, string id = null, string snippetName = null)
         {
             if (string.IsNullOrWhiteSpace(type))
             {
@@ -163,23 +165,35 @@ namespace Umbraco.Web.Editors
             {
                 case Core.Constants.Trees.PartialViews:
                     codeFileDisplay = Mapper.Map<IPartialView, CodeFileDisplay>(new PartialView(string.Empty));
+                    codeFileDisplay.VirtualPath = SystemDirectories.PartialViews;
                     if (snippetName.IsNullOrWhiteSpace() == false)
                         codeFileDisplay.Content = Services.FileService.GetPartialViewSnippetContent(snippetName);
                     break;
                 case Core.Constants.Trees.PartialViewMacros:
                     codeFileDisplay = Mapper.Map<IPartialView, CodeFileDisplay>(new PartialView(string.Empty));
+                    codeFileDisplay.VirtualPath = SystemDirectories.MacroPartials;
                     if (snippetName.IsNullOrWhiteSpace() == false)
                         codeFileDisplay.Content = Services.FileService.GetPartialViewMacroSnippetContent(snippetName);
                     break;
                 case Core.Constants.Trees.Scripts:
                     codeFileDisplay = Mapper.Map<Script, CodeFileDisplay>(new Script(string.Empty));
+                    codeFileDisplay.VirtualPath = SystemDirectories.Scripts;
                     break;
                 default:
                     throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Unsupported editortype"));
             }
 
+            // Make sure that the root virtual path ends with '/'
+            codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.EnsureEndsWith("/");
+
+            if (id != Core.Constants.System.Root.ToInvariantString())
+            {
+                codeFileDisplay.VirtualPath += id.TrimStart("/").EnsureEndsWith("/");
+            }
+
+            codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.TrimStart("~");
+            codeFileDisplay.Path = Url.GetTreePathFromFilePath(codeFileDisplay.VirtualPath);
             codeFileDisplay.FileType = type;
-            codeFileDisplay.VirtualPath = "-1";
 
             return codeFileDisplay;
         }
@@ -276,11 +290,11 @@ namespace Umbraco.Web.Editors
                     break;
 
                 case Core.Constants.Trees.Scripts:
+                    var virtualPath = display.VirtualPath;
                     var script = Services.FileService.GetScriptByName(display.VirtualPath);
                     if (script != null)
                     {
                         script.Path = display.Name;
-                        
                         display = Mapper.Map(script, display);
                         display.Path = Url.GetTreePathFromFilePath(script.Path);
                         return display;
@@ -288,7 +302,7 @@ namespace Umbraco.Web.Editors
                     }
                     else
                     {
-                        script = new Script(display.Name);
+                        script = new Script(virtualPath + display.Name);
                     }
 
                     script.Content = display.Content;
@@ -306,7 +320,8 @@ namespace Umbraco.Web.Editors
         private Attempt<IPartialView> CreateOrUpdatePartialView(CodeFileDisplay display)
         {
             Attempt<IPartialView> partialViewResult;
-            var view = Services.FileService.GetPartialView(display.VirtualPath ?? string.Empty);
+            var virtualPath = display.VirtualPath ?? string.Empty;
+            var view = Services.FileService.GetPartialView(virtualPath);
             if (view != null)
             {
                 // might need to find the path
@@ -319,7 +334,7 @@ namespace Umbraco.Web.Editors
             else
             {
                 var fileName = EnsurePartialViewExtension(display.Name);
-                view = new PartialView(fileName);
+                view = new PartialView(virtualPath + fileName);
                 view.Content = display.Content;
                 partialViewResult = Services.FileService.CreatePartialView(view, display.Snippet, Security.CurrentUser.Id);
             }
@@ -330,7 +345,8 @@ namespace Umbraco.Web.Editors
         private Attempt<IPartialView> CreateOrUpdatePartialViewMacro(CodeFileDisplay display)
         {
             Attempt<IPartialView> partialViewMacroResult;
-            var viewMacro = Services.FileService.GetPartialViewMacro(display.VirtualPath);
+            var virtualPath = display.VirtualPath ?? string.Empty;
+            var viewMacro = Services.FileService.GetPartialViewMacro(virtualPath);
             if (viewMacro != null)
             {
                 viewMacro.Content = display.Content;
@@ -340,7 +356,7 @@ namespace Umbraco.Web.Editors
             else
             {
                 var fileName = EnsurePartialViewExtension(display.Name);
-                viewMacro = new PartialView(fileName);
+                viewMacro = new PartialView(virtualPath + fileName);
                 viewMacro.Content = display.Content;
                 partialViewMacroResult = Services.FileService.CreatePartialViewMacro(viewMacro, display.Snippet, Security.CurrentUser.Id);
             }

From de87701c95e57cf8b9cd1a90831a24245b771043 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 2 Feb 2017 14:46:23 +0100
Subject: [PATCH 11/15] remove option to create xml file

---
 .../src/views/scripts/create.controller.js             |  5 ++---
 .../src/views/scripts/create.html                      | 10 ++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index 4e4a317591..8993029c7f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -14,10 +14,9 @@
         vm.showCreateFolder = showCreateFolder;
         vm.createFolder = createFolder;
 
-        function createFile(fileExtension) {
+        function createFile() {
             $location.search('create', null);
-            $location.search('fileExtension', null);
-            $location.path("/settings/scripts/edit/" + node.id).search("create", "true").search("fileExtension", fileExtension);
+            $location.path("/settings/scripts/edit/" + node.id).search("create", "true");
             navigationService.hideMenu();
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 2836d44d2c..a265f28a24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -5,15 +5,9 @@
 
         <ul class="umb-actions umb-actions-child">
             <li>
-                <a href="" umb-auto-focus ng-click="vm.createFile('.js')">
+                <a href="" umb-auto-focus ng-click="vm.createFile()">
                     <i class="large icon-script"></i>
-                    <span class="menu-label">.js file</span>
-                </a>
-            </li>
-            <li>
-                <a href="" ng-click="vm.createFile('.xml')">
-                    <i class="large icon-script"></i>
-                    <span class="menu-label">.xml file</span>
+                    <span class="menu-label">Javascript file</span>
                 </a>
             </li>
             <li>

From 055e209e0bcd7ee536d7e1fa7328aac551f54adf Mon Sep 17 00:00:00 2001
From: Emil Wangaa <emilwangaa@gmail.com>
Date: Fri, 3 Feb 2017 12:06:49 +0100
Subject: [PATCH 12/15] Fixed the path and virtualpath when creating and
 scaffolding codefiles

Ensuring that javascript files are created with the .js extension
---
 src/Umbraco.Web/Editors/CodeFileController.cs | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 72e318010e..bcb6630c0a 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Web;
 using System.Web.Http;
+using ClientDependency.Core;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -14,7 +14,6 @@ using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Web.Trees;
-using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Editors
 {
@@ -159,6 +158,9 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(HttpStatusCode.BadRequest);
             }
 
+            if (id.IsNullOrWhiteSpace())
+                id = string.Empty;
+
             CodeFileDisplay codeFileDisplay;
 
             switch (type)
@@ -186,13 +188,13 @@ namespace Umbraco.Web.Editors
             // Make sure that the root virtual path ends with '/'
             codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.EnsureEndsWith("/");
 
-            if (id != Core.Constants.System.Root.ToInvariantString())
+            if (id.IsNullOrWhiteSpace() == false && id != Core.Constants.System.Root.ToInvariantString())
             {
                 codeFileDisplay.VirtualPath += id.TrimStart("/").EnsureEndsWith("/");
             }
 
             codeFileDisplay.VirtualPath = codeFileDisplay.VirtualPath.TrimStart("~");
-            codeFileDisplay.Path = Url.GetTreePathFromFilePath(codeFileDisplay.VirtualPath);
+            codeFileDisplay.Path = Url.GetTreePathFromFilePath(id);
             codeFileDisplay.FileType = type;
 
             return codeFileDisplay;
@@ -302,7 +304,8 @@ namespace Umbraco.Web.Editors
                     }
                     else
                     {
-                        script = new Script(virtualPath + display.Name);
+                        var fileName = EnsurePartialViewExtension(display.Name, ".js");
+                        script = new Script(virtualPath + fileName);
                     }
 
                     script.Content = display.Content;
@@ -320,7 +323,7 @@ namespace Umbraco.Web.Editors
         private Attempt<IPartialView> CreateOrUpdatePartialView(CodeFileDisplay display)
         {
             Attempt<IPartialView> partialViewResult;
-            var virtualPath = display.VirtualPath ?? string.Empty;
+            string virtualPath = NormalizeVirtualPath(display.VirtualPath, SystemDirectories.PartialViews);
             var view = Services.FileService.GetPartialView(virtualPath);
             if (view != null)
             {
@@ -333,7 +336,7 @@ namespace Umbraco.Web.Editors
             }
             else
             {
-                var fileName = EnsurePartialViewExtension(display.Name);
+                var fileName = EnsurePartialViewExtension(display.Name, ".cshtml");
                 view = new PartialView(virtualPath + fileName);
                 view.Content = display.Content;
                 partialViewResult = Services.FileService.CreatePartialView(view, display.Snippet, Security.CurrentUser.Id);
@@ -342,6 +345,20 @@ namespace Umbraco.Web.Editors
             return partialViewResult;
         }
 
+        private string NormalizeVirtualPath(string virtualPath, string systemDirectory)
+        {
+            if (virtualPath.IsNullOrWhiteSpace())
+                return string.Empty;
+
+            systemDirectory = systemDirectory.TrimStart("~");
+            systemDirectory = systemDirectory.Replace('\\', '/');
+            virtualPath = virtualPath.TrimStart("~");
+            virtualPath = virtualPath.Replace('\\', '/');
+            virtualPath = virtualPath.ReplaceFirst(systemDirectory, string.Empty);
+
+            return virtualPath;
+        }
+
         private Attempt<IPartialView> CreateOrUpdatePartialViewMacro(CodeFileDisplay display)
         {
             Attempt<IPartialView> partialViewMacroResult;
@@ -355,7 +372,7 @@ namespace Umbraco.Web.Editors
             }
             else
             {
-                var fileName = EnsurePartialViewExtension(display.Name);
+                var fileName = EnsurePartialViewExtension(display.Name, ".cshtml");
                 viewMacro = new PartialView(virtualPath + fileName);
                 viewMacro.Content = display.Content;
                 partialViewMacroResult = Services.FileService.CreatePartialViewMacro(viewMacro, display.Snippet, Security.CurrentUser.Id);
@@ -364,10 +381,10 @@ namespace Umbraco.Web.Editors
             return partialViewMacroResult;
         }
 
-        private string EnsurePartialViewExtension(string value)
+        private string EnsurePartialViewExtension(string value, string extension)
         {
-            if (value.EndsWith(".cshtml") == false)
-                value += ".cshtml";
+            if (value.EndsWith(extension) == false)
+                value += extension;
 
             return value;
         }

From 79a103662f5c5087c6a671c7fa4c866ec02fd036 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 7 Feb 2017 16:09:36 +0100
Subject: [PATCH 13/15] remove alerts

---
 .../src/views/partialviewmacros/create.controller.js            | 2 +-
 .../src/views/partialviews/create.controller.js                 | 2 +-
 .../src/views/scripts/create.controller.js                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
index e822c19d09..09348ec5ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -42,7 +42,7 @@
         }
 
         function createFolder() {
-            alert("create folder");
+
         }
         
         function showCreateFromSnippet() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
index 71c5e5d080..549fb2ff74 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
@@ -42,7 +42,7 @@
         }
 
         function createFolder() {
-            alert("create folder");
+
         }
         
         function showCreateFromSnippet() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index 8993029c7f..b2ff9291fb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -25,7 +25,7 @@
         }
 
         function createFolder() {
-            alert("create folder");
+            
         }
 
     }

From c9f99d7f42fee3a4cc6b4b862e691b2f8c921782 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 7 Feb 2017 16:35:33 +0100
Subject: [PATCH 14/15] localise create items

---
 .../src/views/partialviewmacros/create.html                  | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/partialviews/create.html | 4 ++--
 src/Umbraco.Web.UI.Client/src/views/scripts/create.html      | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
index 0c3c0fc385..aa8796ae7a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
@@ -12,13 +12,13 @@
                     <li>
                         <a href="" ng-click="vm.createPartialViewMacro()" umb-auto-focus>
                             <i class="large icon-article"></i>
-                            <span class="menu-label">New Empty Partial View Macro</span>
+                            <span class="menu-label"><localize key="create_newEmptyPartialViewMacro">New empty partial view macro</localize></span>
                         </a>
                     </li>
                     <li>
                         <a href="" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon-article"></i>
-                            <span class="menu-label">New Partial View Macro from Snippet</span>
+                            <span class="menu-label"><localize key="create_newPartialViewMacroFromSnippet">New partial view macro from snippet</localize></span>
                         </a>
                     </li>
                     <li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
index eb8fe4ed2b..fc9bf98c4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
@@ -12,13 +12,13 @@
                     <li>
                         <a href="" ng-click="vm.createPartialView()" umb-auto-focus>
                             <i class="large icon-article"></i>
-                            <span class="menu-label">New Empty Partial View</span>
+                            <span class="menu-label"><localize key="create_newEmptyPartialView">New empty partial view</localize></span>
                         </a>
                     </li>
                     <li>
                         <a href="" ng-click="vm.showCreateFromSnippet()">
                             <i class="large icon-article"></i>
-                            <span class="menu-label">New Partial View from Snippet</span>
+                            <span class="menu-label"><localize key="create_newPartialViewFromSnippet">New partial view from snippet</localize></span>
                         </a>
                     </li>
                     <li>
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index a265f28a24..d57ead3b15 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -1,13 +1,13 @@
 <div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
 
     <div class="umb-pane" ng-if="!vm.creatingFolder">
-        <h5><localize key="create_createUnder">Create new partial view under</localize> {{currentNode.name}}</h5>
+        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
 
         <ul class="umb-actions umb-actions-child">
             <li>
                 <a href="" umb-auto-focus ng-click="vm.createFile()">
                     <i class="large icon-script"></i>
-                    <span class="menu-label">Javascript file</span>
+                    <span class="menu-label"><localize key="create_newJavascriptFile">New javascript file</localize></span>
                 </a>
             </li>
             <li>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 444ecc2e3d..f6823e766f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -197,6 +197,11 @@
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New javascript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newEmptyPartialViewMacro">New empty partial view macro</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>

From dc980bd78e9fd491cf313bce849edab198f608e7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 7 Feb 2017 16:41:01 +0100
Subject: [PATCH 15/15] remove null

---
 .../src/views/partialviewmacros/create.controller.js            | 2 --
 .../src/views/partialviews/create.controller.js                 | 2 --
 .../src/views/scripts/create.controller.js                      | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
index 09348ec5ef..3b3fb0f9f5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
@@ -30,8 +30,6 @@
                 snippet = selectedSnippet.fileName;
             }
 
-            $location.search('create', null);
-            $location.search('snippet', null);
             $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet);
             navigationService.hideMenu();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
index 549fb2ff74..5aeaa28935 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js
@@ -30,8 +30,6 @@
                 snippet = selectedSnippet.fileName;
             }
 
-            $location.search('create', null);
-            $location.search('snippet', null);
             $location.path("/settings/partialviews/edit/" + node.id).search("create", "true").search("snippet", snippet);
             navigationService.hideMenu();
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index b2ff9291fb..1729693d83 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -15,7 +15,6 @@
         vm.createFolder = createFolder;
 
         function createFile() {
-            $location.search('create', null);
             $location.path("/settings/scripts/edit/" + node.id).search("create", "true");
             navigationService.hideMenu();
         }