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

Pulling Themes from Orchard.Core into its own module, Orchard.Themes

Browse Source 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Themes/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs
rename : src/Orchard.Web/Core/Themes/Content/orchard.ico => src/Orchard.Web/Modules/Orchard.Themes/Content/orchard.ico
rename : src/Orchard.Web/Core/Themes/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
rename : src/Orchard.Web/Core/Themes/DesignerNotes/ZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Handlers/ThemeSiteSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs
rename : src/Orchard.Web/Core/Themes/Models/Theme.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettings.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs
rename : src/Orchard.Web/Core/Themes/Module.txt => src/Orchard.Web/Modules/Orchard.Themes/Module.txt
rename : src/Orchard.Web/Core/Themes/Permissions.cs => src/Orchard.Web/Modules/Orchard.Themes/Permissions.cs
rename : src/Orchard.Web/Core/Themes/Preview/IPreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/IPreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewThemeFilter.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
rename : src/Orchard.Web/Core/Themes/Scripts/base.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.min.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.min.js
rename : src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SafeModeThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/SiteThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeService.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarActiveButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarHoverButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/special.css => src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css
rename : src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/PreviewViewModel.cs
rename : src/Orchard.Web/Core/Themes/ViewModels/ThemesIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
rename : src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/ThemePreview.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/Document.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx
rename : src/Orchard.Web/Core/Themes/Views/Header.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
rename : src/Orchard.Web/Core/Themes/Views/Layout.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx
rename : src/Orchard.Web/Core/Themes/Views/Menu.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx
rename : src/Orchard.Web/Core/Themes/Views/Messages.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
rename : src/Orchard.Web/Core/Themes/Views/NotFound.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx
rename : src/Orchard.Web/Core/Themes/Views/User.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Web.config
This commit is contained in:
Nathan Heskew
2010-04-22 14:39:09 -07:00
parent b12ded8eb5
commit 515d687342
54 changed files with 431 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Specs/Setup.feature
View File

@@ -1,4 +1,4 @@
Feature: Setup Feature: Setup
In order to install orchard In order to install orchard
As a new user As a new user
I want to setup a new site from the default screen I want to setup a new site from the default screen
@@ -33,8 +33,8 @@ Scenario: Some of the initial form values are required
Scenario: Calling setup on a brand new install Scenario: Calling setup on a brand new install
Given I have a clean site with Given I have a clean site with
| extension | names | | extension | names |
| module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, TinyMce | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, Orchard.Themes, TinyMce |
| core | Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, Themes, XmlRpc | | core | Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, XmlRpc |
| theme | SafeMode, Classic | | theme | SafeMode, Classic |
And I am on "/Setup" And I am on "/Setup"
When I fill in When I fill in

7
src/Orchard.Specs/Setup.feature.cs generated
View File

@@ -138,12 +138,11 @@ this.ScenarioSetup(scenarioInfo);
"names"}); "names"});
table1.AddRow(new string[] { table1.AddRow(new string[] {
"module", "module",
"Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, Tin" + "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, Orc" +
"yMce"}); "hard.Themes, TinyMce"});
table1.AddRow(new string[] { table1.AddRow(new string[] {
"core", "core",
"Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, Themes, Xml" + "Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, XmlRpc"});
"Rpc"});
table1.AddRow(new string[] { table1.AddRow(new string[] {
"theme", "theme",
"SafeMode, Classic"}); "SafeMode, Classic"});

