From 05c38db54c0fc798536fb258b6795966f44f714b Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 14 Mar 2018 15:24:30 +1100 Subject: [PATCH] updates naming of the extending preview property and fixes the angular rendering on ng-init --- src/SolutionInfo.cs | 2 +- .../Umbraco/Views/Preview/Index.cshtml | 16 ++++++++++------ src/Umbraco.Web/Editors/PreviewController.cs | 8 ++++---- .../Models/ContentEditing/BackOfficePreview.cs | 3 ++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 9da63d813f..083b2d3e90 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -12,4 +12,4 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("7.10.0")] -[assembly: AssemblyInformationalVersion("7.10.0-beta004")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("7.10.0-beta005")] \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml index 556d4ff0c1..71e9ff36c9 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml @@ -1,5 +1,7 @@ @inherits System.Web.Mvc.WebViewPage - +@{ + var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant(); +} @@ -9,15 +11,17 @@ - @if (string.IsNullOrWhiteSpace(Model.PreviewExtendedView) == false) - { - @Html.Partial(Model.PreviewExtendedView) - }
+ + @if (string.IsNullOrWhiteSpace(Model.PreviewExtendedHeaderView) == false) + { + @Html.Partial(Model.PreviewExtendedHeaderView) + } +
-
+
public class BackOfficePreview { - public string PreviewExtendedView { get; set; } + public string PreviewExtendedHeaderView { get; set; } + //TODO: We could potentially have a 'footer' view public bool DisableDevicePreview { get; set; } } }