yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link to current tuned css file in preview mode

Browse Source
This commit is contained in:
antoine
2014-07-01 13:55:39 +02:00
parent 89ed75f5dc
commit 2e1e1eee1c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
View File

@@ -276,11 +276,13 @@ var initTuningPanel = function () {
$(function () {
// Init ouline layer
$("body").append("<div id=\"outline-data\"></div><div id=\"outline-sup\"></div><div id=\"outline-inf\"></div><div id=\"outline-left\"></div><div id=\"outline-right\"></div>");
if (parent.setFrameIsLoaded) {
// Init ouline layer
$("body").append("<div id=\"outline-data\"></div><div id=\"outline-sup\"></div><div id=\"outline-inf\"></div><div id=\"outline-left\"></div><div id=\"outline-right\"></div>");
// Init tuning panel
initTuningPanel();
// Init tuning panel
initTuningPanel();
}
});

10
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -1328,21 +1328,23 @@ namespace Umbraco.Web
int pageId = UmbracoContext.PublishedContentRequest.UmbracoPage.PageID;
string[] path = UmbracoContext.PublishedContentRequest.UmbracoPage.SplitPath;
string result = string.Empty;
string cssPath = TuningUtility.GetStylesheetPath(path, false);
if (UmbracoContext.Current.InPreviewMode)
{
tuningConfigPath = !string.IsNullOrEmpty(tuningConfigPath) ? tuningConfigPath : "/umbraco/js/tuning.config.js";
tuningPalettesPath = !string.IsNullOrEmpty(tuningPalettesPath) ? tuningConfigPath : "/umbraco/js/tuning.palettes.js";
result = string.Format(previewLink, tuningConfigPath, tuningPalettesPath, pageId);
if (!string.IsNullOrEmpty(cssPath))
result = string.Format(noPreviewLinks, cssPath) + Environment.NewLine;
result = result + string.Format(previewLink, tuningConfigPath, tuningPalettesPath, pageId);
}
else
{
// Get css path for current page
string cssPath = TuningUtility.GetStylesheetPath(path, false);
if (!string.IsNullOrEmpty(cssPath))
result = string.Format(noPreviewLinks, cssPath);
else
result = string.Format(noPreviewLinks, "/Umbraco/assets/css/tuning.defaultStyle.css");
}
return new HtmlString(result);