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

updated most of the calls from the legacy UmbracoSettings to use the new way - nearly done.

Browse Source
This commit is contained in:
Shannon
2013-09-13 18:36:41 +10:00
parent f38a6e1561
commit 7538698e7b
49 changed files with 151 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
View File

@@ -34,7 +34,7 @@
var macroAliases = new Array();
var macroAlias = '<%= _macroAlias %>';
<%if (umbraco.UmbracoSettings.UseAspNetMasterPages) { %>
<%if (umbraco.UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages) { %>
var macroElement = "umbraco:Macro";
<%}else{ %>
var macroElement = "?UMBRACO_MACRO";
@@ -95,11 +95,11 @@
if (macroString.length > 1)
macroString = macroString.substr(0, macroString.length-1);
<%if (!umbraco.UmbracoSettings.UseAspNetMasterPages){ %>
<%if (!umbraco.UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages){ %>
macroString += " macroAlias=\"" + macroAlias + "\"";
<%} %>
<%if (umbraco.UmbracoSettings.UseAspNetMasterPages){ %>
<%if (umbraco.UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages){ %>
macroString += " Alias=\"" + macroAlias + "\" runat=\"server\"></" + macroElement + ">";
<%} else { %>
macroString += "></" + macroElement + ">";
@@ -121,7 +121,7 @@
<form id="form1" runat="server">
<div style="" class="propertypane">
<div style="" class="propertypane">
<div>
<div style="height: 420px; overflow: auto;">
<asp:PlaceHolder ID="macroProperties" runat="server" />

2
src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
View File

@@ -13,7 +13,7 @@
(function($) {
$(document).ready(function () {
Umbraco.Dialogs.EditMacro.getInstance().init({
useAspNetMasterPages: <%=umbraco.UmbracoSettings.UseAspNetMasterPages.ToString().ToLower() %>,
useAspNetMasterPages: <%=umbraco.UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages.ToString().ToLower() %>,
codeEditorElementId: "<%=Request.GetItemAsString("objectId")%>",
renderingEngine: "<%=Request.GetItemAsString("renderingEngine", "Mvc")%>",
macroAlias: '<%= _macroAlias %>'

2
src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
View File

@@ -23,7 +23,7 @@
restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
umbracoPath: '<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>',
editorClientId: '<%= editorSource.ClientID %>',
useMasterPages: <%=umbraco.UmbracoSettings.UseAspNetMasterPages.ToString().ToLower()%>,
useMasterPages: <%=umbraco.UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages.ToString().ToLower()%>,
templateId: <%= Request.QueryString["templateID"] %>,
masterTemplateId: jQuery('#<%= MasterTemplate.ClientID %>').val(),
masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"),