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

fixes some ysods

Browse Source
This commit is contained in:
Shannon
2016-03-31 14:28:41 +02:00
parent 79bebb9e14
commit b22fda1e80
8 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Configuration/GlobalSettings.cs
View File

@@ -26,7 +26,8 @@ namespace Umbraco.Core.Configuration
/// <summary>
/// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from web.config appsettings
/// </summary>
internal class GlobalSettings
[Obsolete("TODO: Need to move this configuration class into the proper configuration accesors for v8!")]
public class GlobalSettings
{
#region Private static fields

7
src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
View File

@@ -1,11 +1,12 @@
<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %>
<%@ Import Namespace="Umbraco.Core.Configuration" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function toggleDiv(id) {
var div = document.getElementById(id);
if (div.style.display == "none")
if (div.style.display === "none")
div.style.display = "block";
else
@@ -13,7 +14,7 @@
}
function openDemo(link, id) {
UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550)
UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550);
}
</script>
@@ -159,7 +160,7 @@
//This is all a bit zany with double encoding because we have a URL in a hash (#) url part
// but it works and maintains query strings
var umbPath = "<%=umbraco.GlobalSettings.Path%>";
var umbPath = "<%=GlobalSettings.Path%>";
setTimeout(function () {
var mainWindow = UmbClientMgr.mainWindow();

1
src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
View File

@@ -2,6 +2,7 @@
AutoEventWireup="True" Inherits="umbraco.presentation.developer.packages.Installer"
Trace="false" ValidateRequest="false" %>
<%@ Import Namespace="umbraco" %>
<%@ Import Namespace="Umbraco.Core.Configuration" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">

2
src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
<%@ Page Language="C#" AutoEventWireup="true" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">

2
src/Umbraco.Web.UI/web.Template.Debug.config
View File

@@ -371,7 +371,7 @@
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove"

8
src/Umbraco.Web.UI/web.Template.config
View File

@@ -376,10 +376,10 @@
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />

3
src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs
View File

@@ -71,7 +71,8 @@ namespace Umbraco.Web.UI.Controls
var divMacroItemContainer = new TagBuilder("div");
divMacroItemContainer.Attributes.Add("style", "width: 285px;display:none;");
divMacroItemContainer.Attributes.Add("class", "sbMenu");
var macros = ApplicationContext.DatabaseContext.Database.Fetch<MacroDto>("select id, macroAlias, macroName from cmsMacro order by macroName");
var macros = Services.MacroService.GetAll().OrderBy(x => x.Name);
foreach (var macro in macros)
{
var divMacro = new TagBuilder("div");

12
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web.UI;
using System.Web.UI.WebControls;
using Umbraco.Core;
@@ -194,8 +195,15 @@ namespace umbraco.cms.presentation.settings
private void LoadMacros()
{
var macroRenderings =
DatabaseContext.Database.Fetch<TempMacroClass>("select id, macroAlias, macroName from cmsMacro order by macroName");
;
var macroRenderings =
Services.MacroService.GetAll()
.Select(x => new TempMacroClass()
{
id = x.Id,
macroAlias = x.Alias,
macroName = x.Name
});
rpt_macros.DataSource = macroRenderings;
rpt_macros.DataBind();