Merge branch 'preview-view-path' into develop

mattbrailsford · mattbrailsford · commit 84d389f34c57 · 2015-04-01T19:24:54.000+01:00
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Extensions/ViewEnginesCollectionExtensions.cs b/Src/Our.Umbraco.DocTypeGridEditor/Extensions/ViewEnginesCollectionExtensions.cs
@@ -0,0 +1,22 @@
+﻿using System.Web.Mvc;
+using Umbraco.Core.Logging;
+
+namespace Our.Umbraco.DocTypeGridEditor.Extensions
+{
+    internal static class ViewEnginesCollectionExtensions
+    {
+        public static bool ViewExists(this ViewEngineCollection viewEngines, 
+            ControllerContext controllerContext,
+            string viewName, bool isPartial = false)
+        {
+            var result = !isPartial
+                ? viewEngines.FindView(controllerContext, viewName, null)
+                : viewEngines.FindPartialView(controllerContext, viewName);
+            if (result.View != null)
+                return true;
+
+            LogHelper.Warn<Bootstrap>("No view file found with the name " + viewName);
+            return false;
+        }
+    }
+}
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj b/Src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj
@@ -190,6 +190,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrap.cs" />
+    <Compile Include="Extensions\ViewEnginesCollectionExtensions.cs" />
     <Compile Include="Helpers\DocTypeGridEditorHelper.cs" />
     <Compile Include="Helpers\XmlHelper.cs" />
     <Compile Include="Models\DetachedPublishedContent.cs" />
@@ -230,9 +231,9 @@
   <PropertyGroup>
     <PostBuildEvent>IF %25ComputerName%25 == MBP13-PC-BC (
   IF NOT "$(SolutionDir)" == "*Undefined*" (
-    xcopy /s /y "$(TargetPath)" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoCms.7.2.2\bin"
-    xcopy /s /y "$(TargetDir)$(ProjectName).pdb" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoCms.7.2.2\bin"
-    xcopy /s /y "$(ProjectDir)Web\UI\*.*" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoCms.7.2.2"
+    xcopy /s /y "$(TargetPath)" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoUHangoutDemo\bin"
+    xcopy /s /y "$(TargetDir)$(ProjectName).pdb" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoUHangoutDemo\bin"
+    xcopy /s /y "$(ProjectDir)Web\UI\*.*" "C:\Users\Matt\Work\Sandbox\Umbraco\UmbracoUHangoutDemo"
   )
 )</PostBuildEvent>
   </PropertyGroup>
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorSurfaceController.cs b/Src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorSurfaceController.cs
@@ -1,5 +1,5 @@
 ﻿using System.Web.Mvc;
-using Umbraco.Core.Logging;
+using Our.Umbraco.DocTypeGridEditor.Extensions;
 using Umbraco.Core.Models;
 using Umbraco.Web.Mvc;
 
@@ -21,16 +21,36 @@ public string ViewPath
             get { return ControllerContext.RouteData.Values["dtgeViewPath"] as string ?? string.Empty; }
         }
 
+        public string PreviewViewPath
+        {
+            get { return ControllerContext.RouteData.Values["dtgePreviewViewPath"] as string ?? string.Empty; }
+        }
+
+        public bool IsPreview
+        {
+            get { return Request.QueryString["dtgePreview"] == "1"; }
+        }
+
         protected ActionResult CurrentPartialView(object model = null)
         {
             if (model == null)
                 model = Model;
 
             var viewName = ControllerContext.RouteData.Values["action"].ToString();
-            var viewPath = GetFullViewPath(viewName);
 
-            if (ViewExists(viewPath, true))
-                return base.PartialView(viewPath, model);
+            if (IsPreview && !string.IsNullOrWhiteSpace(PreviewViewPath))
+            {
+                var previewViewPath = GetFullViewPath(viewName, PreviewViewPath);
+                if (ViewEngines.Engines.ViewExists(ControllerContext, previewViewPath, true))
+                    return base.PartialView(previewViewPath, model);
+            }
+
+            if (!string.IsNullOrWhiteSpace(ViewPath))
+            {
+                var viewPath = GetFullViewPath(viewName, ViewPath);
+                if (ViewEngines.Engines.ViewExists(ControllerContext, viewPath, true))
+                    return base.PartialView(viewPath, model);
+            }
 
             return HttpNotFound();
         }
@@ -42,31 +62,33 @@ protected ActionResult CurrentPartialView(object model = null)
 
         protected override PartialViewResult PartialView(string viewName, object model)
         {
-            var viewPath = GetFullViewPath(viewName);
-            return base.PartialView(viewPath, model);
+            if (IsPreview && !string.IsNullOrWhiteSpace(PreviewViewPath))
+            {
+                var previewViewPath = GetFullViewPath(viewName, PreviewViewPath);
+                if (ViewEngines.Engines.ViewExists(ControllerContext, previewViewPath, true))
+                    return base.PartialView(previewViewPath, model);
+            }
+
+            if (!string.IsNullOrWhiteSpace(ViewPath))
+            {
+                var viewPath = GetFullViewPath(viewName, ViewPath);
+                if (ViewEngines.Engines.ViewExists(ControllerContext, viewPath, true))
+                    return base.PartialView(viewPath, model);
+            }
+
+            return base.PartialView(viewName, model);
         }
 
-        protected string GetFullViewPath(string viewName)
+        protected string GetFullViewPath(string viewName, string baseViewPath)
         {
             if (viewName.StartsWith("~") || viewName.StartsWith("/")
-                || viewName.StartsWith(".") || string.IsNullOrWhiteSpace(ViewPath))
+                || viewName.StartsWith(".") || string.IsNullOrWhiteSpace(baseViewPath))
             {
                 return viewName;
             }
 
-            return ViewPath.TrimEnd('/') + "/" + viewName + ".cshtml";
-        }
-
-        protected bool ViewExists(string viewName, bool isPartial = false)
-        {
-            var result = !isPartial
-                ? ViewEngines.Engines.FindView(ControllerContext, viewName, null)
-                : ViewEngines.Engines.FindPartialView(ControllerContext, viewName);
-            if (result.View != null)
-                return true;
-
-            LogHelper.Warn<DocTypeGridEditorSurfaceController>("No view file found with the name " + viewName);
-            return false;
+            return baseViewPath.TrimEnd('/') + "/" + viewName + ".cshtml";
         }
+        
     }
 }
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/Extensions/HtmlHelperExtensions.cs b/Src/Our.Umbraco.DocTypeGridEditor/Web/Extensions/HtmlHelperExtensions.cs
@@ -1,57 +1,65 @@
 ﻿using System.Web;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
-using Our.Umbraco.DocTypeGridEditor.Helpers;
+using Our.Umbraco.DocTypeGridEditor.Extensions;
 using Umbraco.Core.Models;
 using Umbraco.Web;
 
 namespace Our.Umbraco.DocTypeGridEditor.Web.Extensions
 {
     public static class HtmlHelperExtensions
     {
-        public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
-            string id,
-            string docType,
-            string value,
-            string viewPath = "",
-            string actionName = "",
-            object model = null)
-        {
-            var content = DocTypeGridEditorHelper.ConvertValueToContent(id, docType, value);
-            return helper.RenderDocTypeGridEditorItem(content, viewPath, actionName, model);
-        }
-
         public static HtmlString RenderDocTypeGridEditorItem(this HtmlHelper helper,
             IPublishedContent content,
             string viewPath = "",
-            string actionName = "",
-            object model = null)
-        {
-            
-            if (content == null)
+            string previewViewPath = "")
+        { 
+            if (content == null) 
                 return new HtmlString(string.Empty);
 
-            var controllerName = content.DocumentTypeAlias + "Surface";
+            var controllerName = content.DocumentTypeAlias + "Surface"; 
 
-            if (!string.IsNullOrWhiteSpace(viewPath))
+            if (!string.IsNullOrWhiteSpace(viewPath)) 
                 viewPath = viewPath.TrimEnd('/') + "/";
 
-            if (string.IsNullOrWhiteSpace(actionName))
-                actionName = content.DocumentTypeAlias;
+            if (!string.IsNullOrWhiteSpace(previewViewPath))
+                previewViewPath = previewViewPath.TrimEnd('/') + "/";
+
+            var actionName = content.DocumentTypeAlias;
 
             var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
             if (umbracoHelper.SurfaceControllerExists(controllerName, actionName, true))
             {
                 return helper.Action(actionName, controllerName, new
                 {
-                    dtgeModel = model ?? content,
-                    dtgeViewPath = viewPath
+                    dtgeModel = content,
+                    dtgeViewPath = viewPath,
+                    dtgePreviewViewPath = previewViewPath
                 });
             }
 
+            // Check for preview view 
+            if (!string.IsNullOrWhiteSpace(previewViewPath)
+                && helper.ViewContext.RequestContext.HttpContext.Request.QueryString["dtgePreview"] == "1")
+            {
+                var fullPreviewViewPath = previewViewPath + content.DocumentTypeAlias + ".cshtml";
+                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullPreviewViewPath, true))
+                {
+                    return helper.Partial(fullPreviewViewPath, content);
+                }
+            }
+
+            // Check for view path view
             if (!string.IsNullOrWhiteSpace(viewPath))
-                return helper.Partial(viewPath + content.DocumentTypeAlias + ".cshtml", content);
+            {
+                var fullViewPath = viewPath + content.DocumentTypeAlias + ".cshtml";
+                if (ViewEngines.Engines.ViewExists(helper.ViewContext, fullViewPath, true))
+                {
+                    return helper.Partial(fullViewPath, content);
+                }
+            }
 
+            // Resort to standard partial view
             return helper.Partial(content.DocumentTypeAlias, content);
         }
     }
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js
@@ -7,6 +7,9 @@
 	"config": {
 	    "allowedDocTypes": [],
         "enablePreview": true,
-        "viewPath": "/Views/Partials/"
+        "viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
+        "previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
+        "previewCssFilePath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/Css/dtge.css",
+        "previewJsFilePath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/Js/dtge.js"
 	}
 }
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js
@@ -4,10 +4,11 @@
     "$rootScope",
     "$timeout",
     "$routeParams",
+    'assetsService',
     "Our.Umbraco.DocTypeGridEditor.Services.DocTypeDialogService",
     "Our.Umbraco.DocTypeGridEditor.Resources.DocTypeGridEditorResources",
 
