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

Merging, installer / skinning branch with 4.1 branch

Browse Source 
[TFS Changeset #76863]
This commit is contained in:
PerPloug
2010-09-06 13:48:30 +00:00
parent c704dd35f2
commit 54dfd6d44a
109 changed files with 5026 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
umbraco/presentation/template.cs
View File

@@ -63,6 +63,39 @@ namespace umbraco {
}
}
//Support for template folders, if a alternative skin folder is requested
//we will try to look for template files in another folder
public string AlternateMasterPageFile(string templateFolder)
{
string file = TemplateAlias.Replace(" ", "") + ".master";
string path = SystemDirectories.Masterpages + "/" + templateFolder + "/" + file;
//if it doesn't exists then we return the normal file
if (!System.IO.File.Exists(IOHelper.MapPath(VirtualPathUtility.ToAbsolute(path)))){
string originalPath = IOHelper.MapPath(VirtualPathUtility.ToAbsolute(MasterPageFile));
string copyPath = IOHelper.MapPath(VirtualPathUtility.ToAbsolute(path));
FileStream fs = new FileStream(originalPath, FileMode.Open, FileAccess.ReadWrite);
StreamReader f = new StreamReader(fs);
String newfile = f.ReadToEnd();
f.Close();
fs.Close();
newfile = newfile.Replace("MasterPageFile=\"~/masterpages/", "MasterPageFile=\"");
fs = new FileStream(copyPath, FileMode.Create, FileAccess.Write);
StreamWriter replacement = new StreamWriter(fs);
replacement.Write(newfile);
replacement.Close();
}
return path;
}
public string TemplateAlias {
get { return _templateAlias; }
}
@@ -383,13 +416,21 @@ namespace umbraco {
#region constructors
public static string GetMasterPageName(int templateID) {
public static string GetMasterPageName(int templateID)
{
return GetMasterPageName(templateID, null);
}
public static string GetMasterPageName(int templateID, string templateFolder) {
template t = (template)templateCache["template" + templateID];
if (t == null)
t = new template(templateID);
if (t != null)
return t.MasterPageFile;
if (!string.IsNullOrEmpty(templateFolder))
return t.AlternateMasterPageFile(templateFolder);
else
return t.MasterPageFile;
else
throw new ArgumentException(String.Format("Template with id '{0}' not found", templateID));
}