zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatic fallback to Default theme if selected theme does not exist.

Browse source
This commit is contained in:
Dario Solera 2011-01-05 08:46:56 +00:00
parent 75798de63f
commit 318bc854b1
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.4.569")] [assembly: AssemblyVersion("3.0.4.570")]
[assembly: AssemblyFileVersion("3.0.4.569")] [assembly: AssemblyFileVersion("3.0.4.570")]

4
Core/Settings.cs
View file

@ -832,7 +832,9 @@ namespace ScrewTurn.Wiki {
/// <param name="nspace">The namespace (<c>null</c> for the root).</param> /// <param name="nspace">The namespace (<c>null</c> for the root).</param>
/// <returns>The path of the theme.</returns> /// <returns>The path of the theme.</returns>
public static string GetThemePath(string nspace) { public static string GetThemePath(string nspace) {
return ThemesDirectoryName + "/" + GetTheme(nspace) + "/"; string path = ThemesDirectoryName + "/" + GetTheme(nspace) + "/";
if(!Directory.Exists(path)) return ThemesDirectoryName + "/Default/";
else return path;
} }
/// <summary> /// <summary>

17
Core/Tools.cs
View file

@ -25,18 +25,20 @@ namespace ScrewTurn.Wiki {
/// <param name="nspace">The namespace (<c>null</c> for the root).</param> /// <param name="nspace">The namespace (<c>null</c> for the root).</param>
/// <returns>The includes.</returns> /// <returns>The includes.</returns>
public static string GetIncludes(string nspace) { public static string GetIncludes(string nspace) {
string theme = Settings.GetTheme(nspace);
string themePath = Settings.GetThemePath(nspace); string themePath = Settings.GetThemePath(nspace);
StringBuilder result = new StringBuilder(300); StringBuilder result = new StringBuilder(300);
result.Append(GetJavaScriptIncludes()); result.Append(GetJavaScriptIncludes());
string[] css = Directory.GetFiles(Settings.ThemesDirectory + theme, "*.css"); string themeDir = Settings.ThemesDirectory + Settings.GetTheme(nspace);
if(!Directory.Exists(themeDir)) themeDir = Settings.ThemesDirectory + "Default";
string[] css = Directory.GetFiles(themeDir, "*.css");
string firstChunk; string firstChunk;
for(int i = 0; i < css.Length; i++) { for(int i = 0; i < css.Length; i++) {
if(Path.GetFileName(css[i]).IndexOf("_") != -1) { if(Path.GetFileName(css[i]).IndexOf("_") != -1) {
firstChunk = Path.GetFileName(css[i]).Substring(0, Path.GetFileName(css[i]).IndexOf("_")).ToLower(CultureInfo.CurrentCulture); firstChunk = Path.GetFileName(css[i]).Substring(0, Path.GetFileName(css[i]).IndexOf("_")).ToLowerInvariant();
if(firstChunk.Equals("screen") || firstChunk.Equals("print") || firstChunk.Equals("all") || if(firstChunk.Equals("screen") || firstChunk.Equals("print") || firstChunk.Equals("all") ||
firstChunk.Equals("aural") || firstChunk.Equals("braille") || firstChunk.Equals("embossed") || firstChunk.Equals("aural") || firstChunk.Equals("braille") || firstChunk.Equals("embossed") ||
firstChunk.Equals("handheld") || firstChunk.Equals("projection") || firstChunk.Equals("tty") || firstChunk.Equals("tv")) { firstChunk.Equals("handheld") || firstChunk.Equals("projection") || firstChunk.Equals("tty") || firstChunk.Equals("tv")) {
@ -51,21 +53,20 @@ namespace ScrewTurn.Wiki {
} }
} }
string customEditorCss = Path.Combine(Settings.ThemesDirectory, theme); string customEditorCss = Path.Combine(themeDir, "Editor.css");
customEditorCss = Path.Combine(customEditorCss, "Editor.css"); if(File.Exists(customEditorCss)) result.AppendFormat(@"<link rel=""stylesheet"" href=""{0}Editor.css"" type=""text/css"" />" + "\n", themePath);
if(File.Exists(customEditorCss)) result.AppendFormat(@"<link rel=""stylesheet"" href=""Themes/{0}/Editor.css"" type=""text/css"" />" + "\n", theme);
else result.Append(@"<link rel=""stylesheet"" href=""Themes/Editor.css"" type=""text/css"" />" + "\n"); else result.Append(@"<link rel=""stylesheet"" href=""Themes/Editor.css"" type=""text/css"" />" + "\n");
// OpenSearch // OpenSearch
result.AppendFormat(@"<link rel=""search"" href=""Search.aspx?OpenSearch=1"" type=""application/opensearchdescription+xml"" title=""{1}"" />", result.AppendFormat(@"<link rel=""search"" href=""Search.aspx?OpenSearch=1"" type=""application/opensearchdescription+xml"" title=""{1}"" />",
Settings.MainUrl, Settings.WikiTitle + " - Search"); Settings.MainUrl, Settings.WikiTitle + " - Search");
string[] js = Directory.GetFiles(Settings.ThemesDirectory + theme, "*.js"); string[] js = Directory.GetFiles(themeDir, "*.js");
for(int i = 0; i < js.Length; i++) { for(int i = 0; i < js.Length; i++) {
result.Append(@"<script src=""" + themePath + Path.GetFileName(js[i]) + @""" type=""text/javascript""></script>" + "\n"); result.Append(@"<script src=""" + themePath + Path.GetFileName(js[i]) + @""" type=""text/javascript""></script>" + "\n");
} }
string[] icons = Directory.GetFiles(Settings.ThemesDirectory + theme, "Icon.*"); string[] icons = Directory.GetFiles(themeDir, "Icon.*");
if(icons.Length > 0) { if(icons.Length > 0) {
result.Append(@"<link rel=""shortcut icon"" href=""" + themePath + Path.GetFileName(icons[0]) + @""" type="""); result.Append(@"<link rel=""shortcut icon"" href=""" + themePath + Path.GetFileName(icons[0]) + @""" type=""");
switch(Path.GetExtension(icons[0]).ToLowerInvariant()) { switch(Path.GetExtension(icons[0]).ToLowerInvariant()) {