From 04e0b35c7dfa80d21680b86d310069be52b37d42 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Fri, 28 Sep 2012 09:19:16 -0200 Subject: [PATCH] Method Renaming to follow standards Marking IOHelper methods as internal Removing unneeded umbraco setting Missing icon and missing folder in UI project --- .../Configuration/UmbracoSettings.cs | 33 +----- src/Umbraco.Core/IO/IOHelper.cs | 6 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 + .../umbraco/images/umbraco/settingView.gif | Bin 0 -> 1644 bytes .../umbraco/settings/views/editView.aspx | 95 ++++++++++++++++++ .../umbraco/settings/views/editView.aspx | 69 +------------ .../umbraco/settings/views/editView.aspx.cs | 38 +++---- .../template/MasterpageHelper.cs | 46 ++++----- .../businesslogic/template/ViewHelper.cs | 4 +- 9 files changed, 143 insertions(+), 149 deletions(-) create mode 100644 src/Umbraco.Web.UI/umbraco/images/umbraco/settingView.gif create mode 100644 src/Umbraco.Web.UI/umbraco/settings/views/editView.aspx diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings.cs index 8de810f588..550bb365f6 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings.cs @@ -1170,9 +1170,7 @@ namespace Umbraco.Core.Configuration } catch (Exception ex) { - Trace.WriteLine("Could not load /settings/templates/enableMvcSupport from umbracosettings.config:\r\n {0}", - ex.Message); - + LogHelper.Error("Could not load /settings/templates/enableMvcSupport from umbracosettings.config", ex); _enableMvc = false; } } @@ -1180,35 +1178,6 @@ namespace Umbraco.Core.Configuration } } - private static string[] _mvcViewExtensions; - public static string[] MvcViewExtensions - { - get - { - string[] defaultValue = "cshtml".Split(','); - - if (_mvcViewExtensions == null) - { - try - { - string value = GetKey("/settings/templates/mvcViewExtensions"); - if (!string.IsNullOrEmpty(value)) - _mvcViewExtensions = value.Split(','); - else - _mvcViewExtensions = defaultValue; - } - catch (Exception ex) - { - Trace.WriteLine("Could not load /settings/templates/mvcViewExtensions from umbracosettings.config:\r\n {0}", - ex.Message); - - _mvcViewExtensions = defaultValue; - } - } - - return _mvcViewExtensions; - } - } /// /// Configuration regarding webservices diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs index f718483d0f..1defb0562e 100644 --- a/src/Umbraco.Core/IO/IOHelper.cs +++ b/src/Umbraco.Core/IO/IOHelper.cs @@ -152,7 +152,7 @@ namespace Umbraco.Core.IO /// filepath /// /// true if valid, throws a FileSecurityException if not - public static bool ValidateEditPath(string filePath, string validDir) + internal static bool ValidateEditPath(string filePath, string validDir) { if (!filePath.StartsWith(MapPath(SystemDirectories.Root))) filePath = MapPath(filePath); @@ -165,7 +165,7 @@ namespace Umbraco.Core.IO return true; } - public static bool ValidateEditPath(string filePath, string[] validDirs) + internal static bool ValidateEditPath(string filePath, IEnumerable validDirs) { foreach (var dir in validDirs) { @@ -182,7 +182,7 @@ namespace Umbraco.Core.IO throw new FileSecurityException(String.Format("The filepath '{0}' is not within an allowed directory for this type of files", filePath.Replace(MapPath(SystemDirectories.Root), ""))); } - public static bool ValidateFileExtension(string filePath, List validFileExtensions) + internal static bool ValidateFileExtension(string filePath, List validFileExtensions) { if (!filePath.StartsWith(MapPath(SystemDirectories.Root))) filePath = MapPath(filePath); diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 88426ad6d1..6d17abc282 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -370,6 +370,7 @@ + diff --git a/src/Umbraco.Web.UI/umbraco/images/umbraco/settingView.gif b/src/Umbraco.Web.UI/umbraco/images/umbraco/settingView.gif new file mode 100644 index 0000000000000000000000000000000000000000..74f64b87ce1b8b8dd729545eaaac8aad66fa0f1d GIT binary patch literal 1644 zcmZ?wbhEHb6krfwc;?5jcJ12VfByXY_wUD#AK!oe`2G8LM)j1xfB&XcPs?wfpHVwC zziCER-PFH-|NQ^|IliR-`_J$F^S1o||1G(E;{X45z5&7aSGVq;-L-4i{^OSqp1$$r z+n4mJ$?raX`TzfILG$dc8LOr*-BHjqJEdYuYQ>bK@`;(X)AE{T?>%;A*RI{UjWfS| z`<_}g^~bN@x9(s2|Nq70g&Wgrre@U4xPSlt`D=HR$|nB${rms_55Io>e)Qv4q}24xJX@vryZ0+8WTx0E zg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i=|m)9WTXpJp<7&;SCUwvn^&w1Gr=XbIJqdZpd>RtPXT0NVp4u-iLDaQr4TRV7Ql_o zE7k*hM=v=)SHB{$K;KZ$0OTc@LSJ9}N^^7Js*6j4QW5UOYH)E#WkITbP-=00X;E@2 zP`NV5ssbzLqSVBa{GyQj{2W*)24v)yt$x9Sh)g$qp7K}fu*U7p`ojhqlLMFrK_uvi?OMhvy-tSOs`9Ra%paA zUI|QZ3PP_5PQ9RnkXrz>*(J3ovn(~mttdZN0qkL`Ox$iU#AzN>ZwhX=7~#~b4|I$^ zC|Z%C872fwJ0K=J(E>T}WS^P`OzTC!M9ujB-(O%h|M}zlx36D5fBN|0{kyksUcY+z z;`y_uPaZ#d_~8D%yLWEix_RUJwX0VyU%GhV{JFDdPMZ`!zF{kpYlR+RD-nPikb&{kYr=x+;1h3v*zS4?}jAkrS3Wts``Kq&+$ZM&Jshr=*?yJLRWNxb_ z$8p=0)tAFYSwPm5*KooPR~KI;U29=}4Lh07N8bDm*wDlwD5I~zu*7shr+_#&k3>R& fqR={bQMMNb5f2FjxZsLGEb) literal 0 HcmV?d00001 diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/editView.aspx b/src/Umbraco.Web.UI/umbraco/settings/views/editView.aspx new file mode 100644 index 0000000000..f826694db2 --- /dev/null +++ b/src/Umbraco.Web.UI/umbraco/settings/views/editView.aspx @@ -0,0 +1,95 @@ +<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" + CodeBehind="editView.aspx.cs" Inherits="umbraco.cms.presentation.settings.views.EditView" + ValidateRequest="False" %> + +<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx index 6edda41599..f826694db2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx @@ -1,5 +1,5 @@ <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" - CodeBehind="editView.aspx.cs" Inherits="umbraco.cms.presentation.settings.views.editView" + CodeBehind="editView.aspx.cs" Inherits="umbraco.cms.presentation.settings.views.EditView" ValidateRequest="False" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> @@ -7,11 +7,6 @@ + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx.cs index 3b7d4b024e..f7044effac 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/views/editView.aspx.cs @@ -14,7 +14,7 @@ using umbraco.uicontrols; namespace umbraco.cms.presentation.settings.views { - public partial class editView : BasePages.UmbracoEnsuredPage + public partial class EditView : BasePages.UmbracoEnsuredPage { private Template _template; @@ -35,46 +35,41 @@ namespace umbraco.cms.presentation.settings.views protected global::System.Web.UI.WebControls.Repeater rpt_macros; - public editView() + public EditView() { CurrentApp = BusinessLogic.DefaultApps.settings.ToString(); } - protected void Page_Load(object sender, EventArgs e) + protected override void OnLoad(EventArgs e) { + base.OnLoad(e); + MasterTemplate.Attributes.Add("onchange", "changeMasterPageFile()"); if (!IsPostBack) { MasterTemplate.Items.Add(new ListItem(ui.Text("none"), "0")); + var selectedTemplate = string.Empty; foreach (Template t in Template.GetAllAsList()) { - if (t.Id != _template.Id) - { - var li = new ListItem(t.Text, t.Id.ToString()); + if (t.Id == _template.Id) continue; + + var li = new ListItem(t.Text, t.Id.ToString()); + li.Attributes.Add("id", t.Alias.Replace(" ", "")); - li.Attributes.Add("id", t.Alias.Replace(" ", "")); - - if (t.Id == _template.MasterTemplate) - { - try - { - li.Selected = true; - } - catch - { - } - } - MasterTemplate.Items.Add(li); - } + if (t.Id == _template.MasterTemplate) + selectedTemplate = t.Alias.Replace(" ", ""); + + MasterTemplate.Items.Add(li); } + MasterTemplate.SelectedValue = selectedTemplate; + NameTxt.Text = _template.GetRawText(); AliasTxt.Text = _template.Alias; editorSource.Text = _template.Design; - ClientTools .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree().Tree.Alias) .SyncTree("-1,init," + _template.Path.Replace("-1,", ""), false); @@ -82,7 +77,6 @@ namespace umbraco.cms.presentation.settings.views } - #region Web Form Designer generated code protected override void OnInit(EventArgs e) { diff --git a/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs b/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs index 8f3866472a..700d8b4165 100644 --- a/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs +++ b/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs @@ -17,7 +17,7 @@ namespace umbraco.cms.businesslogic.template string masterpageContent = ""; if (!File.Exists(t.MasterPageFile) || overWrite) - masterpageContent = saveTemplateToFile(t, t.Alias); + masterpageContent = SaveTemplateToFile(t, t.Alias); else { System.IO.TextReader tr = new StreamReader(t.MasterPageFile); @@ -42,19 +42,19 @@ namespace umbraco.cms.businesslogic.template internal static string UpdateMasterpageFile(Template t, string currentAlias) { - return saveTemplateToFile(t, currentAlias); + return SaveTemplateToFile(t, currentAlias); } - internal static string saveTemplateToFile(Template template, string currentAlias) + internal static string SaveTemplateToFile(Template template, string currentAlias) { var masterPageContent = template.Design; - if (!isMasterPageSyntax(masterPageContent)) + if (!IsMasterPageSyntax(masterPageContent)) masterPageContent = ConvertToMasterPageSyntax(template); // Add header to master page if it doesn't exist if (!masterPageContent.TrimStart().StartsWith("<%@")) { - masterPageContent = getMasterPageHeader(template) + "\n" + masterPageContent; + masterPageContent = GetMasterPageHeader(template) + "\n" + masterPageContent; } else { @@ -73,7 +73,7 @@ namespace umbraco.cms.businesslogic.template { // validate the masterpagefile string currentMasterPageFile = attributeSet.Groups["attributeValue"].Value; - string currentMasterTemplateFile = parentTemplatePath(template); + string currentMasterTemplateFile = ParentTemplatePath(template); if (currentMasterPageFile != currentMasterTemplateFile) { @@ -131,17 +131,17 @@ namespace umbraco.cms.businesslogic.template return masterPageContent; } - private static bool isMasterPageSyntax(string code) + private static bool IsMasterPageSyntax(string code) { return code.Contains("<%@ Master") || code.Contains("", parentTemplatePath(template)) + Environment.NewLine; + return String.Format("<%@ Master Language=\"C#\" MasterPageFile=\"{0}\" AutoEventWireup=\"true\" %>", ParentTemplatePath(template)) + Environment.NewLine; } - private static string parentTemplatePath(Template template) + private static string ParentTemplatePath(Template template) { var masterTemplate = DefaultMasterTemplate; if (template.MasterTemplate != 0) @@ -168,18 +168,18 @@ namespace umbraco.cms.businesslogic.template internal static string EnsureMasterPageSyntax(string templateAlias, string masterPageContent) { - replaceElement(ref masterPageContent, "?UMBRACO_GETITEM", "umbraco:Item", true); - replaceElement(ref masterPageContent, "?UMBRACO_GETITEM", "umbraco:Item", false); + ReplaceElement(ref masterPageContent, "?UMBRACO_GETITEM", "umbraco:Item", true); + ReplaceElement(ref masterPageContent, "?UMBRACO_GETITEM", "umbraco:Item", false); // Parse the design for macros - replaceElement(ref masterPageContent, "?UMBRACO_MACRO", "umbraco:Macro", true); - replaceElement(ref masterPageContent, "?UMBRACO_MACRO", "umbraco:Macro", false); + ReplaceElement(ref masterPageContent, "?UMBRACO_MACRO", "umbraco:Macro", true); + ReplaceElement(ref masterPageContent, "?UMBRACO_MACRO", "umbraco:Macro", false); // Parse the design for load childs - masterPageContent = masterPageContent.Replace("", createDefaultPlaceHolder(templateAlias)) - .Replace("", createDefaultPlaceHolder(templateAlias)); + masterPageContent = masterPageContent.Replace("", CreateDefaultPlaceHolder(templateAlias)) + .Replace("", CreateDefaultPlaceHolder(templateAlias)); // Parse the design for aspnet forms - getAspNetMasterPageForm(ref masterPageContent, templateAlias); + GetAspNetMasterPageForm(ref masterPageContent, templateAlias); masterPageContent = masterPageContent.Replace("", ""); // Parse the design for aspnet heads masterPageContent = masterPageContent.Replace("", String.Format("", templateAlias.Replace(" ", ""))); @@ -188,9 +188,9 @@ namespace umbraco.cms.businesslogic.template } - private static void getAspNetMasterPageForm(ref string design, string templateAlias) + private static void GetAspNetMasterPageForm(ref string design, string templateAlias) { - Match formElement = Regex.Match(design, getElementRegExp("?ASPNET_FORM", false), RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); + Match formElement = Regex.Match(design, GetElementRegExp("?ASPNET_FORM", false), RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); if (formElement != null && formElement.Value != "") { @@ -203,15 +203,15 @@ namespace umbraco.cms.businesslogic.template } } - private static string createDefaultPlaceHolder(string templateAlias) + private static string CreateDefaultPlaceHolder(string templateAlias) { return String.Format("", templateAlias.Replace(" ", "")); } - private static void replaceElement(ref string design, string elementName, string newElementName, bool checkForQuotes) + private static void ReplaceElement(ref string design, string elementName, string newElementName, bool checkForQuotes) { MatchCollection m = - Regex.Matches(design, getElementRegExp(elementName, checkForQuotes), + Regex.Matches(design, GetElementRegExp(elementName, checkForQuotes), RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); foreach (Match match in m) @@ -248,7 +248,7 @@ namespace umbraco.cms.businesslogic.template } } - private static string getElementRegExp(string elementName, bool checkForQuotes) + private static string GetElementRegExp(string elementName, bool checkForQuotes) { if (checkForQuotes) return String.Format("\"<[^>\\s]*\\b{0}(\\b[^>]*)>\"", elementName); diff --git a/src/umbraco.cms/businesslogic/template/ViewHelper.cs b/src/umbraco.cms/businesslogic/template/ViewHelper.cs index c3e9306b5e..c915e18d9f 100644 --- a/src/umbraco.cms/businesslogic/template/ViewHelper.cs +++ b/src/umbraco.cms/businesslogic/template/ViewHelper.cs @@ -30,7 +30,7 @@ namespace umbraco.cms.businesslogic.template string path = IOHelper.MapPath(ViewPath(t)); if (!File.Exists(path) || overWrite) - viewContent = saveTemplateToFile(t, t.Alias); + viewContent = SaveTemplateToFile(t, t.Alias); else { System.IO.TextReader tr = new StreamReader(path); @@ -41,7 +41,7 @@ namespace umbraco.cms.businesslogic.template return viewContent; } - internal static string saveTemplateToFile(Template template, string currentAlias) + internal static string SaveTemplateToFile(Template template, string currentAlias) { var design = EnsureInheritedLayout(template); System.IO.File.WriteAllText(IOHelper.MapPath(ViewPath(template)), design, Encoding.UTF8);