From 812ed78cd972b5f062dfb0597a587cbbdd0a61eb Mon Sep 17 00:00:00 2001 From: perploug Date: Fri, 27 Sep 2013 11:21:56 +0200 Subject: [PATCH] made mediatype editor async --- src/Umbraco.Web.UI/umbraco/settings/EditMediaType.aspx | 1 + .../umbraco/settings/EditDictionaryItem.aspx.cs | 1 + .../umbraco.presentation/umbraco/settings/EditMediaType.aspx | 1 + .../umbraco/settings/EditMediaType.aspx.designer.cs | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditMediaType.aspx b/src/Umbraco.Web.UI/umbraco/settings/EditMediaType.aspx index 28a6efe773..ab35ae3a63 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/EditMediaType.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/EditMediaType.aspx @@ -1,6 +1,7 @@ <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Page Language="c#" CodeBehind="EditMediaType.aspx.cs" MasterPageFile="../masterpages/umbracoPage.Master" + Async="true" AsyncTimeOut="300" AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.EditMediaType" %> <%@ Register TagPrefix="uc1" TagName="ContentTypeControlNew" Src="../controls/ContentTypeControlNew.ascx" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs index d68117de12..b6165ac86c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs @@ -39,6 +39,7 @@ namespace umbraco.settings uicontrols.Pane p = new uicontrols.Pane(); var save = Panel1.Menu.NewButton(); + save.Text = ui.Text("save"); save.Click += save_Click; save.ToolTip = ui.Text("save"); save.ID = "save"; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx index 28a6efe773..ab35ae3a63 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx @@ -1,6 +1,7 @@ <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Page Language="c#" CodeBehind="EditMediaType.aspx.cs" MasterPageFile="../masterpages/umbracoPage.Master" + Async="true" AsyncTimeOut="300" AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.EditMediaType" %> <%@ Register TagPrefix="uc1" TagName="ContentTypeControlNew" Src="../controls/ContentTypeControlNew.ascx" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs index e120177439..3bf60caa2c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditMediaType.aspx.designer.cs @@ -19,6 +19,6 @@ namespace umbraco.cms.presentation.settings { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::umbraco.controls.ContentTypeControlNew ContentTypeControlNew1; + protected global::System.Web.UI.UserControl ContentTypeControlNew1; } }