-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{control.macro.macroAlias}}
+
+
+
+
+
+
+
+
+
+
+ Start writing here...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
new file mode 100644
index 0000000000..359e33d5a6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -0,0 +1,36 @@
+angular.module("umbraco")
+ .controller("Umbraco.PropertyEditors.GridPrevalueEditorController",
+ function ($scope, $http, assetsService, $rootScope, dialogService, mediaResource, imageHelper, $timeout) {
+
+ var emptyModel = {
+ enableGridWidth: true,
+ defaultGridWith: "",
+ enableBackground: true,
+ enableSkipTopMargin: true,
+ defaultSkipTopMargin: false,
+ enableSkipBottomMargin: true,
+ defaultSkipBottomMargin: false,
+ enableSkipLeftMargin: true,
+ defaultSkipLeftMargin: false,
+ enableSkipRightMargin: true,
+ defaultSkipRightMargin: false,
+ enableSkipControlMargin: true,
+ defaultSkipControlMargin: false,
+ enableFullScreen: true,
+ defaultFullScreen: false,
+ enableBoxed: true,
+ defaultBoxed: false,
+ enableRte: true,
+ enableMedia: true,
+ enableMacro: true,
+ enableMultiCells: true,
+ approvedBackgroundCss: "views/propertyeditors/grid/config/grid.default.backgrounds.css",
+ gridConfigPath: "views/propertyeditors/grid/config/grid.default.config.js"
+ }
+
+ /* init grid data */
+ if (!$scope.model.value || $scope.model.value == "") {
+ $scope.model.value = emptyModel;
+ }
+
+ })
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
new file mode 100644
index 0000000000..4961001dbc
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -0,0 +1,122 @@
+
+
+
Config file path:
+
+
+
Grid width:
+
+
+
Allowed row settings:
+
+
+
Allowed controls:
+
+
+
Others settings:
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/iframe.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/iframe.html
deleted file mode 100644
index 72323897ce..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/iframe.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Rich Text editor
-
-
-
-
-
- Insert macro
-
-
-
-
-
-
-
- Insert Macro
-
-
-
-
-
- Insert image
-
-
-
-
-
- Insert image
-
-
-
-
-
-
-
- Rich Text editor
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/js/iframe.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/js/iframe.js
deleted file mode 100644
index 6c04107940..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/js/iframe.js
+++ /dev/null
@@ -1,19 +0,0 @@
-$(function(){
- var editors = $('[data-editor]');
- var p = parent.$(parent.document);
-
-
- editors.addClass("editor");
-
- editors.on("click", function (event) {
- event.preventDefault();
-
- // parent.document.fire("umbraco.grid.click");
- var el = this;
- var e = jQuery.Event("umbraco.grid.click", {editor: $(el).data("editor"), element: el});
- p.trigger( e );
- });
-});
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/template/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/template/edit.controller.js
new file mode 100644
index 0000000000..4079beb6a5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/template/edit.controller.js
@@ -0,0 +1,53 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.Template.EditController
+ * @function
+ *
+ * @description
+ * The controller for editing templates
+ */
+function TemplateEditController($scope, $http, assetsService, templateResource, $routeParams, $log) {
+
+ $scope.pageId = 1069;
+
+ $scope.rendering = false;
+ $scope.aceLoaded = function(_editor) {
+ // Options
+ };
+
+ var render = _.throttle(function(){
+ templateResource.saveAndRender($scope.template.content, $scope.template.id, $scope.pageId).then(
+ function(response){
+ var iframe = document.getElementById('mockingbird');
+ iframe = (iframe.contentWindow) ? iframe.contentWindow : (iframe.contentDocument.document) ? iframe.contentDocument.document : iframe.contentDocument;
+ iframe.document.open();
+ iframe.document.write(response);
+ iframe.document.close();
+ $scope.rendering = false;
+ },
+ function(response){
+ $log.log(response);
+ $scope.rendering = false;
+ }
+ );
+
+ }, 1000);
+
+ $scope.aceChanged = function(e) {
+ if(!$scope.rendering){
+ $scope.rendering = true;
+ render();
+ }
+ };
+
+
+ templateResource.getById($routeParams.id).then(function(template){
+ $scope.template = template;
+ if(!$scope.rendering){
+ $scope.rendering = true;
+ render();
+ }
+ });
+}
+
+angular.module("umbraco").controller("Umbraco.Editors.Template.EditController", TemplateEditController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/template/edit.html b/src/Umbraco.Web.UI.Client/src/views/template/edit.html
new file mode 100644
index 0000000000..d9b1adc277
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/template/edit.html
@@ -0,0 +1,26 @@
+
+
+
+
+ {{template.name}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
deleted file mode 100644
index fdad44e4b1..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @ngdoc controller
- * @name Umbraco.Editors.Settings.Template.EditController
- * @function
- *
- * @description
- * The controller for editing templates
- */
-function TemplateEditController($scope, navigationService) {
- $scope.template = "
Hej
";
-}
-
-angular.module("umbraco").controller("Umbraco.Editors.Settings.Template.EditController", TemplateEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
deleted file mode 100644
index 71d6f60809..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index d7d5786246..ee11484bf6 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -7,7 +7,7 @@ module.exports = function(karma) {
// list of files / patterns to load in the browser
files: [
- 'lib/jquery/jquery-2.0.3.min.js',
+ 'lib/jquery/dist/jquery.min.js',
'lib/angular/1.1.5/angular.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mocks.js',
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 9778e9daf9..561ea91706 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -185,6 +185,10 @@ namespace Umbraco.Web.Editors
{
"stylesheetApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl
(
controller => controller.GetAll())
+ },
+ {
+ "templateApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl(
+ controller => controller.GetById(0))
},
{
"memberTypeApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl(
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
new file mode 100644
index 0000000000..2906441203
--- /dev/null
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -0,0 +1,117 @@
+using AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+
+namespace Umbraco.Web.Editors
+{
+ [PluginController("UmbracoApi")]
+ [UmbracoApplicationAuthorize(Core.Constants.Applications.Settings)]
+ public class TemplateController : UmbracoAuthorizedJsonController
+ {
+ ///
+ /// Gets the content json for the content id
+ ///
+ ///
+ ///
+ public TemplateDisplay GetById(int id)
+ {
+ var template = Services.FileService.GetTemplate(id);
+ if (template == null)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+
+ TemplateDisplay t = new TemplateDisplay();
+ t.Alias = template.Alias;
+ t.Content = template.Content;
+ t.Id = template.Id;
+ t.Name = template.Name;
+
+ return t;
+ }
+
+ ///
+ /// Deletes a data type wth a given ID
+ ///
+ ///
+ ///
+ [HttpDelete]
+ [HttpPost]
+ public HttpResponseMessage DeleteById(int id)
+ {
+ var foundTemplate = Services.FileService.GetTemplate(id);
+ if (foundTemplate == null)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+ Services.FileService.DeleteTemplate(foundTemplate.Alias);
+ return Request.CreateResponse(HttpStatusCode.OK);
+ }
+
+ [HttpPost]
+ public HttpResponseMessage PostSaveAndRender(dynamic model)
+ {
+ var foundTemplate = Services.FileService.GetTemplate((int)model.templateId);
+ if (foundTemplate == null)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+ foundTemplate.Content = model.html;
+ Services.FileService.SaveTemplate(foundTemplate);
+
+ string result = string.Empty;
+ try
+ {
+ var url = "http://" + Request.RequestUri.Host + "/" + model.pageId + ".aspx?altTemplate=" + foundTemplate.Alias;
+ result = url;
+
+ WebClient wc = new WebClient();
+ result = wc.DownloadString(new Uri(url));
+ }
+ catch (WebException exception)
+ {
+ if (exception.Response != null)
+ {
+ var responseStream = exception.Response.GetResponseStream();
+
+ if (responseStream != null)
+ {
+ using (var reader = new StreamReader(responseStream))
+ {
+ result = reader.ReadToEnd();
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ result += ex.ToString();
+ }
+
+
+ return new HttpResponseMessage()
+ {
+ Content = new StringContent(
+ result,
+ Encoding.UTF8,
+ "text/html"
+ )
+ };
+ }
+
+
+
+ }
+}
diff --git a/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
new file mode 100644
index 0000000000..5291b9cca3
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+ [DataContract(Name = "template", Namespace = "")]
+ public class TemplateDisplay : EntityBasic
+ {
+ [DataMember(Name = "content")]
+ public string Content { get; set; }
+ }
+}
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
new file mode 100644
index 0000000000..7a278a1a63
--- /dev/null
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+ [PropertyEditor(Core.Constants.PropertyEditors.GridAlias, "Grid", "grid", HideLabel=true, IsParameterEditor = false, ValueType="JSON")]
+ public class GridPropertyEditor : PropertyEditor
+ {
+ ///
+ /// Overridden to ensure that the value is validated
+ ///
+ ///
+ protected override PropertyValueEditor CreateValueEditor()
+ {
+ var editor = base.CreateValueEditor();
+
+ return editor;
+ }
+
+ protected override PreValueEditor CreatePreValueEditor()
+ {
+ return new gridPreValueEditor();
+ }
+
+ }
+
+ internal class gridPreValueEditor : PreValueEditor
+ {
+ [PreValueField("items", "Grid Configuration", "views/propertyeditors/grid/grid.prevalues.html", Description = "General grid configuration")]
+ public string Items { get; set; }
+ }
+}
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
new file mode 100644
index 0000000000..f9ebaaf2d6
--- /dev/null
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.IO;
+using Umbraco.Web.Models.Trees;
+
+namespace Umbraco.Web.Trees
+{
+ public abstract class FileSystemTreeController : TreeController
+ {
+ protected abstract string FilePath { get; }
+ protected abstract string FileSearchPattern { get; }
+
+ ///
+ /// Inheritors can override this method to modify the file node that is created.
+ ///
+ ///
+ protected virtual void OnRenderFileNode(ref TreeNode treeNode) { }
+
+ ///
+ /// Inheritors can override this method to modify the folder node that is created.
+ ///
+ ///
+ protected virtual void OnRenderFolderNode(ref TreeNode treeNode) { }
+
+ protected override Models.Trees.TreeNodeCollection GetTreeNodes(string id, System.Net.Http.Formatting.FormDataCollection queryStrings)
+ {
+ string orgPath = "";
+ string path = "";
+ if (!string.IsNullOrEmpty(id) && id != "-1")
+ {
+ orgPath = id;
+ path = IOHelper.MapPath(FilePath + "/" + orgPath);
+ orgPath += "/";
+ }
+ else
+ {
+ path = IOHelper.MapPath(FilePath);
+ }
+
+ DirectoryInfo dirInfo = new DirectoryInfo(path);
+ DirectoryInfo[] dirInfos = dirInfo.GetDirectories();
+
+ var nodes = new TreeNodeCollection();
+ foreach (DirectoryInfo dir in dirInfos)
+ {
+ if ((dir.Attributes & FileAttributes.Hidden) == 0)
+ {
+ var HasChildren = dir.GetFiles().Length > 0 || dir.GetDirectories().Length > 0;
+ var node = CreateTreeNode(orgPath + dir.Name, orgPath, queryStrings, dir.Name, "icon-folder", HasChildren);
+
+ OnRenderFolderNode(ref node);
+ if(node != null)
+ nodes.Add(node);
+ }
+ }
+
+ //this is a hack to enable file system tree to support multiple file extension look-up
+ //so the pattern both support *.* *.xml and xml,js,vb for lookups
+ string[] allowedExtensions = new string[0];
+ bool filterByMultipleExtensions = FileSearchPattern.Contains(",");
+ FileInfo[] fileInfo;
+
+ if (filterByMultipleExtensions)
+ {
+ fileInfo = dirInfo.GetFiles();
+ allowedExtensions = FileSearchPattern.ToLower().Split(',');
+ }
+ else
+ fileInfo = dirInfo.GetFiles(FileSearchPattern);
+
+ foreach (FileInfo file in fileInfo)
+ {
+ if ((file.Attributes & FileAttributes.Hidden) == 0)
+ {
+ if (filterByMultipleExtensions && Array.IndexOf(allowedExtensions, file.Extension.ToLower().Trim('.')) < 0)
+ continue;
+
+ var node = CreateTreeNode(orgPath + file.Name, orgPath, queryStrings, file.Name, "icon-file", false);
+
+ OnRenderFileNode(ref node);
+
+ if(node != null)
+ nodes.Add(node);
+ }
+ }
+
+ return nodes;
+ }
+ }
+}
diff --git a/src/Umbraco.Web/Trees/TemplateTreeController.cs b/src/Umbraco.Web/Trees/TemplateTreeController.cs
new file mode 100644
index 0000000000..751085ebce
--- /dev/null
+++ b/src/Umbraco.Web/Trees/TemplateTreeController.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using umbraco.cms.presentation.Trees;
+using Constants = Umbraco.Core.Constants;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Web.Mvc;
+using umbraco.cms.businesslogic.template;
+using Umbraco.Web.Models.Trees;
+
+namespace Umbraco.Web.Trees
+{
+ [UmbracoApplicationAuthorize(Constants.Applications.Settings)]
+ [Tree(Constants.Applications.Settings, Constants.Trees.Templates, "Templates")]
+ [PluginController("UmbracoTrees")]
+ [CoreTree]
+ public class TemplateTreeController : TreeController
+ {
+ protected override Models.Trees.MenuItemCollection GetMenuForNode(string id, System.Net.Http.Formatting.FormDataCollection queryStrings)
+ {
+ return new Models.Trees.MenuItemCollection();
+ }
+
+ protected override Models.Trees.TreeNodeCollection GetTreeNodes(string id, System.Net.Http.Formatting.FormDataCollection queryStrings)
+ {
+ IEnumerable templates;
+ var nodes = new TreeNodeCollection();
+
+
+ if (id == "-1")
+ templates = Services.EntityService.GetRootEntities(Core.Models.UmbracoObjectTypes.Template);
+ else
+ templates = Services.EntityService.GetChildren(int.Parse(id), Core.Models.UmbracoObjectTypes.Template);
+
+ foreach (var t in templates)
+ {
+ var node = CreateTreeNode(t.Id.ToString(), t.ParentId.ToString(), queryStrings, t.Name);
+ node.Icon = "icon-newspaper-alt";
+ node.HasChildren = Services.EntityService.GetChildren(t.Id, Core.Models.UmbracoObjectTypes.Template).Any();
+
+ if (node.HasChildren)
+ node.Icon = "icon-newspaper";
+
+ nodes.Add(node);
+ }
+
+ return nodes;
+ }
+ }
+}
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index f301ad8fde..943f10065b 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -1,5 +1,5 @@
[
- 'lib/jquery/jquery-2.0.3.min.js',
+ 'lib/jquery/dist/jquery.min.js',
'lib/angular/1.1.5/angular.min.js',
'lib/underscore/underscore.js',
@@ -10,7 +10,8 @@
'lib/angular/1.1.5/angular-sanitize.min.js',
'lib/angular/angular-ui-sortable.js',
-
+ 'lib/ace-builds/src-min-noconflict/ace.js',
+
'lib/jquery/jquery.upload/js/jquery.fileupload.js',
'lib/jquery/jquery.upload/js/load-image.min.js',
'lib/jquery/jquery.upload/js/jquery.fileupload-process.js',
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c17b9f1c56..54663cfb50 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -306,8 +306,10 @@
+
+
@@ -356,6 +358,7 @@
+
@@ -470,11 +473,13 @@
+
+
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
index 4b44883d21..c41cf5560b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
@@ -32,7 +32,7 @@ using umbraco.BusinessLogic.Actions;
namespace umbraco
{
- [Tree(Constants.Applications.Settings, "templates", "Templates", sortOrder: 1)]
+ /* [Tree(Constants.Applications.Settings, "templates", "Templates", sortOrder: 1)]*/
public class loadTemplates : BaseTree
{
public loadTemplates(string application) : base(application) {}