41
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -128,30 +128,12 @@
<Compile Include="Settings\Topology\Records\TopologyParameterRecord.cs" /> <Compile Include="Settings\Topology\Records\TopologyParameterRecord.cs" />
<Compile Include="Settings\Topology\Records\TopologyRecord.cs" /> <Compile Include="Settings\Topology\Records\TopologyRecord.cs" />
<Compile Include="Settings\Topology\ShellDescriptorManager.cs" /> <Compile Include="Settings\Topology\ShellDescriptorManager.cs" />
<Compile Include="Themes\DesignerNotes\ZoneManagerEvents.cs" />
<Compile Include="Themes\Preview\IPreviewTheme.cs" />
<Compile Include="Themes\Preview\PreviewThemeFilter.cs" />
<Compile Include="Themes\Preview\PreviewTheme.cs" />
<Compile Include="Themes\Services\SafeModeThemeSelector.cs" />
<Compile Include="Settings\AdminMenu.cs" /> <Compile Include="Settings\AdminMenu.cs" />
<Compile Include="Settings\Controllers\AdminController.cs" /> <Compile Include="Settings\Controllers\AdminController.cs" />
<Compile Include="Settings\Handlers\SiteSettingsHandler.cs" /> <Compile Include="Settings\Handlers\SiteSettingsHandler.cs" />
<Compile Include="Settings\Models\SiteSettings.cs" /> <Compile Include="Settings\Models\SiteSettings.cs" />
<Compile Include="Settings\Services\SiteService.cs" /> <Compile Include="Settings\Services\SiteService.cs" />
<Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" /> <Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" />
<Compile Include="Themes\AdminMenu.cs" />
<Compile Include="Themes\Controllers\AdminController.cs" />
<Compile Include="Themes\Models\Theme.cs" />
<Compile Include="Themes\Models\ThemeSiteSettings.cs" />
<Compile Include="Themes\Handlers\ThemeSiteSettingsHandler.cs" />
<Compile Include="Themes\Permissions.cs" />
<Compile Include="Themes\Models\ThemeRecord.cs" />
<Compile Include="Themes\Models\ThemeSiteSettingsRecord.cs" />
<Compile Include="Themes\Services\SiteThemeSelector.cs" />
<Compile Include="Themes\Services\ThemeService.cs" />
<Compile Include="Themes\Services\ThemeZoneManagerEvents.cs" />
<Compile Include="Themes\ViewModels\PreviewViewModel.cs" />
<Compile Include="Themes\ViewModels\ThemesIndexViewModel.cs" />
<Compile Include="XmlRpc\Controllers\HomeController.cs" /> <Compile Include="XmlRpc\Controllers\HomeController.cs" />
<Compile Include="XmlRpc\Controllers\LiveWriterController.cs" /> <Compile Include="XmlRpc\Controllers\LiveWriterController.cs" />
<Compile Include="XmlRpc\IXmlRpcHandler.cs" /> <Compile Include="XmlRpc\IXmlRpcHandler.cs" />
@@ -187,8 +169,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Common\Views\Web.config" /> <Content Include="Common\Views\Web.config" />
<Content Include="Themes\Module.txt" />
<Content Include="Themes\Views\Admin\Index.aspx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Common\Scripts\jquery.slugify.js" /> <Content Include="Common\Scripts\jquery.slugify.js" />
@@ -200,16 +180,6 @@
<Content Include="Navigation\Module.txt" /> <Content Include="Navigation\Module.txt" />
<Content Include="Scheduling\Module.txt" /> <Content Include="Scheduling\Module.txt" />
<Content Include="Settings\Views\EditorTemplates\Items\Settings.Site.ascx" /> <Content Include="Settings\Views\EditorTemplates\Items\Settings.Site.ascx" />
<Content Include="Themes\Views\Admin\ThemePreview.ascx" />
<Content Include="Themes\Views\Admin\Install.aspx" />
<Content Include="Themes\Views\Header.ascx" />
<Content Include="Themes\Views\Document.aspx" />
<Content Include="Themes\Views\HeadPreload.ascx" />
<Content Include="Themes\Views\Layout.ascx" />
<Content Include="Themes\Views\Messages.ascx" />
<Content Include="Themes\Views\User.ascx" />
<Content Include="Themes\Views\Menu.ascx" />
<Content Include="Themes\Views\Web.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Dashboard\Module.txt" /> <Content Include="Dashboard\Module.txt" />
@@ -218,10 +188,6 @@
<Content Include="Navigation\Views\Admin\Index.ascx" /> <Content Include="Navigation\Views\Admin\Index.ascx" />
<Content Include="Navigation\Views\EditorTemplates\Parts\Navigation.EditMenuPart.ascx" /> <Content Include="Navigation\Views\EditorTemplates\Parts\Navigation.EditMenuPart.ascx" />
<Content Include="Navigation\Views\Web.config" /> <Content Include="Navigation\Views\Web.config" />
<Content Include="Themes\Scripts\jquery-1.4.1.js" />
<Content Include="Themes\Scripts\jquery-1.4.1.min.js" />
<Content Include="Themes\Views\EditorTemplates\Items\ContentItem.ascx" />
<Content Include="Themes\Views\DisplayTemplates\Items\ContentItem.ascx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Summary.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Summary.ascx" />
@@ -229,13 +195,6 @@
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.ascx" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.ascx" /> <Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.ascx" />
<Content Include="Dashboard\Views\Web.config" /> <Content Include="Dashboard\Views\Web.config" />
<Content Include="Themes\Styles\Images\toolBarActiveButtonBackground.gif" />
<Content Include="Themes\Styles\Images\toolBarBackground.gif" />
<Content Include="Themes\Styles\Images\toolBarHoverButtonBackground.gif" />
<Content Include="Themes\Content\orchard.ico" />
<Content Include="Themes\Scripts\base.js" />
<Content Include="Themes\Styles\special.css" />
<Content Include="Themes\Views\NotFound.ascx" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />

23
src/Orchard.Web/Core/Themes/ViewModels/CreateThemeViewModel.cs
View File

@@ -1,23 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Web;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Themes.ViewModels {
public class CreateThemeViewModel : AdminViewModel {
[Required]
public string Name { get; set; }
[Required]
public string Author { get; set; }
[Required]
public string Description { get; set; }
[Required]
public string Version { get; set; }
[Required]
public string Tags { get; set; }
[Required]
public string Homepage { get; set; }
}
}

5
src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
View File

@@ -198,9 +198,8 @@
<IISUrl> <IISUrl>
</IISUrl> </IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>True</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>

5
src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
View File

@@ -103,9 +103,8 @@
<IISUrl> <IISUrl>
</IISUrl> </IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>True</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>

4
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -83,9 +83,9 @@ namespace Orchard.Setup.Controllers {
// The vanilla Orchard distibution has the following modules enabled. // The vanilla Orchard distibution has the following modules enabled.
const string hardcoded = @"Orchard.Framework, const string hardcoded = @"Orchard.Framework,
Common,Dashboard,Feeds,HomePage,Navigation,Scheduling,Settings,Themes,XmlRpc, Common,Dashboard,Feeds,HomePage,Navigation,Scheduling,Settings,XmlRpc,
Orchard.Users,Orchard.Roles,TinyMce, Orchard.Users,Orchard.Roles,TinyMce,
Orchard.Pages,Orchard.Comments"; Orchard.Pages,Orchard.Comments,Orchard.Themes";
var shellDescriptor = new ShellDescriptor { var shellDescriptor = new ShellDescriptor {
EnabledFeatures = hardcoded.Split(',').Select(name => new ShellFeature { Name = name.Trim() }) EnabledFeatures = hardcoded.Split(',').Select(name => new ShellFeature { Name = name.Trim() })

8
src/Orchard.Web/Core/Themes/AdminMenu.cs → src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs
View File

@@ -1,14 +1,14 @@
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
namespace Orchard.Core.Themes { namespace Orchard.Themes {
public class AdminMenu : INavigationProvider { public class AdminMenu : INavigationProvider {
public string MenuName { get { return "admin"; } } public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) { public void GetNavigation(NavigationBuilder builder) {
builder.Add("Site", "11", builder.Add("Site", "11",
menu => menu menu => menu
.Add("Manage Themes", "4.0", item => item.Action("Index", "Admin", new { area = "Themes" }) .Add("Manage Themes", "4.0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" })
.Permission(Permissions.ManageThemes).Permission(Permissions.ApplyTheme))); .Permission(Permissions.ManageThemes).Permission(Permissions.ApplyTheme)));
} }
} }
} }

0
src/Orchard.Web/Core/Themes/Content/orchard.ico → src/Orchard.Web/Modules/Orchard.Themes/Content/orchard.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

13
src/Orchard.Web/Core/Themes/Controllers/AdminController.cs → src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
View File

@@ -2,15 +2,14 @@
using System.Reflection; using System.Reflection;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Core.Themes.Preview;
using Orchard.Core.Themes.ViewModels;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Security;
using Orchard.Themes;
using Orchard.UI.Notify;
using Orchard.Mvc.ViewModels; using Orchard.Mvc.ViewModels;
using Orchard.Security;
using Orchard.Themes.Preview;
using Orchard.Themes.ViewModels;
using Orchard.UI.Notify;
namespace Orchard.Core.Themes.Controllers { namespace Orchard.Themes.Controllers {
[ValidateInput(false)] [ValidateInput(false)]
public class AdminController : Controller { public class AdminController : Controller {
private readonly IThemeService _themeService; private readonly IThemeService _themeService;
@@ -158,4 +157,4 @@ namespace Orchard.Core.Themes.Controllers {
} }
} }
} }
} }

17
src/Orchard.Web/Core/Themes/DesignerNotes/ZoneManagerEvents.cs → src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
View File

@@ -2,10 +2,9 @@
using System.Linq; using System.Linq;
using System.Web.Mvc.Html; using System.Web.Mvc.Html;
using Orchard.Security; using Orchard.Security;
using Orchard.Themes;
using Orchard.UI.Zones; using Orchard.UI.Zones;
namespace Orchard.Core.Themes.DesignerNotes { namespace Orchard.Themes.DesignerNotes {
public class ZoneManagerEvents : IZoneManagerEvents { public class ZoneManagerEvents : IZoneManagerEvents {
private readonly IThemeService _themeService; private readonly IThemeService _themeService;
private readonly IAuthorizationService _authorizationService; private readonly IAuthorizationService _authorizationService;
@@ -35,12 +34,12 @@ namespace Orchard.Core.Themes.DesignerNotes {
if (accessAdminPanel) { if (accessAdminPanel) {
writer.Write("<div class=\"managewrapper\"><div class=\"manage\">"); writer.Write("<div class=\"managewrapper\"><div class=\"manage\">");
writer.Write(context.Html.ActionLink("Edit", "AddWidget", new { writer.Write(context.Html.ActionLink("Edit", "AddWidget", new {
Area = "Futures.Widgets", Area = "Futures.Widgets",
Controller = "Admin", Controller = "Admin",
context.ZoneName, context.ZoneName,
theme.ThemeName, theme.ThemeName,
ReturnUrl = requestContext.HttpContext.Request.Url, ReturnUrl = requestContext.HttpContext.Request.Url,
})); }));
writer.Write("</div>"); writer.Write("</div>");
} }
writer.Write(File.ReadAllText(physicalPath)); writer.Write(File.ReadAllText(physicalPath));
@@ -58,4 +57,4 @@ namespace Orchard.Core.Themes.DesignerNotes {
public void ZoneRendered(ZoneRenderContext context) { public void ZoneRendered(ZoneRenderContext context) {
} }
} }
} }

4
src/Orchard.Web/Core/Themes/Handlers/ThemeSiteSettingsHandler.cs → src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs
View File

@@ -1,9 +1,9 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Core.Themes.Models;
using Orchard.Data; using Orchard.Data;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.Themes.Models;
namespace Orchard.Core.Themes.Handlers { namespace Orchard.Themes.Handlers {
[UsedImplicitly] [UsedImplicitly]
public class ThemeSiteSettingsHandler : ContentHandler { public class ThemeSiteSettingsHandler : ContentHandler {
public ThemeSiteSettingsHandler(IRepository<ThemeSiteSettingsRecord> repository) { public ThemeSiteSettingsHandler(IRepository<ThemeSiteSettingsRecord> repository) {

3
src/Orchard.Web/Core/Themes/Models/Theme.cs → src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
View File

@@ -1,7 +1,6 @@
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Themes;
namespace Orchard.Core.Themes.Models { namespace Orchard.Themes.Models {
public class Theme : ContentPart<ThemeRecord>, ITheme { public class Theme : ContentPart<ThemeRecord>, ITheme {
public static readonly ContentType ContentType = new ContentType { Name = "theme", DisplayName = "Themes" }; public static readonly ContentType ContentType = new ContentType { Name = "theme", DisplayName = "Themes" };

2
src/Orchard.Web/Core/Themes/Models/ThemeRecord.cs → src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs
View File

@@ -1,6 +1,6 @@
using Orchard.ContentManagement.Records; using Orchard.ContentManagement.Records;
namespace Orchard.Core.Themes.Models { namespace Orchard.Themes.Models {
public class ThemeRecord : ContentPartRecord { public class ThemeRecord : ContentPartRecord {
public virtual string ThemeName { get; set; } public virtual string ThemeName { get; set; }
public virtual string DisplayName { get; set; } public virtual string DisplayName { get; set; }

4
src/Orchard.Web/Core/Themes/Models/ThemeSiteSettings.cs → src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs
View File

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

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

@@ -1,6 +1,6 @@
using Orchard.ContentManagement.Records; using Orchard.ContentManagement.Records;
namespace Orchard.Core.Themes.Models { namespace Orchard.Themes.Models {
public class ThemeSiteSettingsRecord : ContentPartRecord { public class ThemeSiteSettingsRecord : ContentPartRecord {
public virtual string CurrentThemeName { get; set; } public virtual string CurrentThemeName { get; set; }
} }

0
src/Orchard.Web/Core/Themes/Module.txt → src/Orchard.Web/Modules/Orchard.Themes/Module.txt
View File

145
src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj Normal file
View File

@@ -0,0 +1,145 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CDE24A24-01D3-403C-84B9-37722E18DFB7}</ProjectGuid>
<ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orchard.Themes</RootNamespace>
<AssemblyName>Orchard.Themes</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET MVC 2\\Assemblies\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Web.Mobile" />
</ItemGroup>
<ItemGroup>
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="DesignerNotes\ZoneManagerEvents.cs" />
<Compile Include="Handlers\ThemeSiteSettingsHandler.cs" />
<Compile Include="Models\Theme.cs" />
<Compile Include="Models\ThemeRecord.cs" />
<Compile Include="Models\ThemeSiteSettings.cs" />
<Compile Include="Models\ThemeSiteSettingsRecord.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Preview\IPreviewTheme.cs" />
<Compile Include="Preview\PreviewTheme.cs" />
<Compile Include="Preview\PreviewThemeFilter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\SafeModeThemeSelector.cs" />
<Compile Include="Services\SiteThemeSelector.cs" />
<Compile Include="Services\ThemeService.cs" />
<Compile Include="Services\ThemeZoneManagerEvents.cs" />
<Compile Include="ViewModels\PreviewViewModel.cs" />
<Compile Include="ViewModels\ThemesIndexViewModel.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\orchard.ico" />
<Content Include="Scripts\base.js" />
<Content Include="Scripts\jquery-1.4.1.js" />
<Content Include="Scripts\jquery-1.4.1.min.js" />
<Content Include="Styles\Images\toolBarActiveButtonBackground.gif" />
<Content Include="Styles\Images\toolBarBackground.gif" />
<Content Include="Styles\Images\toolBarHoverButtonBackground.gif" />
<Content Include="Styles\special.css" />
<Content Include="Views\Admin\Index.aspx" />
<Content Include="Views\Admin\Install.aspx" />
<Content Include="Views\Admin\ThemePreview.ascx" />
<Content Include="Views\DisplayTemplates\Items\ContentItem.ascx" />
<Content Include="Views\Document.aspx" />
<Content Include="Views\EditorTemplates\Items\ContentItem.ascx" />
<Content Include="Views\Header.ascx" />
<Content Include="Views\HeadPreload.ascx" />
<Content Include="Views\Layout.ascx" />
<Content Include="Views\Menu.ascx" />
<Content Include="Views\Messages.ascx" />
<Content Include="Views\NotFound.ascx" />
<Content Include="Views\User.ascx" />
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Views\Web.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target> -->
<Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
</Target>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>20578</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>True</UseCustomServer>
<CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

18
src/Orchard.Web/Core/Themes/Permissions.cs → src/Orchard.Web/Modules/Orchard.Themes/Permissions.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Orchard.Security.Permissions; using Orchard.Security.Permissions;
namespace Orchard.Core.Themes { namespace Orchard.Themes {
public class Permissions : IPermissionProvider { public class Permissions : IPermissionProvider {
public static readonly Permission ManageThemes = new Permission { Description = "Manage Themes", Name = "ManageThemes" }; public static readonly Permission ManageThemes = new Permission { Description = "Manage Themes", Name = "ManageThemes" };
public static readonly Permission ApplyTheme = new Permission { Description = "Apply a Theme", Name = "ApplyTheme" }; public static readonly Permission ApplyTheme = new Permission { Description = "Apply a Theme", Name = "ApplyTheme" };
@@ -14,18 +14,18 @@ namespace Orchard.Core.Themes {
public IEnumerable<Permission> GetPermissions() { public IEnumerable<Permission> GetPermissions() {
return new Permission[] { return new Permission[] {
ManageThemes, ManageThemes,
ApplyTheme, ApplyTheme,
}; };
} }
public IEnumerable<PermissionStereotype> GetDefaultStereotypes() { public IEnumerable<PermissionStereotype> GetDefaultStereotypes() {
return new[] { return new[] {
new PermissionStereotype { new PermissionStereotype {
Name = "Administrator", Name = "Administrator",
Permissions = new[] {ManageThemes, ApplyTheme} Permissions = new[] {ManageThemes, ApplyTheme}
}, },
}; };
} }
} }
} }

2
src/Orchard.Web/Core/Themes/Preview/IPreviewTheme.cs → src/Orchard.Web/Modules/Orchard.Themes/Preview/IPreviewTheme.cs
View File

@@ -1,4 +1,4 @@
namespace Orchard.Core.Themes.Preview { namespace Orchard.Themes.Preview {
public interface IPreviewTheme : IDependency { public interface IPreviewTheme : IDependency {
string GetPreviewTheme(); string GetPreviewTheme();
void SetPreviewTheme(string themeName); void SetPreviewTheme(string themeName);

3
src/Orchard.Web/Core/Themes/Preview/PreviewTheme.cs → src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewTheme.cs
View File

@@ -1,9 +1,8 @@
using System; using System;
using System.Web; using System.Web;
using System.Web.Routing; using System.Web.Routing;
using Orchard.Themes;
namespace Orchard.Core.Themes.Preview { namespace Orchard.Themes.Preview {
public class PreviewTheme : IPreviewTheme, IThemeSelector { public class PreviewTheme : IPreviewTheme, IThemeSelector {
private static readonly string PreviewThemeKey = typeof(PreviewTheme).FullName; private static readonly string PreviewThemeKey = typeof(PreviewTheme).FullName;
private readonly HttpContextBase _httpContext; private readonly HttpContextBase _httpContext;

19
src/Orchard.Web/Core/Themes/Preview/PreviewThemeFilter.cs → src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
View File

@@ -1,11 +1,10 @@
using System.Linq; using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Core.Themes.ViewModels;
using Orchard.Mvc.Filters; using Orchard.Mvc.Filters;
using Orchard.Mvc.ViewModels; using Orchard.Mvc.ViewModels;
using Orchard.Themes; using Orchard.Themes.ViewModels;
namespace Orchard.Core.Themes.Preview { namespace Orchard.Themes.Preview {
public class PreviewThemeFilter : FilterProvider, IResultFilter { public class PreviewThemeFilter : FilterProvider, IResultFilter {
private readonly IThemeService _themeService; private readonly IThemeService _themeService;
private readonly IPreviewTheme _previewTheme; private readonly IPreviewTheme _previewTheme;
@@ -26,12 +25,12 @@ namespace Orchard.Core.Themes.Preview {
var themes = _themeService.GetInstalledThemes(); var themes = _themeService.GetInstalledThemes();
var model = new PreviewViewModel { var model = new PreviewViewModel {
Themes = themes.Select(theme => new SelectListItem { Themes = themes.Select(theme => new SelectListItem {
Text = theme.DisplayName, Text = theme.DisplayName,
Value = theme.ThemeName, Value = theme.ThemeName,
Selected = theme.ThemeName == previewThemeName Selected = theme.ThemeName == previewThemeName
}) })
}; };
baseViewModel.Zones.AddRenderPartial("body:before", "Admin/ThemePreview", model); baseViewModel.Zones.AddRenderPartial("body:before", "Admin/ThemePreview", model);
} }
@@ -39,4 +38,4 @@ namespace Orchard.Core.Themes.Preview {
} }
} }
} }

35
src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs Normal file
View File

@@ -0,0 +1,35 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Orchard.Themes")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Orchard.Themes")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3d727a0c-4b37-4081-bef6-68e68a3bae9b")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0
src/Orchard.Web/Core/Themes/Scripts/base.js → src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
View File

0
src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.js → src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.js vendored
View File

0
src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.min.js → src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.min.js vendored
View File

3
src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs → src/Orchard.Web/Modules/Orchard.Themes/Services/SafeModeThemeSelector.cs
View File

@@ -1,8 +1,7 @@
using System.Web.Routing; using System.Web.Routing;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Themes;
namespace Orchard.Core.Themes.Services { namespace Orchard.Themes.Services {
[UsedImplicitly] [UsedImplicitly]
public class SafeModeThemeSelector : IThemeSelector { public class SafeModeThemeSelector : IThemeSelector {
public ThemeSelectorResult GetTheme(RequestContext context) { public ThemeSelectorResult GetTheme(RequestContext context) {

7
src/Orchard.Web/Core/Themes/Services/SiteThemeSelector.cs → src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
View File

@@ -1,12 +1,11 @@
using System; using System;
using System.Web.Routing; using System.Web.Routing;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Core.Themes.Models;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Settings; using Orchard.Settings;
using Orchard.Themes; using Orchard.Themes.Models;
namespace Orchard.Core.Themes.Services { namespace Orchard.Themes.Services {
[UsedImplicitly] [UsedImplicitly]
public class SiteThemeSelector : IThemeSelector { public class SiteThemeSelector : IThemeSelector {
@@ -22,4 +21,4 @@ namespace Orchard.Core.Themes.Services {
return new ThemeSelectorResult { Priority = -5, ThemeName = currentThemeName }; return new ThemeSelectorResult { Priority = -5, ThemeName = currentThemeName };
} }
} }
} }

37
src/Orchard.Web/Core/Themes/Services/ThemeService.cs → src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
View File

@@ -8,10 +8,9 @@ using Orchard.Environment.Extensions;
using Orchard.Logging; using Orchard.Logging;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Settings; using Orchard.Settings;
using Orchard.Themes; using Orchard.Themes.Models;
using Orchard.Core.Themes.Models;
namespace Orchard.Core.Themes.Services { namespace Orchard.Themes.Services {
[UsedImplicitly] [UsedImplicitly]
public class ThemeService : IThemeService { public class ThemeService : IThemeService {
private readonly IExtensionManager _extensionManager; private readonly IExtensionManager _extensionManager;
@@ -67,14 +66,14 @@ namespace Orchard.Core.Themes.Services {
foreach (var descriptor in _extensionManager.AvailableExtensions()) { foreach (var descriptor in _extensionManager.AvailableExtensions()) {
if (String.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase)) { if (String.Equals(descriptor.Name, name, StringComparison.OrdinalIgnoreCase)) {
return new Theme { return new Theme {
Author = descriptor.Author ?? String.Empty, Author = descriptor.Author ?? String.Empty,
Description = descriptor.Description ?? String.Empty, Description = descriptor.Description ?? String.Empty,
DisplayName = descriptor.DisplayName ?? String.Empty, DisplayName = descriptor.DisplayName ?? String.Empty,
HomePage = descriptor.WebSite ?? String.Empty, HomePage = descriptor.WebSite ?? String.Empty,
ThemeName = descriptor.Name, ThemeName = descriptor.Name,
Version = descriptor.Version ?? String.Empty, Version = descriptor.Version ?? String.Empty,
Tags = descriptor.Tags ?? String.Empty Tags = descriptor.Tags ?? String.Empty
}; };
} }
} }
return null; return null;
@@ -85,14 +84,14 @@ namespace Orchard.Core.Themes.Services {
foreach (var descriptor in _extensionManager.AvailableExtensions()) { foreach (var descriptor in _extensionManager.AvailableExtensions()) {
if (String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) { if (String.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
Theme theme = new Theme { Theme theme = new Theme {
Author = descriptor.Author ?? String.Empty, Author = descriptor.Author ?? String.Empty,
Description = descriptor.Description ?? String.Empty, Description = descriptor.Description ?? String.Empty,
DisplayName = descriptor.DisplayName ?? String.Empty, DisplayName = descriptor.DisplayName ?? String.Empty,
HomePage = descriptor.WebSite ?? String.Empty, HomePage = descriptor.WebSite ?? String.Empty,
ThemeName = descriptor.Name, ThemeName = descriptor.Name,
Version = descriptor.Version ?? String.Empty, Version = descriptor.Version ?? String.Empty,
Tags = descriptor.Tags ?? String.Empty Tags = descriptor.Tags ?? String.Empty
}; };
if (!theme.Tags.Contains("hidden")) { if (!theme.Tags.Contains("hidden")) {
themes.Add(theme); themes.Add(theme);
} }

2
src/Orchard.Web/Core/Themes/Services/ThemeZoneManagerEvents.cs → src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeZoneManagerEvents.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Localization; using Orchard.Localization;
using Orchard.UI.Zones; using Orchard.UI.Zones;
namespace Orchard.Core.Themes.Services { namespace Orchard.Themes.Services {
public class ThemeZoneManagerEvents : IZoneManagerEvents { public class ThemeZoneManagerEvents : IZoneManagerEvents {
public ThemeZoneManagerEvents() { public ThemeZoneManagerEvents() {
T = NullLocalizer.Instance; T = NullLocalizer.Instance;

0
src/Orchard.Web/Core/Themes/Styles/Images/toolBarActiveButtonBackground.gif → src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

0
src/Orchard.Web/Core/Themes/Styles/Images/toolBarBackground.gif → src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

0
src/Orchard.Web/Core/Themes/Styles/Images/toolBarHoverButtonBackground.gif → src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 B

After

Width:  |  Height:  |  Size: 79 B

0
src/Orchard.Web/Core/Themes/Styles/special.css → src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css
View File

4
src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs → src/Orchard.Web/Modules/Orchard.Themes/ViewModels/PreviewViewModel.cs
View File

@@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Web.Mvc; using System.Web.Mvc;
namespace Orchard.Core.Themes.ViewModels { namespace Orchard.Themes.ViewModels {
public class PreviewViewModel { public class PreviewViewModel {
public IEnumerable<SelectListItem> Themes { get; set; } public IEnumerable<SelectListItem> Themes { get; set; }
} }
} }

5
src/Orchard.Web/Core/Themes/ViewModels/ThemesIndexViewModel.cs → src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
View File

@@ -1,10 +1,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using Orchard.Mvc.ViewModels; using Orchard.Mvc.ViewModels;
using Orchard.Themes;
namespace Orchard.Core.Themes.ViewModels { namespace Orchard.Themes.ViewModels {
public class ThemesIndexViewModel : BaseViewModel { public class ThemesIndexViewModel : BaseViewModel {
public ITheme CurrentTheme { get; set; } public ITheme CurrentTheme { get; set; }
public IEnumerable<ITheme> Themes { get; set; } public IEnumerable<ITheme> Themes { get; set; }
} }
} }

4
src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx → src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ThemesIndexViewModel>" %> <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ThemesIndexViewModel>" %>
<%@ Import Namespace="Orchard.Themes"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Core.Themes.ViewModels"%> <%@ Import Namespace="Orchard.Themes.ViewModels"%>
<h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1> <h1><%=Html.TitleForPage(T("Manage Themes").ToString()) %></h1>
<% if (Model.CurrentTheme == null) { <% if (Model.CurrentTheme == null) {
%><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.") %><p><%=_Encoded("There is no current theme in the application. The built-in theme will be used.")

1
src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx → src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.aspx
View File

@@ -1,4 +1,5 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<object>" %> <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<object>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<h1><%=Html.TitleForPage(T("Install Theme").ToString()) %></h1> <h1><%=Html.TitleForPage(T("Install Theme").ToString()) %></h1>
<% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> <% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%>
<%=Html.ValidationSummary() %> <%=Html.ValidationSummary() %>

5
src/Orchard.Web/Core/Themes/Views/Admin/ThemePreview.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
View File

@@ -1,5 +1,6 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<PreviewViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<PreviewViewModel>" %>
<%@ Import Namespace="Orchard.Core.Themes.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Themes.ViewModels"%>
<style type="text/css"> <style type="text/css">
#themepreview, #themepreview fieldset, #themepreview input, #themepreview select #themepreview, #themepreview fieldset, #themepreview input, #themepreview select
{ {
@@ -24,7 +25,7 @@ html.dyn #themepreview button.preview { display:none; }
</style> </style>
<div id="themepreview"> <div id="themepreview">
<% using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Themes"}), FormMethod.Post, new { @class = "inline" })) { %> <% using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { %>
<fieldset> <fieldset>
<span><%=T("You are previewing: ")%></span> <span><%=T("You are previewing: ")%></span>
<%=Html.DropDownList("ThemeName", Model.Themes, new {onChange = "this.form.submit();"})%> <%=Html.DropDownList("ThemeName", Model.Themes, new {onChange = "this.form.submit();"})%>

1
src/Orchard.Web/Core/Themes/Views/DisplayTemplates/Items/ContentItem.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% Html.Zone("primary"); <% Html.Zone("primary");
Html.ZonesAny(); %> Html.ZonesAny(); %>

0
src/Orchard.Web/Core/Themes/Views/Document.aspx → src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx
View File

1
src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<% Html.Zone("primary"); <% Html.Zone("primary");
Html.ZonesAny(); %> Html.ZonesAny(); %>

3
src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %><% <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%><%
// a CSS file for styling things (e.g. content item edit buttons) for users with elevated privileges (in this case, anyone who is authenticated) // a CSS file for styling things (e.g. content item edit buttons) for users with elevated privileges (in this case, anyone who is authenticated)
if (Request.IsAuthenticated) { Html.RegisterStyle("special.css"); } if (Request.IsAuthenticated) { Html.RegisterStyle("special.css"); }

1
src/Orchard.Web/Core/Themes/Views/Header.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
View File

@@ -1,2 +1,3 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<div id="title"><%=Html.Encode(Html.SiteName()) %></div> <div id="title"><%=Html.Encode(Html.SiteName()) %></div>

1
src/Orchard.Web/Core/Themes/Views/Layout.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %> <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%><% <%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
Html.RegisterStyle("site.css"); Html.RegisterStyle("site.css");
Model.Zones.AddRenderPartial("header", "Header", Model); Model.Zones.AddRenderPartial("header", "Header", Model);

1
src/Orchard.Web/Core/Themes/Views/Menu.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BaseViewModel>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%><% <%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
var menu = Model.Menu.FirstOrDefault(); var menu = Model.Menu.FirstOrDefault();
if (menu != null && menu.Items.Count() > 0) { %> if (menu != null && menu.Items.Count() > 0) { %>

0
src/Orchard.Web/Core/Themes/Views/Messages.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
View File

1
src/Orchard.Web/Core/Themes/Views/NotFound.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx
View File

@@ -1,4 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h1><%=Html.TitleForPage(T("Not found").ToString()) %></h1> <h1><%=Html.TitleForPage(T("Not found").ToString()) %></h1>
<p><%=_Encoded("The page you are looking for does not exist.")%></p> <p><%=_Encoded("The page you are looking for does not exist.")%></p>

0
src/Orchard.Web/Core/Themes/Views/User.ascx → src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx
View File

0
src/Orchard.Web/Core/Themes/Views/Web.config → src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
View File

140
src/Orchard.Web/Modules/Orchard.Themes/Web.config Normal file
View File

@@ -0,0 +1,140 @@
<?xml version="1.0"?>
<!--
Note: As an alternative to hand editing this file you can use the
web admin tool to configure settings for your application. Use
the Website->Asp.Net Configuration option in Visual Studio.
A full list of settings and comments can be found in
machine.config.comments usually located in
\Windows\Microsoft.Net\Framework\v2.x\Config
-->
<configuration>
<configSections>
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
</sectionGroup>
</sectionGroup>
</sectionGroup>
</configSections>
<appSettings/>
<connectionStrings>
<add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
</connectionStrings>
<system.web>
<!--
Set compilation debug="true" to insert debugging
symbols into the compiled page. Because this
affects performance, set this value to true only
during development.
-->
<compilation debug="false">
<assemblies>
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
</assemblies>
</compilation>
<pages>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</controls>
<namespaces>
<add namespace="System.Web.Mvc"/>
<add namespace="System.Web.Mvc.Ajax"/>
<add namespace="System.Web.Mvc.Html"/>
<add namespace="System.Web.Routing"/>
<add namespace="System.Linq"/>
<add namespace="System.Collections.Generic"/>
</namespaces>
</pages>
<httpHandlers>
<remove verb="*" path="*.asmx"/>
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
</httpHandlers>
<httpModules>
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</httpModules>
</system.web>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v3.5"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"
type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v3.5"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
</system.codedom>
<system.web.extensions/>
<!--
The system.webServer section is required for running ASP.NET AJAX under Internet
Information Services 7.0. It is not necessary for previous version of IIS.
-->
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<modules runAllManagedModulesForAllRequests="true">
<remove name="ScriptModule" />
<remove name="UrlRoutingModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</modules>
<handlers>
<remove name="WebServiceHandlerFactory-Integrated"/>
<remove name="ScriptHandlerFactory" />
<remove name="ScriptHandlerFactoryAppServices" />
<remove name="ScriptResource" />
<remove name="UrlRoutingHandler" />
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</handlers>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -146,6 +146,10 @@
<Project>{5D0F00F0-26C9-4785-AD61-B85710C60EB0}</Project> <Project>{5D0F00F0-26C9-4785-AD61-B85710C60EB0}</Project>
<Name>Orchard.Tags</Name> <Name>Orchard.Tags</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="Modules\Orchard.Themes\Orchard.Themes.csproj">
<Project>{CDE24A24-01D3-403C-84B9-37722E18DFB7}</Project>
<Name>Orchard.Themes</Name>
</ProjectReference>
<ProjectReference Include="Modules\Orchard.Users\Orchard.Users.csproj"> <ProjectReference Include="Modules\Orchard.Users\Orchard.Users.csproj">
<Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project> <Project>{79AED36E-ABD0-4747-93D3-8722B042454B}</Project>
<Name>Orchard.Users</Name> <Name>Orchard.Users</Name>

4
src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
View File

@@ -5,10 +5,10 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels" %> <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
<%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Mvc.Html" %>
<% //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...) <% //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...)
var jquery = ResolveUrl("~/Core/Themes/Scripts/jquery-1.4.1.js"); var jquery = ResolveUrl("~/Modules/Orchard.Themes/Scripts/jquery-1.4.1.js");
Model.Zones.AddAction("head:scripts", html => Model.Zones.AddAction("head:scripts", html =>
html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + jquery + @"""></script>")); html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + jquery + @"""></script>"));
var basejs = ResolveUrl("~/Core/Themes/Scripts/base.js"); var basejs = ResolveUrl("~/Modules/Orchard.Themes/Scripts/base.js");
Model.Zones.AddAction("content:after", html => Model.Zones.AddAction("content:after", html =>
html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + basejs + @"""></script>")); html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + basejs + @"""></script>"));
var setupjs = ResolveUrl("~/Modules/Orchard.Setup/Scripts/setup.js"); var setupjs = ResolveUrl("~/Modules/Orchard.Setup/Scripts/setup.js");

7
src/Orchard.sln
View File

@@ -57,6 +57,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard", "Tools\Orchard\Or
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MultiTenancy", "Orchard.Web\Modules\Orchard.MultiTenancy\Orchard.MultiTenancy.csproj", "{72457126-E118-4171-A08F-9A709EE4B7FC}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MultiTenancy", "Orchard.Web\Modules\Orchard.MultiTenancy\Orchard.MultiTenancy.csproj", "{72457126-E118-4171-A08F-9A709EE4B7FC}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Themes", "Orchard.Web\Modules\Orchard.Themes\Orchard.Themes.csproj", "{CDE24A24-01D3-403C-84B9-37722E18DFB7}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -159,6 +161,10 @@ Global
{72457126-E118-4171-A08F-9A709EE4B7FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {72457126-E118-4171-A08F-9A709EE4B7FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72457126-E118-4171-A08F-9A709EE4B7FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {72457126-E118-4171-A08F-9A709EE4B7FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72457126-E118-4171-A08F-9A709EE4B7FC}.Release|Any CPU.Build.0 = Release|Any CPU {72457126-E118-4171-A08F-9A709EE4B7FC}.Release|Any CPU.Build.0 = Release|Any CPU
{CDE24A24-01D3-403C-84B9-37722E18DFB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDE24A24-01D3-403C-84B9-37722E18DFB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDE24A24-01D3-403C-84B9-37722E18DFB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CDE24A24-01D3-403C-84B9-37722E18DFB7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -181,6 +187,7 @@ Global
{4A9C04A6-0986-4A92-A610-5F59FF273FB9} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {4A9C04A6-0986-4A92-A610-5F59FF273FB9} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{72457126-E118-4171-A08F-9A709EE4B7FC} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {72457126-E118-4171-A08F-9A709EE4B7FC} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{CDE24A24-01D3-403C-84B9-37722E18DFB7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{5E5E7A21-C7B2-44D8-8593-2F9541AE041D} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {5E5E7A21-C7B2-44D8-8593-2F9541AE041D} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
{4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
{33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452}