From bfa92625f2ae8d1d36ff5e10d9214e103b2c3597 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 22 Jul 2010 23:40:35 -0700 Subject: [PATCH] ThemeSiteSetting -> ThemeSiteSettingsPart; Also made Theme a plain ol' model (not a ContentPart) - updating part names to conform to a Part convention --HG-- branch : dev rename : src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs rename : src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPart.cs rename : src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPartRecord.cs --- .../DataMigrations/ThemesDataMigration.cs | 14 +------------- .../Handlers/ThemeSiteSettingsHandler.cs | 14 -------------- .../Handlers/ThemeSiteSettingsPartHandler.cs | 14 ++++++++++++++ .../Modules/Orchard.Themes/Models/Theme.cs | 8 ++------ .../Modules/Orchard.Themes/Models/ThemeRecord.cs | 13 ------------- ...emeSiteSettings.cs => ThemeSiteSettingsPart.cs} | 2 +- ...ngsRecord.cs => ThemeSiteSettingsPartRecord.cs} | 2 +- .../Modules/Orchard.Themes/Orchard.Themes.csproj | 7 +++---- .../Orchard.Themes/Services/SiteThemeSelector.cs | 2 +- .../Orchard.Themes/Services/ThemeService.cs | 4 ++-- src/Orchard/Themes/ITheme.cs | 6 ++---- 11 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs delete mode 100644 src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs rename src/Orchard.Web/Modules/Orchard.Themes/Models/{ThemeSiteSettings.cs => ThemeSiteSettingsPart.cs} (71%) rename src/Orchard.Web/Modules/Orchard.Themes/Models/{ThemeSiteSettingsRecord.cs => ThemeSiteSettingsPartRecord.cs} (66%) diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs index 03013b548..4e1126c0d 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs @@ -4,20 +4,8 @@ namespace Orchard.Themes.DataMigrations { public class ThemesDataMigration : DataMigrationImpl { public int Create() { - //CREATE TABLE Orchard_Themes_ThemeRecord (Id INTEGER not null, ThemeName TEXT, DisplayName TEXT, Description TEXT, Version TEXT, Author TEXT, HomePage TEXT, Tags TEXT, primary key (Id)); - SchemaBuilder.CreateTable("ThemeRecord", table => table - .ContentPartRecord() - .Column("ThemeName") - .Column("DisplayName") - .Column("Description") - .Column("Version") - .Column("Author") - .Column("HomePage") - .Column("Tags") - ); - //CREATE TABLE Orchard_Themes_ThemeSiteSettingsRecord (Id INTEGER not null, CurrentThemeName TEXT, primary key (Id)); - SchemaBuilder.CreateTable("ThemeSiteSettingsRecord", table => table + SchemaBuilder.CreateTable("ThemeSiteSettingsPartRecord", table => table .ContentPartRecord() .Column("CurrentThemeName") ); diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs b/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs deleted file mode 100644 index ef35c9c0c..000000000 --- a/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs +++ /dev/null @@ -1,14 +0,0 @@ -using JetBrains.Annotations; -using Orchard.Data; -using Orchard.ContentManagement.Handlers; -using Orchard.Themes.Models; - -namespace Orchard.Themes.Handlers { - [UsedImplicitly] - public class ThemeSiteSettingsHandler : ContentHandler { - public ThemeSiteSettingsHandler(IRepository repository) { - Filters.Add(new ActivatingFilter("Site")); - Filters.Add(StorageFilter.For(repository)); - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs new file mode 100644 index 000000000..c16dc828f --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs @@ -0,0 +1,14 @@ +using JetBrains.Annotations; +using Orchard.Data; +using Orchard.ContentManagement.Handlers; +using Orchard.Themes.Models; + +namespace Orchard.Themes.Handlers { + [UsedImplicitly] + public class ThemeSiteSettingsPartHandler : ContentHandler { + public ThemeSiteSettingsPartHandler(IRepository repository) { + Filters.Add(new ActivatingFilter("Site")); + Filters.Add(StorageFilter.For(repository)); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs b/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs index 84a592dbd..dcbf87c91 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs @@ -1,9 +1,5 @@ -using Orchard.ContentManagement; - -namespace Orchard.Themes.Models { - public class Theme : ContentPart, ITheme { - public static readonly ContentType ContentType = new ContentType { Name = "theme", DisplayName = "Themes" }; - +namespace Orchard.Themes.Models { + public class Theme : ITheme { public string ThemeName { get; set; } public string DisplayName { get; set; } public string Description { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs b/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs deleted file mode 100644 index c96c8e05b..000000000 --- a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Orchard.ContentManagement.Records; - -namespace Orchard.Themes.Models { - public class ThemeRecord : ContentPartRecord { - public virtual string ThemeName { get; set; } - public virtual string DisplayName { get; set; } - public virtual string Description { get; set; } - public virtual string Version { get; set; } - public virtual string Author { get; set; } - public virtual string HomePage { get; set; } - public virtual string Tags { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs b/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPart.cs similarity index 71% rename from src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs rename to src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPart.cs index f425e4f6c..251398a86 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPart.cs @@ -1,7 +1,7 @@ using Orchard.ContentManagement; namespace Orchard.Themes.Models { - public class ThemeSiteSettings : ContentPart { + public class ThemeSiteSettingsPart : ContentPart { public string CurrentThemeName { get { return Record.CurrentThemeName; } set { Record.CurrentThemeName = value; } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs b/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPartRecord.cs similarity index 66% rename from src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs rename to src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPartRecord.cs index 1012ab0b7..cec170504 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPartRecord.cs @@ -1,7 +1,7 @@ using Orchard.ContentManagement.Records; namespace Orchard.Themes.Models { - public class ThemeSiteSettingsRecord : ContentPartRecord { + public class ThemeSiteSettingsPartRecord : ContentPartRecord { public virtual string CurrentThemeName { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index 36b88375e..f9cddf4d9 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -69,11 +69,10 @@ - + - - - + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs index 49a1a199e..02d0686a5 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs @@ -12,7 +12,7 @@ namespace Orchard.Themes.Services { protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; } public ThemeSelectorResult GetTheme(RequestContext context) { - string currentThemeName = CurrentSite.As().Record.CurrentThemeName; + string currentThemeName = CurrentSite.As().Record.CurrentThemeName; if (String.IsNullOrEmpty(currentThemeName)) { return null; diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs index ab70b6566..2733847f4 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs @@ -28,7 +28,7 @@ namespace Orchard.Themes.Services { protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; } public ITheme GetSiteTheme() { - string currentThemeName = CurrentSite.As().Record.CurrentThemeName; + string currentThemeName = CurrentSite.As().Record.CurrentThemeName; if (String.IsNullOrEmpty(currentThemeName)) { return null; @@ -39,7 +39,7 @@ namespace Orchard.Themes.Services { public void SetSiteTheme(string themeName) { if (GetThemeByName(themeName) != null) { - CurrentSite.As().Record.CurrentThemeName = themeName; + CurrentSite.As().Record.CurrentThemeName = themeName; } } diff --git a/src/Orchard/Themes/ITheme.cs b/src/Orchard/Themes/ITheme.cs index 40205cc05..fe56949e2 100644 --- a/src/Orchard/Themes/ITheme.cs +++ b/src/Orchard/Themes/ITheme.cs @@ -1,10 +1,8 @@ -using Orchard.ContentManagement; - -namespace Orchard.Themes { +namespace Orchard.Themes { /// /// Interface provided by the "themes" model. /// - public interface ITheme : IContent { + public interface ITheme { string ThemeName { get; set; } string DisplayName { get; set; } string Description { get; set; }