lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#17897: Removing a (featureless) ResourceManifest registration from setup

Browse Source 
Also tidying up some of the related resource usage.

work item: 17897

--HG--
branch : 1.x
This commit is contained in:
Nathan Heskew
2011-06-01 14:07:59 -07:00
parent e353220ecf
commit 172e53dbde
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
View File

@@ -36,7 +36,6 @@ using Orchard.UI.PageTitle;
using Orchard.UI.Resources;
using Orchard.UI.Zones;
using IFilterProvider = Orchard.Mvc.Filters.IFilterProvider;
using ResourceManifest = Orchard.Core.Shapes.ResourceManifest;
namespace Orchard.Setup {
public class SetupMode : Module {
@@ -64,7 +63,6 @@ namespace Orchard.Setup {
builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
builder.RegisterType<ResourceManifest>().As<IResourceManifestProvider>().InstancePerLifetimeScope();
builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope();

4
src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
View File

@@ -1,7 +1,7 @@
@model Orchard.Setup.ViewModels.SetupViewModel
@{
Script.Require("jquery").AtFoot();
Script.Include("setup.js").AtFoot();
Script.Require("jQuery");
Script.Include("setup.js");
}
<h1>@Html.TitleForPage(T("Get Started").ToString())</h1>

4
src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs
View File

@@ -1,4 +1,6 @@
namespace Orchard.UI.Resources {
using Orchard.UI.Resources;
namespace Orchard.jQuery {
public class ResourceManifest : IResourceManifestProvider {
public void BuildManifests(ResourceManifestBuilder builder) {
var manifest = builder.Add();

1
src/Orchard.Web/Themes/SafeMode/Views/Layout.cshtml
View File

@@ -1,6 +1,5 @@
@using Orchard.UI.Resources;
@{
Script.Require("jQuery");
Script.Require("ShapesBase");
Style.Include("site.css");
RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type="text/css", Href = Href("../Styles/ie6.css")}.AddAttribute("media", "screen, projection"));