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

Changes to template and masterpages helper

Browse Source
This commit is contained in:
PerPloug
2012-11-23 09:37:35 -01:00
parent 654c3b7403
commit 55cb46927e
2 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
src/umbraco.cms/businesslogic/template/MasterpageHelper.cs
View File

@@ -25,15 +25,18 @@ namespace umbraco.cms.businesslogic.template
return IOHelper.MapPath(SystemDirectories.Masterpages + "/" + t.Alias.Replace(" ", "") + ".master");
}
internal static string CreateMasterPage(Template t, bool overWrite = false)
internal static string CreateMasterPage(Template t, bool overWrite = false)
{
string masterpageContent = "";
if (!File.Exists(GetFilePath(t)) || overWrite)
masterpageContent = SaveTemplateToFile(t, t.Alias);
if (!File.Exists(GetFilePath(t)) || overWrite)
{
masterpageContent = CreateDefaultMasterPageContent(t, t.Alias);
saveDesignToFile(t, null, masterpageContent);
}
else
{
System.IO.TextReader tr = new StreamReader(GetFilePath(t));
System.IO.TextReader tr = new StreamReader(GetFilePath(t));
masterpageContent = tr.ReadToEnd();
tr.Close();
}
@@ -56,7 +59,152 @@ namespace umbraco.cms.businesslogic.template
internal static string UpdateMasterPageFile(Template t, string currentAlias)
{
return SaveTemplateToFile(t, currentAlias);
var template = updateMasterPageContent(t, currentAlias);
updateChildTemplates(t, currentAlias);
saveDesignToFile(t, currentAlias, template);
return template;
}
internal static string CreateDefaultMasterPageContent(Template template, string currentAlias)
{
string design = GetMasterPageHeader(template) + "\n";
if (template.HasMasterTemplate)
{
var master = new Template(template.MasterTemplate);
foreach (string cpId in master.contentPlaceholderIds())
{
design += "<asp:content ContentPlaceHolderId=\"" + cpId +
"\" runat=\"server\">\n\t\n</asp:content>\n\n";
}
}
else
{
design += GetMasterContentElement(template) + "\n";
design += template.Design;
design += "\n</asp:Content>" + Environment.NewLine;
}
return design;
/*
var masterPageContent = template.Design;
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;
}
else
{
// verify that the masterpage attribute is the same as the masterpage
string masterHeader =
masterPageContent.Substring(0, masterPageContent.IndexOf("%>") + 2).Trim(
Environment.NewLine.ToCharArray());
// find the masterpagefile attribute
MatchCollection m = Regex.Matches(masterHeader, "(?<attributeName>\\S*)=\"(?<attributeValue>[^\"]*)\"",
RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
foreach (Match attributeSet in m)
{
if (attributeSet.Groups["attributeName"].Value.ToLower() == "masterpagefile")
{
// validate the masterpagefile
string currentMasterPageFile = attributeSet.Groups["attributeValue"].Value;
string currentMasterTemplateFile = ParentTemplatePath(template);
if (currentMasterPageFile != currentMasterTemplateFile)
{
masterPageContent =
masterPageContent.Replace(
attributeSet.Groups["attributeName"].Value + "=\"" + currentMasterPageFile + "\"",
attributeSet.Groups["attributeName"].Value + "=\"" + currentMasterTemplateFile +
"\"");
}
}
}
}
return masterPageContent;
* */
}
internal static string updateMasterPageContent(Template template, string currentAlias)
{
var masterPageContent = template.Design;
if (!string.IsNullOrEmpty(currentAlias) && currentAlias != template.Alias)
{
string masterHeader =
masterPageContent.Substring(0, masterPageContent.IndexOf("%>") + 2).Trim(
Environment.NewLine.ToCharArray());
// find the masterpagefile attribute
MatchCollection m = Regex.Matches(masterHeader, "(?<attributeName>\\S*)=\"(?<attributeValue>[^\"]*)\"",
RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
foreach (Match attributeSet in m)
{
if (attributeSet.Groups["attributeName"].Value.ToLower() == "masterpagefile")
{
// validate the masterpagefile
string currentMasterPageFile = attributeSet.Groups["attributeValue"].Value;
string currentMasterTemplateFile = ParentTemplatePath(template);
if (currentMasterPageFile != currentMasterTemplateFile)
{
masterPageContent =
masterPageContent.Replace(
attributeSet.Groups["attributeName"].Value + "=\"" + currentMasterPageFile + "\"",
attributeSet.Groups["attributeName"].Value + "=\"" + currentMasterTemplateFile +
"\"");
}
}
}
}
return masterPageContent;
}
private static void updateChildTemplates(Template t, string currentAlias)
{
//if we have a Old Alias if the alias and therefor the masterpage file name has changed...
//so before we save the new masterfile, we'll clear the old one, so we don't up with
//Unused masterpage files
if (!string.IsNullOrEmpty(currentAlias) && currentAlias != t.Alias)
{
//Ensure that child templates have the right master masterpage file name
if (t.HasChildren)
{
var c = t.Children;
foreach (CMSNode cmn in c)
UpdateMasterPageFile(new Template(cmn.Id), null);
}
}
}
private static void saveDesignToFile(Template t, string currentAlias, string design)
{
//kill the old file..
if (!string.IsNullOrEmpty(currentAlias) && currentAlias != t.Alias)
{
string _oldFile =
IOHelper.MapPath(SystemDirectories.Masterpages + "/" + currentAlias.Replace(" ", "") + ".master");
if (System.IO.File.Exists(_oldFile))
System.IO.File.Delete(_oldFile);
}
// save the file in UTF-8
System.IO.File.WriteAllText(GetFilePath(t), design, System.Text.Encoding.UTF8);
}
internal static void RemoveMasterPageFile(string alias)

24
src/umbraco.cms/businesslogic/template/Template.cs
View File

@@ -383,18 +383,15 @@ namespace umbraco.cms.businesslogic.template
return engine;
}
public static Template MakeNew(string Name, BusinessLogic.User u, Template master)
{
return MakeNew(Name, u, master, null);
}
private static Template MakeNew(string Name, BusinessLogic.User u, Template master, string design)
public static Template MakeNew(string Name, BusinessLogic.User u, Template master)
{
Template t = MakeNew(Name, u, design);
t.MasterTemplate = master.Id;
return MakeNew(Name, u, master, null);
}
t.Save();
return t;
private static Template MakeNew(string name, BusinessLogic.User u, string design)
{
return MakeNew(name, u, null, design);
}
public static Template MakeNew(string name, BusinessLogic.User u)
@@ -402,7 +399,7 @@ namespace umbraco.cms.businesslogic.template
return MakeNew(name, u, design: null);
}
private static Template MakeNew(string name, BusinessLogic.User u, string design)
private static Template MakeNew(string name, BusinessLogic.User u, Template master, string design)
{
// CMSNode MakeNew(int parentId, Guid objectType, int userId, int level, string text, Guid uniqueID)
@@ -418,8 +415,6 @@ namespace umbraco.cms.businesslogic.template
name = name.Substring(0, 95) + "...";
SqlHelper.ExecuteNonQuery("INSERT INTO cmsTemplate (NodeId, Alias, design, master) VALUES (@nodeId, @alias, @design, @master)",
SqlHelper.CreateParameter("@nodeId", n.Id),
SqlHelper.CreateParameter("@alias", name),
@@ -430,6 +425,9 @@ namespace umbraco.cms.businesslogic.template
NewEventArgs e = new NewEventArgs();
t.OnNew(e);
if (master != null)
t.MasterTemplate = master.Id;
switch (DetermineRenderingEngine(t, design))
{
case RenderingEngine.Mvc: