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

Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
	src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
	src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
This commit is contained in:
antoine
2014-05-30 19:56:51 +02:00
parent 1284417a58 90e5440518
commit 3dabd73ec2
21 changed files with 628 additions and 3605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1306,13 +1306,12 @@ namespace Umbraco.Web
public HtmlString EnableTuning()
{
string previewLink = @"<link href=""/Umbraco/lib/bootstrap/css/bootstrap.min.3.0.1.css"" type=""text/css"" rel=""stylesheet"" />" +
string previewLink = @"<link href=""/Umbraco/lib/bootstrap/css/bootstrap.min.3.0.1.css"" type=""text/css"" rel=""stylesheet"" />" +
@"<link href=""{0}"" rel=""stylesheet/less"" type=""text/css"" />" +
@"<link href=""{1}"" rel=""stylesheet/less"" type=""text/css"" />" +
@"<script src=""/Umbraco/lib/jquery/jquery-2.0.3.min.js"" type=""text/javascript""></script>" +
@"<script src=""/Umbraco/lib/bootstrap/js/bootstrap.3.0.1.min.js"" type=""text/javascript""></script>" +
@"<script src=""/Umbraco/lib/Less/less-1.7.0.min.js"" type=""text/javascript""></script>" +
@"<script type=""text/javascript"">var tuningParameterUrl='{0}';var tuningGridStyleUrl='{2}'</script>" +
@"<script type=""text/javascript"">var tuningParameterUrl='{0}';</script>" +
@"<script src=""/umbraco/js/tuning.front.js"" type=""text/javascript""></script>";
string noPreviewLinks = @"<link href=""/Umbraco/lib/bootstrap/css/bootstrap.min.3.0.1.css"" type=""text/css"" rel=""stylesheet"">" +
@@ -1320,63 +1319,24 @@ namespace Umbraco.Web
@"<script src=""/Umbraco/lib/jquery/jquery-2.0.3.min.js"" type=""text/javascript""></script>" +
@"<script src=""/Umbraco/lib/bootstrap/js/bootstrap.3.0.1.min.js"" type=""text/javascript""></script>";
string defaultLessStyle = @"/Umbraco/assets/less/tuning.defaultStyle.less";
string defaultCssStyle = @"/Umbraco/assets/css/tuning.defaultStyle.css";
string styleTuning = UmbracoContext.Current.InPreviewMode ? @"/Css/tuning/{0}.less" : "/Css/tuning/{0}.css";
// Get page value
int pageId = UmbracoContext.PublishedContentRequest.UmbracoPage.PageID;
string[] path = UmbracoContext.PublishedContentRequest.UmbracoPage.SplitPath;
// Looking for style folder
string linkResult = string.Empty;
foreach (var page in path.OrderByDescending(r => path.IndexOf(r)))
{
string stylePath = HttpContext.Current.Server.MapPath(string.Format(styleTuning, page));
if (System.IO.File.Exists(stylePath))
{
linkResult = string.Format(styleTuning, page);
break;
}
}
string result = string.Empty;
if (UmbracoContext.Current.InPreviewMode) {
string gridLessLink = string.Format("/Umbraco/Api/Tuning/GridStyle?pageId={0}", pageId);
string gridLessPath = string.Format("/Css/tuning/grid_{0}.less", pageId);
if (System.IO.File.Exists(HttpContext.Current.Server.MapPath(gridLessPath)))
{
gridLessLink = gridLessPath;
}
result = string.IsNullOrEmpty(linkResult) ? string.Format(previewLink, defaultLessStyle, gridLessLink, gridLessPath) : string.Format(previewLink, linkResult, gridLessLink, gridLessPath);
if (UmbracoContext.Current.InPreviewMode)
{
// Create or update current less file
string lessPath = TuningUtility.CreateOrUpdateLessFile(path, pageId);
result = string.Format(previewLink, lessPath);
}
else {
result = string.IsNullOrEmpty(linkResult) ? string.Format(noPreviewLinks, defaultCssStyle, pageId) : string.Format(noPreviewLinks, linkResult, pageId);
else
{
// Get css path for current page
string cssPath = TuningUtility.GetStylesheetPath(path, false);
result = string.Format(noPreviewLinks, cssPath);
}
//// Grid Styles
//var previewGridStyleLink = "/Umbraco/Api/Tuning/GridStyle?pageId={0}";
//if
//var gridStyleLink = string.Empty;
//string styleGridPath = HttpContext.Current.Server.MapPath(string.Format(gridStyleLink, pageId));
//if (System.IO.File.Exists(styleGridPath))
//{
// gridStyleLink = UmbracoContext.Current.InPreviewMode ? @"<link href=""/Css/tuning/grid{0}.less"" rel=""stylesheet/less"" type=""text/css"" />" :
// @"<link href=""/Css/tuning/grid{0}.css"" type=""text/css"" rel=""stylesheet"" />";
// gridStyleLink = string.Format(gridStyleLink, pageId);
//}
return new HtmlString(result);
}