-    function ($scope, $rootScope, $timeout, $routeParams, dtgeDialogService, dtgeResources) {
+    function ($scope, $rootScope, $timeout, $routeParams, assetsService, dtgeDialogService, dtgeResources) {
 
         $scope.title = "Click to insert item";
         $scope.icon = "icon-item-arrangement";
@@ -49,7 +50,7 @@
         $scope.setPreview = function (model) {
             if ("enablePreview" in $scope.control.editor.config && $scope.control.editor.config.enablePreview) {
                 var nodeId = $routeParams.id;
-                dtgeResources.getEditorMarkupForDocTypePartial(nodeId, model.id, model.docType, model.value, $scope.control.editor.config.viewPath)
+                dtgeResources.getEditorMarkupForDocTypePartial(nodeId, model.id, model.docType, model.value, $scope.control.editor.config.viewPath, $scope.control.editor.config.previewViewPath)
                     .success(function(htmlResult) {
                         if (htmlResult.trim().length > 0) {
                             $scope.preview = htmlResult;
@@ -64,6 +65,18 @@
             value: {}
         });
 
+        // Load preview css / js files
+        if ("enablePreview" in $scope.control.editor.config && $scope.control.editor.config.enablePreview)
+        {
+            if ("previewCssFilePath" in $scope.control.editor.config && $scope.control.editor.config.previewCssFilePath) {
+                assetsService.loadCss($scope.control.editor.config.previewCssFilePath, $scope);
+            };
+
+            if ("previewJsFilePath" in $scope.control.editor.config && $scope.control.editor.config.previewJsFilePath) {
+                assetsService.loadJs($scope.control.editor.config.previewJsFilePath, $scope);
+            }
+        }
+
         $timeout(function () {
             if ($scope.control.$initializing) {
                 $scope.setDocType();
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.resources.js b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.resources.js
@@ -34,7 +34,7 @@
                     'Failed to retrieve datatypes'
                 );
             },
-            getEditorMarkupForDocTypePartial: function (nodeId, id, docType, value, viewPath) {
+            getEditorMarkupForDocTypePartial: function (nodeId, id, docType, value, viewPath, previewViewPath) {
                 var url = "/" + nodeId +"?dtgePreview=1";
                 return $http({
                     method: 'POST',
@@ -43,7 +43,8 @@
                         id: id,
                         docType: docType,
                         value: JSON.stringify(value),
-                        viewPath: viewPath
+                        viewPath: viewPath,
+                        previewViewPath: previewViewPath
                     }),
                     headers: {
                         'Content-Type': 'application/x-www-form-urlencoded'
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml
@@ -1,4 +1,5 @@
-﻿@using System.Web.Mvc.Html
+﻿@using System.Web.Mvc
+@using System.Web.Mvc.Html
 @using Our.Umbraco.DocTypeGridEditor.Helpers
 @using Our.Umbraco.DocTypeGridEditor.Web.Extensions
 @inherits Umbraco.Web.Mvc.UmbracoViewPage<dynamic>
@@ -8,8 +9,9 @@
     string docType = Model.value.docType.ToString();
     string value = Model.value.value.ToString();
     string viewPath = Model.editor.config.viewPath.ToString();
+    string previewViewPath = Model.editor.config.previewViewPath.ToString();
     
     var content = DocTypeGridEditorHelper.ConvertValueToContent(id, docType, value);
-    
-    @Html.RenderDocTypeGridEditorItem(content, viewPath)
+
+    @Html.RenderDocTypeGridEditorItem(content, viewPath, previewViewPath)
 }         
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditorPreviewer.cshtml b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditorPreviewer.cshtml
@@ -8,7 +8,9 @@
     var docType = Request.Form["docType"];
     var value = Request.Unvalidated.Form["value"];
     var viewPath = Request.Form["viewPath"];
+    var previewViewPath = Request.Form["previewViewPath"];
+    
     var content = DocTypeGridEditorHelper.ConvertValueToContent(id, docType, value);
     
-    @Html.RenderDocTypeGridEditorItem(content, viewPath)
+    @Html.RenderDocTypeGridEditorItem(content, viewPath, previewViewPath)
 }
diff --git a/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html b/Src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html
@@ -1,6 +1,8 @@
 ﻿<div ng-controller="Our.Umbraco.DocTypeGridEditor.GridEditors.DocTypeGridEditor">
 
-  <div class="usky-editor-placeholder" ng-click="setDocType()">
+    <div class="usky-editor-placeholder dtge-editor-placeholder" 
+         ng-click="setDocType()"
+         ng-class="{ 'dtge-editor-placeholder--preview' : preview }">
     <div ng-if="!preview">
       <i class="icon {{icon}}"></i>
       <div class="help-text">{{title}}</div>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`"config": {`
`8`	`8`	`"allowedDocTypes": [],`
`9`	`9`	`"enablePreview": true,`
`10`		`- "viewPath": "/Views/Partials/"`
	`10`	`+ "viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",`
	`11`	`+ "previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",`
	`12`	`+ "previewCssFilePath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/Css/dtge.css",`
	`13`	`+ "previewJsFilePath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/Js/dtge.js"`
`11`	`14`	`}`
`12`	`15`	`}`