lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ThemeSiteSetting -> ThemeSiteSettingsPart; Also made Theme a plain ol' model (not a ContentPart)

Browse Source 
- updating part names to conform to a <name>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
This commit is contained in:
Nathan Heskew
2010-07-22 23:40:35 -07:00
parent 86e640b1d0
commit bfa92625f2
11 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
View File

@@ -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<string>("ThemeName")
.Column<string>("DisplayName")
.Column<string>("Description")
.Column<string>("Version")
.Column<string>("Author")
.Column<string>("HomePage")
.Column<string>("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<string>("CurrentThemeName")
);

14
src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs
View File

@@ -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<ThemeSiteSettingsRecord> repository) {
Filters.Add(new ActivatingFilter<ThemeSiteSettings>("Site"));
Filters.Add(StorageFilter.For(repository));
}
}
}

14
src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs Normal file
View File

@@ -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<ThemeSiteSettingsPartRecord> repository) {
Filters.Add(new ActivatingFilter<ThemeSiteSettingsPart>("Site"));
Filters.Add(StorageFilter.For(repository));
}
}
}

8
src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
View File

@@ -1,9 +1,5 @@
using Orchard.ContentManagement;
namespace Orchard.Themes.Models {
public class Theme : ContentPart<ThemeRecord>, 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; }

13
src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs
View File

@@ -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; }
}
}

2
src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs → src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPart.cs
View File

@@ -1,7 +1,7 @@
using Orchard.ContentManagement;
namespace Orchard.Themes.Models {
public class ThemeSiteSettings : ContentPart<ThemeSiteSettingsRecord> {
public class ThemeSiteSettingsPart : ContentPart<ThemeSiteSettingsPartRecord> {
public string CurrentThemeName {
get { return Record.CurrentThemeName; }
set { Record.CurrentThemeName = value; }

2
src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs → src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsPartRecord.cs
View File

@@ -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; }
}
}

7
src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
View File

@@ -69,11 +69,10 @@
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="DataMigrations\ThemesDataMigration.cs" />
<Compile Include="DesignerNotes\ZoneManagerEvents.cs" />
<Compile Include="Handlers\ThemeSiteSettingsHandler.cs" />
<Compile Include="Handlers\ThemeSiteSettingsPartHandler.cs" />
<Compile Include="Models\Theme.cs" />
<Compile Include="Models\ThemeRecord.cs" />
<Compile Include="Models\ThemeSiteSettings.cs" />
<Compile Include="Models\ThemeSiteSettingsRecord.cs" />
<Compile Include="Models\ThemeSiteSettingsPart.cs" />
<Compile Include="Models\ThemeSiteSettingsPartRecord.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Preview\IPreviewTheme.cs" />
<Compile Include="Preview\PreviewTheme.cs" />

2
src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
View File

@@ -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<ThemeSiteSettings>().Record.CurrentThemeName;
string currentThemeName = CurrentSite.As<ThemeSiteSettingsPart>().Record.CurrentThemeName;
if (String.IsNullOrEmpty(currentThemeName)) {
return null;

4
src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Themes.Services {
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ITheme GetSiteTheme() {
string currentThemeName = CurrentSite.As<ThemeSiteSettings>().Record.CurrentThemeName;
string currentThemeName = CurrentSite.As<ThemeSiteSettingsPart>().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<ThemeSiteSettings>().Record.CurrentThemeName = themeName;
CurrentSite.As<ThemeSiteSettingsPart>().Record.CurrentThemeName = themeName;
}
}

6
src/Orchard/Themes/ITheme.cs
View File

@@ -1,10 +1,8 @@
using Orchard.ContentManagement;
namespace Orchard.Themes {
namespace Orchard.Themes {
/// <summary>
/// Interface provided by the "themes" model.
/// </summary>
public interface ITheme : IContent {
public interface ITheme {
string ThemeName { get; set; }
string DisplayName { get; set; }
string Description { get; set; }