Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Umbraco to 7.12.2

Browse Source
This commit is contained in:
James Kolpack
2018-09-16 15:08:47 -04:00
parent 7ed7776432
commit 616ab81bad
764 changed files with 142787 additions and 66790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/Partials/Grid/Editors/Base.cshtml
+1
View File
@@ -1,4 +1,5 @@
@model dynamic
@using Umbraco.Web.Templates
@functions {
public static string EditorView(dynamic contentItem)
WebCms/Views/Partials/Grid/Editors/Embed.cshtml
+6 -1
View File
@@ -1,2 +1,7 @@
@model dynamic
@Html.Raw(Model.value)
@using Umbraco.Web.Templates
<div class="video-wrapper">
@Html.Raw(Model.value)
</div>
WebCms/Views/Partials/Grid/Editors/Macro.cshtml
+2
View File
@@ -1,4 +1,6 @@
@inherits UmbracoViewPage<dynamic>
@using Umbraco.Web.Templates
@if (Model.value != null)
{
WebCms/Views/Partials/Grid/Editors/Media.cshtml
+4 -1
View File
@@ -1,4 +1,5 @@
@model dynamic
@using Umbraco.Web.Templates
@if (Model.value != null)
{
@@ -12,8 +13,10 @@
url += "&mode=crop";
}
}
var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
<img src="@url" alt="@Model.value.altText">
<img src="@url" alt="@altText">
if (Model.value.caption != null)
{
WebCms/Views/Partials/Grid/Editors/Textstring.cshtml
+6 -3
View File
@@ -4,10 +4,13 @@
@if (Model.editor.config.markup != null)
{
string markup = Model.editor.config.markup.ToString();
var UmbracoHelper = new UmbracoHelper(UmbracoContext.Current);
var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
markup = markup.Replace("#value#", umbracoHelper.ReplaceLineBreaksForHtml(HttpUtility.HtmlEncode(Model.value.ToString())));
markup = markup.Replace("#value#", UmbracoHelper.ReplaceLineBreaksForHtml(TemplateUtilities.CleanForXss(Model.value.ToString())));
markup = markup.Replace("#style#", Model.editor.config.style.ToString());
if (Model.editor.config.style != null)
{
markup = markup.Replace("#style#", Model.editor.config.style.ToString());
}
<text>
@Html.Raw(markup)