From 231c50319f681bad0e430bada4c3a616d60ce8b8 Mon Sep 17 00:00:00 2001
From: per ploug <pph@umbraco.dk>
Date: Wed, 13 Aug 2014 10:04:54 +0200
Subject: [PATCH] Fixed: U4-5343 Move grid.config out of Umbraco folder

---
 .../src/common/services/grid.service.js       |  5 +-
 .../grid/config/grid.editors.config.js        | 46 -------------------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  1 +
 .../config/grid.editors.config.js             | 46 +++++++++++++++++++
 4 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
 create mode 100644 src/Umbraco.Web.UI/config/grid.editors.config.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js b/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js
index 19462c8da1..1eea5fbc7d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/grid.service.js
@@ -1,9 +1,8 @@
 angular.module('umbraco.services')
 	.factory('gridService', function ($http, $q){
 
-		var configPath = "views/propertyeditors/grid/config/grid.editors.config.js";
-
-		var service = {
+		var configPath = "../config/grid.editors.config.js";
+        var service = {
 			getGridEditors: function () {
 				return $http.get(configPath);
 			}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
deleted file mode 100644
index deb0c1ec96..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-	{
-		"name": "Headline",
-		"alias": "headline",
-		"view": "textstring",
-		"icon": "icon-coin",
-		"config": {
-			"style": "font-size: 36px; font-weight: bold",
-			"markup" : "<h1>#value#</h1>"
-		}
-	},
-	{
-		"name": "Quote",
-		"alias": "quote",
-		"view": "textstring",
-		"icon": "icon-quote",
-		"config": {
-		    "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
-		    "markup": "<blockquote>#value#</blockquote>"
-		}
-	},
-	{
-		"name": "Rich text editor",
-		"alias": "rte",
-		"view": "rte",
-		"icon": "icon-article"
-	},
-	{
-		"name": "Media",
-		"alias": "media",
-		"view": "media",
-		"icon": "icon-picture"
-	},
-	{
-		"name": "Macro",
-		"alias": "macro",
-		"view": "macro",
-		"icon": "icon-settings-alt"
-	},
-	{
-		"name": "Embed",
-		"alias": "embed",
-		"view": "embed",
-		"icon": "icon-movie-alt"
-	}
-]
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index adace1a736..dc20541fc8 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -535,6 +535,7 @@
     <Compile Include="Umbraco\TreeInit.aspx.designer.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
     </Compile>
+    <Content Include="Config\grid.editors.config.js" />
     <Content Include="Umbraco\Install\Legacy\loadStarterKits.ascx" />
     <Content Include="Umbraco\ClientRedirect.aspx" />
     <Content Include="Umbraco\create.aspx" />
diff --git a/src/Umbraco.Web.UI/config/grid.editors.config.js b/src/Umbraco.Web.UI/config/grid.editors.config.js
new file mode 100644
index 0000000000..c624ec5c9e
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/grid.editors.config.js
@@ -0,0 +1,46 @@
+[
+	{
+	    "name": "Rich text editor",
+	    "alias": "rte",
+	    "view": "rte",
+	    "icon": "icon-article"
+	},
+	{
+	    "name": "Media",
+	    "alias": "media",
+	    "view": "media",
+	    "icon": "icon-picture"
+	},
+	{
+	    "name": "Macro",
+	    "alias": "macro",
+	    "view": "macro",
+	    "icon": "icon-settings-alt"
+	},
+	{
+	    "name": "Embed",
+	    "alias": "embed",
+	    "view": "embed",
+	    "icon": "icon-movie-alt"
+	},
+    {
+        "name": "Headline",
+        "alias": "headline",
+        "view": "textstring",
+        "icon": "icon-coin",
+        "config": {
+            "style": "font-size: 36px; font-weight: bold",
+            "markup": "<h1>#value#</h1>"
+        }
+    },
+	{
+	    "name": "Quote",
+	    "alias": "quote",
+	    "view": "textstring",
+	    "icon": "icon-quote",
+	    "config": {
+	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+	        "markup": "<blockquote>#value#</blockquote>"
+	    }
+	}
+]
\ No newline at end of file