From cdbc02354dc5b40dee92eb96102f3a4aca6d2c08 Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 30 Sep 2013 23:34:20 +0200 Subject: [PATCH] umbracoField dialog tweaks --- .../umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs index 6666898a6d..3204058780 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs @@ -32,15 +32,13 @@ namespace umbraco.dialogs //set labels on properties... pp_insertAltField.Text = ui.Text("templateEditor", "alternativeField"); pp_insertAltText.Text = ui.Text("templateEditor", "alternativeText"); - pp_recursive.Text = ui.Text("templateEditor", "recursive"); pp_insertBefore.Text = ui.Text("templateEditor", "preContent"); pp_insertAfter.Text = ui.Text("templateEditor", "postContent"); pp_FormatAsDate.Text = ui.Text("templateEditor", "formatAsDate"); pp_casing.Text = ui.Text("templateEditor", "casing"); pp_encode.Text = ui.Text("templateEditor", "encoding"); - pp_convertLineBreaks.Text = ui.Text("templateEditor", "convertLineBreaks"); - pp_removePTags.Text = ui.Text("templateEditor", "removeParagraph"); + if (UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages)