Merge

--HG--
branch : dev

src/Orchard.Web/Core/ContentsLocation/ContentsLocationResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Core.ContentsLocation {
+    public class ContentsLocationResourceManifest : ResourceManifest {
+        public ContentsLocationResourceManifest() {
+            DefineStyle("ContentsLocationAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.Core.ContentsLocation.ViewModels.LocationSettingsViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentsLocationAdmin");
     <fieldset class="location-setting">
         <legend>@T("{0}", Model.Definition.DisplayName)</legend>
         <fieldset>

src/Orchard.Web/Core/Localization/Resources/LocalizationResourceManifest.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Core.Localization.Resources {
+    public class LocalizationResourceManifest : ResourceManifest {
+        public LocalizationResourceManifest() {
+            // todo: move this file
+            DefineStyle("Localization").SetUrl("base.css");
+            DefineStyle("LocalizationAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("LocalizationAdmin");
 <div class="content-localization">
     @if (Model.Localizations.Count() > 0) {
     //todo: need this info in the view model

src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel
-@Html.RegisterStyle("base.css");
+@Style.Require("Localization");
 @if (Model.Localizations.Count() > 0) {
 <div class="content-localization">
     <div class="content-localizations">

src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.Translation.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Core.Localization.ViewModels.EditLocalizationViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("LocalizationAdmin");
 @if (Model.ContentItem.ContentItem.Id > 0 && Model.SelectedCulture != null && Model.ContentLocalizations.Localizations.Count() > 0) {
-Html.RegisterStyle("base.css");
+Style.Require("Localization");
 <fieldset class="localization culture-selection">
     <fieldset class="culture-selected">
         <label for="SelectedCulture">@T("Content Localization")</label>

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -74,6 +74,7 @@
     <Compile Include="Common\Fields\TextField.cs" />
     <Compile Include="Common\Security\AuthorizationEventHandler.cs" />
     <Compile Include="Common\Services\BbcodeFilter.cs" />
+    <Compile Include="ContentsLocation\ContentsLocationResourceManifest.cs" />
     <Compile Include="ContentsLocation\Models\LocationDefinition.cs" />
     <Compile Include="Common\Services\ICommonService.cs" />
     <Compile Include="Common\Services\CommonService.cs" />
@@ -94,6 +95,7 @@
     <Compile Include="Contents\Settings\ContentPartSettings.cs" />
     <Compile Include="Contents\Shapes.cs" />
     <Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
+    <Compile Include="Localization\Resources\LocalizationResourceManifest.cs" />
     <Compile Include="Localization\ViewModels\EditLocalizationViewModel.cs" />
     <Compile Include="Messaging\DataMigrations\MessagingDataMigration.cs" />
     <Compile Include="Messaging\Drivers\MessageSettingsPartDriver.cs" />
@@ -102,6 +104,7 @@
     <Compile Include="Messaging\Models\MessageSettingsPartRecord.cs" />
     <Compile Include="Messaging\Services\DefaultMessageManager.cs" />
     <Compile Include="Messaging\ViewModels\MessageSettingsPartViewModel.cs" />
+    <Compile Include="PublishLater\PublishLaterResourceManifest.cs" />
     <Compile Include="PublishLater\DataMigrations\PublishLaterDataMigration.cs" />
     <Compile Include="PublishLater\Drivers\PublishLaterPartDriver.cs" />
     <Compile Include="PublishLater\Models\PublishLaterPart.cs" />
@@ -109,6 +112,7 @@
     <Compile Include="PublishLater\Services\PublishLaterService.cs" />
     <Compile Include="PublishLater\Services\IPublishLaterService.cs" />
     <Compile Include="PublishLater\ViewModels\PublishLaterViewModel.cs" />
+    <Compile Include="Routable\RoutableResourceManifest.cs" />
     <Compile Include="Routable\Services\RoutableHomePageProvider.cs" />
     <Compile Include="Contents\ViewModels\ListContentsViewModel.cs" />
     <Compile Include="Contents\ViewModels\ListContentTypesViewModel.cs" />
@@ -203,6 +207,7 @@
     <Compile Include="Scheduling\Services\ScheduledTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
     <Compile Include="Scheduling\Models\Task.cs" />
+    <Compile Include="Settings\SettingsResourceManifest.cs" />
     <Compile Include="Settings\DataMigrations\SettingsDataMigration.cs" />
     <Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />
     <Compile Include="Settings\ViewModels\SiteCulturesViewModel.cs" />
@@ -267,8 +272,8 @@
     <Content Include="PublishLater\Content\Admin\images\online.gif" />
     <Content Include="PublishLater\Content\Admin\images\published.gif" />
     <Content Include="PublishLater\Content\Admin\images\scheduled.gif" />
-    <Content Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.ascx" />
-    <Content Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.SummaryAdmin.ascx" />
+    <None Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.cshtml" />
+    <None Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.SummaryAdmin.cshtml" />
     <None Include="Common\Views\EditorTemplates\Fields\Common.TextField.cshtml" />
     <None Include="Common\Views\EditorTemplates\Parts\Common.Container.cshtml" />
     <None Include="Common\Views\EditorTemplates\PlainTextEditor.cshtml" />
@@ -301,7 +306,7 @@
     <Content Include="PublishLater\Styles\jquery-ui-1.7.2.custom.css" />
     <Content Include="PublishLater\Styles\ui.datepicker.css" />
     <Content Include="PublishLater\Styles\ui.timepickr.css" />
-    <Content Include="PublishLater\Views\EditorTemplates\Parts\PublishLater.ascx" />
+    <None Include="PublishLater\Views\EditorTemplates\Parts\PublishLater.cshtml" />
     <Content Include="Reports\Module.txt" />
     <None Include="Contents\Views\Items\Content-HomePage.cshtml" />
     <None Include="Reports\Views\Admin\Display.cshtml" />
@@ -337,7 +342,8 @@
     <Content Include="Shapes\Views\DisplayTemplates\Items\ContentItem.ascx" />
     <Content Include="Shapes\Views\EditorTemplates\Items\ContentItem.ascx" />
     <Content Include="Shapes\Views\HeadPreload.ascx" />
-    <Content Include="Shapes\Views\NotFound.ascx" />
+    <None Include="Shapes\Views\Message.cshtml" />
+    <None Include="Shapes\Views\NotFound.cshtml" />
     <Content Include="Shapes\Views\UI\Switchable.ascx" />
     <Content Include="Web.config" />
     <Content Include="XmlRpc\Module.txt" />
@@ -407,7 +413,6 @@
     <None Include="Shapes\Views\Layout.cshtml" />
     <None Include="Shapes\Views\Menu.cshtml" />
     <None Include="Shapes\Views\MenuItem.cshtml" />
-    <None Include="Shapes\Views\Messages.ascx_" />
     <Content Include="Shapes\Views\Web.config" />
     <None Include="Shapes\Views\Zone.cshtml" />
   </ItemGroup>

src/Orchard.Web/Core/PublishLater/Module.txt

@@ -9,4 +9,4 @@ features:
     PublishLater:
         Description: Draft creation and scheduled publishing.
         Category: Content
-        Dependencies: Common, Settings
+        Dependencies: Common, Settings, Scheduling

src/Orchard.Web/Core/PublishLater/PublishLaterResourceManifest.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Core.PublishLater {
+    public class PublishLaterResourceManifest : ResourceManifest {
+        public PublishLaterResourceManifest() {
+            DefineStyle("PublishLater_DatePicker").SetUrl("datetime.css");
+
+            // todo: move into Orchard.jQuery module and also include min versions
+            DefineStyle("jQueryUtils_TimePicker").SetUrl("ui.timepickr.css");
+            DefineStyle("jQueryUI_Orchard").SetUrl("jquery-ui-1.7.2.custom.css").SetVersion("1.7.2");
+            DefineStyle("jQueryUI_DatePicker").SetUrl("ui.datepicker.css").SetDependencies("jQueryUI_Orchard").SetVersion("1.7.2");
+
+            DefineScript("jQueryUtils").SetUrl("jquery.utils.js").SetDependencies("jQuery");
+            DefineScript("jQueryUI_Core").SetUrl("jquery.ui.core.js").SetVersion("1.8b1").SetDependencies("jQuery");
+            DefineScript("jQueryUI_Widget").SetUrl("jquery.ui.widget.js").SetVersion("1.8b1").SetDependencies("jQuery");
+            DefineScript("jQueryUI_DatePicker").SetUrl("jquery.ui.datepicker.js").SetVersion("1.8b1").SetDependencies("jQueryUI_Core", "jQueryUI_Widget");
+            DefineScript("jQueryUtils_TimePicker").SetUrl("ui.timepickr.js").SetVersion("0.7.0a").SetDependencies("jQueryUtils", "jQueryUI_Core");
+        }
+    }
+}

src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.ascx

@@ -1,31 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel>" %>
-    <ul class="pageStatus">
-        <li><%
-        // Published or not
-        if (Model.HasPublished) { %>
-            <img class="icon" src="<%=ResolveUrl("~/Core/PublishLater/Content/Admin/images/online.gif") %>" alt="<%:T("Online") %>" title="<%:T("The page is currently online") %>" /> <%:T("Published") %>&nbsp;&#124;&nbsp;<%
-        }
-        else { %>
-            <img class="icon" src="<%=ResolveUrl("~/Core/PublishLater/Content/Admin/images/offline.gif") %>" alt="<%:T("Offline") %>" title="<%:T("The page is currently offline") %>" /> <%:T("Not Published") %>&nbsp;&#124;&nbsp;<%
-        } %>
-        </li>
-        <li><%
-        // Does the page have a draft
-        if (Model.HasDraft) { %>
-            <img class="icon" src="<%=ResolveUrl("~/Core/PublishLater/Content/Admin/images/draft.gif") %>" alt="<%:T("Draft") %>" title="<%:T("The page has a draft") %>" /><%:T("Draft") %>&nbsp;&#124;&nbsp;<%
-        }
-        else { %>
-            <%:T("No Draft") %>&nbsp;&#124;&nbsp;<%
-        } %>
-        </li>
-        <li><%
-    if ((Model.ScheduledPublishUtc.HasValue && Model.ScheduledPublishUtc.Value > DateTime.UtcNow) || (Model.IsPublished && Model.VersionPublishedUtc.HasValue)) {
-        if (Model.IsPublished && Model.VersionPublishedUtc.HasValue) { %>
-            <%:T("Published: {0}", Html.DateTimeRelative(Model.VersionPublishedUtc.Value, T)) %><%
-        }
-        else { %>
-            <img class="icon" src="<%=ResolveUrl("~/Core/PublishLater/Content/Admin/images/scheduled.gif") %>" alt="<%:T("Scheduled") %>" title="<%:T("The page is scheduled for publishing") %>" /><%:T("Scheduled") %>
-        <%:Html.DateTime(Model.ScheduledPublishUtc.Value, T("M/d/yyyy h:mm tt")) %><%
-        } %>&nbsp;&#124;&nbsp;</li><%
-    } %>
-    </ul>

src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml

@@ -0,0 +1,30 @@
+@model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel
+    <ul class="pageStatus">
+        <li>@// Published or not
+        @if (Model.HasPublished) {
+            <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/online.gif")" alt="@T("Online")" title="@T("The page is currently online")" /> <text>@T("Published")&nbsp;&#124;&nbsp;</text>
+        }
+        else {
+            <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/offline.gif")" alt="@T("Offline")" title="@T("The page is currently offline")" /> <text>@T("Not Published")&nbsp;&#124;&nbsp;</text>
+        }
+        </li>
+        <li>
+        @// Does the page have a draft
+        @if (Model.HasDraft) {
+            <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/draft.gif")" alt="@T("Draft")" title="@T("The page has a draft")" /><text> @T("Draft")&nbsp;&#124;&nbsp;</text>
+        }
+        else {
+            <text>@T("No Draft")&nbsp;&#124;&nbsp;</text>
+        }
+        </li>
+        @if ((Model.ScheduledPublishUtc.HasValue && Model.ScheduledPublishUtc.Value > DateTime.UtcNow) || (Model.IsPublished && Model.VersionPublishedUtc.HasValue)) {
+            <li>
+            @if (Model.IsPublished && Model.VersionPublishedUtc.HasValue) {
+                @T("Published: {0}", Html.DateTimeRelative(Model.VersionPublishedUtc.Value, T))
+            }
+            else {
+                <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/scheduled.gif")" alt="@T("Scheduled")" title="@T("The page is scheduled for publishing")" /><text>  @T("Scheduled") </text>
+                @Html.DateTime(Model.ScheduledPublishUtc.Value, T("M/d/yyyy h:mm tt"))
+            }&nbsp;&#124;&nbsp;</li>
+        }
+    </ul>

src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.ascx

@@ -1 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel>" %>

src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.cshtml

@@ -0,0 +1 @@
+@model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel

src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.ascx

@@ -1,47 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel>" %>
-<% Html.RegisterStyle("datetime.css"); %>
-<% Html.RegisterStyle("jquery-ui-1.7.2.custom.css"); %>
-<% Html.RegisterStyle("ui.datepicker.css"); %>
-<% Html.RegisterStyle("ui.timepickr.css"); %>
-<% Html.RegisterFootScript("jquery.ui.core.js"); %>
-<% Html.RegisterFootScript("jquery.ui.widget.js"); %>
-<% Html.RegisterFootScript("jquery.ui.datepicker.js"); %>
-<% Html.RegisterFootScript("jquery.utils.js"); %>
-<% Html.RegisterFootScript("ui.timepickr.js"); %>
-<fieldset>
-    <legend><%: T("Publish Settings")%></legend>
-    <div>
-        <%: Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft") })%>
-        <label class="forcheckbox" for="<%:ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft") %>"><%: T("Save Draft")%></label>
-    </div>
-    <div>
-        <%: Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow") })%>
-        <label class="forcheckbox" for="<%:ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow") %>"><%: T("Publish Now")%></label>
-    </div>
-    <div>
-        <%: Html.RadioButton("Command", "PublishLater", Model.ScheduledPublishUtc != null, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater") }) %>
-        <label class="forcheckbox" for="<%:ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater") %>"><%: T("Publish Later")%></label>
-    </div>
-    <div>
-        <label class="forpicker" for="<%:ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate") %>"><%: T("Date")%></label>
-        <%: Html.EditorFor(m => m.ScheduledPublishUtcDate)%>
-        <label class="forpicker" for="<%:ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime") %>"><%: T("Time")%></label>
-        <%: Html.EditorFor(m => m.ScheduledPublishUtcTime)%>
-    </div>
-</fieldset>
-<script type="text/javascript">    $(function () {
-        //todo: (heskew) make a plugin
-        $("label.forpicker").each(function () {
-            var $this = $(this);
-            var pickerInput = $("#" + $this.attr("for"));
-            pickerInput.data("hint", $this.text());
-            if (!pickerInput.val()) {
-                pickerInput.addClass("hinted")
-            .val(pickerInput.data("hint"))
-            .focus(function () { var $this = $(this); if ($this.val() == $this.data("hint")) { $this.removeClass("hinted").val("") } })
-            .blur(function () { var $this = $(this); setTimeout(function () { if (!$this.val()) { $this.addClass("hinted").val($this.data("hint")) } }, 300) });
-            }
-        });
-        $(<%=string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate")) %>).datepicker({ showAnim: "" }).focus(function () { $(<%=string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")) %>).attr("checked", "checked") });
-        $(<%=string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime")) %>).timepickr().focus(function () { $(<%=string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")) %>).attr("checked", "checked") });
-    })</script>

src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml

@@ -0,0 +1,45 @@
+@model Orchard.Core.PublishLater.ViewModels.PublishLaterViewModel
+@{
+    Script.RequireFoot("jQueryUtils_TimePicker");
+    Script.RequireFoot("jQueryUI_DatePicker");
+    Style.Require("PublishLater_DatePicker");
+    Style.Require("jQueryUtils_TimePicker");
+    Style.Require("jQueryUI_DatePicker");
+}
+<fieldset>
+    <legend>@T("Publish Settings")</legend>
+    <div>
+        @Html.RadioButton("Command", "SaveDraft", Model.ContentItem.VersionRecord == null || !Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft") })
+        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_SaveDraft")">@T("Save Draft")</label>
+    </div>
+    <div>
+        @Html.RadioButton("Command", "PublishNow", Model.ContentItem.VersionRecord != null && Model.ContentItem.VersionRecord.Published, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow") })
+        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishNow")">@T("Publish Now")</label>
+    </div>
+    <div>
+        @Html.RadioButton("Command", "PublishLater", Model.ScheduledPublishUtc != null, new { id = ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater") })
+        <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")">@T("Publish Later")</label>
+    </div>
+    <div>
+        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate")">@T("Date")</label>
+        @Html.EditorFor(m => m.ScheduledPublishUtcDate)
+        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime")">@T("Time")</label>
+        @Html.EditorFor(m => m.ScheduledPublishUtcTime)
+    </div>
+</fieldset>
+<script type="text/javascript">    $(function () {
+        @//todo: (heskew) make a plugin
+        $("label.forpicker").each(function () {
+            var $this = $(this);
+            var pickerInput = $("#" + $this.attr("for"));
+            pickerInput.data("hint", $this.text());
+            if (!pickerInput.val()) {
+                pickerInput.addClass("hinted")
+            .val(pickerInput.data("hint"))
+            .focus(function () { var $this = $(this); if ($this.val() == $this.data("hint")) { $this.removeClass("hinted").val("") } })
+            .blur(function () { var $this = $(this); setTimeout(function () { if (!$this.val()) { $this.addClass("hinted").val($this.data("hint")) } }, 300) });
+            }
+        });
+        $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate"))))).datepicker({ showAnim: "" }).focus(function () { $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater"))))).attr("checked", "checked") });
+        $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime"))))).timepickr().focus(function () { $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater"))))).attr("checked", "checked") });
+    })</script>

src/Orchard.Web/Core/Routable/RoutableResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Core.Routable {
+    public class RoutableResourceManifest : ResourceManifest {
+        public RoutableResourceManifest() {
+            DefineScript("Slugify").SetUrl("jquery.slugify.js").SetDependencies("jQuery");
+        }
+    }
+}

src/Orchard.Web/Core/Settings/SettingsResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Core.Settings {
+    public class SettingsResourceManifest : ResourceManifest {
+        public SettingsResourceManifest() {
+            DefineStyle("SettingsAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Core/Shapes/CoreShapes.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Web;
@@ -8,7 +9,9 @@ using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.DisplayManagement.Implementation;
 using Orchard.Environment.Extensions.Models;
+using Orchard.Mvc.ViewEngines;
 using Orchard.UI;
+using Orchard.UI.Resources;
 using Orchard.UI.Zones;
 
 // ReSharper disable InconsistentNaming
@@ -66,6 +69,58 @@ namespace Orchard.Core.Shapes {
             return tagBuilder;
         }
 
+        //[Shape]
+        //public HtmlString Resource(ResourceRequiredContext Resource, RequireSettings DefaultSettings, string AppPath) {
+        //    return new HtmlString(Resource.GetTagBuilder(DefaultSettings, AppPath).ToString());
+        //}
+
+        [Shape]
+        public void HeadScripts(HtmlHelper Html, IResourceManager ResourceManager) {
+            WriteResources(Html, ResourceManager, "script", ResourceLocation.Head, null);
+        }
+
+        [Shape]
+        public void FootScripts(HtmlHelper Html, IResourceManager ResourceManager) {
+            WriteResources(Html, ResourceManager, "script", null, ResourceLocation.Head);
+            TextWriter captured;
+            if (LayoutViewContext.From(Html.ViewContext).Contents.TryGetValue("end-of-page-scripts", out captured)) {
+                Html.ViewContext.Writer.Write(captured);
+            }
+        }
+
+        [Shape]
+        public void Metas(HtmlHelper Html, IResourceManager ResourceManager) {
+            foreach (var meta in ResourceManager.GetRegisteredMetas()) {
+                Html.ViewContext.Writer.WriteLine(meta.GetTag());
+            }
+        }
+
+        [Shape]
+        public void HeadLinks(HtmlHelper Html, IResourceManager ResourceManager) {
+            foreach (var link in ResourceManager.GetRegisteredLinks()) {
+                Html.ViewContext.Writer.WriteLine(link.GetTag());
+            }
+        }
+
+        [Shape]
+        public void StylesheetLinks(HtmlHelper Html, IResourceManager ResourceManager) {
+            WriteResources(Html, ResourceManager, "stylesheet", null, null);
+        }
+
+        private static void WriteResources(HtmlHelper html, IResourceManager rm, string resourceType, ResourceLocation? includeLocation, ResourceLocation? excludeLocation) {
+            var defaultSettings = new RequireSettings {
+                DebugMode = html.ViewContext.HttpContext.IsDebuggingEnabled,
+                Culture = CultureInfo.CurrentUICulture.Name,
+            };
+            var requiredResources = rm.BuildRequiredResources(resourceType);
+            var appPath = html.ViewContext.HttpContext.Request.ApplicationPath;
+            foreach (var context in requiredResources.Where(r =>
+                (includeLocation.HasValue ? r.Settings.Location == includeLocation.Value : true) &&
+                (excludeLocation.HasValue ? r.Settings.Location != excludeLocation.Value : true))) {
+                html.ViewContext.Writer.WriteLine(context.GetTagBuilder(defaultSettings, appPath).ToString());
+            }
+        }
+
         [Shape]
         public void List(
             dynamic Display,

src/Orchard.Web/Core/Shapes/Views/Layout.cshtml

@@ -10,6 +10,9 @@
 @Display(Model.Header)
     </header>
     <div id="main">
+        <div id="messages">
+            @Display(Model.Messages)
+        </div>
         <div id="content-wrapper">
             <div id="content">
 @Display(Model.Content)

src/Orchard.Web/Core/Shapes/Views/Message.cshtml

@@ -0,0 +1 @@
+<div class="message message-@Model.Type">@Model.Message</div>

src/Orchard.Web/Core/Shapes/Views/Messages.ascx_

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<NotifyEntry>>" %>
-<%@ Import Namespace="Orchard.UI.Notify"%>
-<% foreach (var item in Model) {
-     var className = item.Type == NotifyType.Error
-                         ? "critical"
-                         : item.Type == NotifyType.Warning
-                               ? "warning"
-                               : "info"; %>
-<div class="<%=className %> message"><%: item.Message %></div>
-<% } %>

src/Orchard.Web/Core/Shapes/Views/NotFound.ascx

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

src/Orchard.Web/Core/Shapes/Views/NotFound.cshtml

@@ -0,0 +1,3 @@
+@model dynamic
+<h1>@Html.TitleForPage(T("Not found").ToString())</h1>
+<p>@T("The page you are looking for does not exist.")</p>

src/Orchard.Web/Core/Shapes/Views/UI/Switchable.ascx

@@ -1,7 +1,10 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
+<%@ Import Namespace="Orchard.UI.Resources" %>
 <%
-    Html.RegisterStyle("jquery.switchable.css");
-    Html.RegisterFootScript("jquery.switchable.js");
+    // todo: use Style.Require and Script.Require when this is converted to use a base Orchard view type.
+    var rm = Html.Resolve<IResourceManager>();
+    rm.Require(new RequireSettings { ResourceType = "stylesheet", ResourceName = "Switchable" });
+    rm.Require(new RequireSettings { ResourceType = "script", ResourceName = "Switchable", Location = ResourceLocation.Foot });
     var cssClass = string.Format("{0} switchable", Model);
     
  %>

src/Orchard.Web/Modules/Futures.Modules.Packaging/Futures.Modules.Packaging.csproj

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}</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>Futures.Modules.Packaging</RootNamespace>
-    <AssemblyName>Futures.Modules.Packaging</AssemblyName>
-    <TargetFrameworkVersion>v4.0</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="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <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" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Commands\PackagingCommands.cs" />
-    <Compile Include="Controllers\DownloadStreamResult.cs" />
-    <Compile Include="Controllers\PackagingController.cs" />
-    <Compile Include="ViewModels\PackagingHarvestViewModel.cs" />
-    <Compile Include="ViewModels\PackagingModulesViewModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewModels\PackagingSourcesViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Module.txt" />
-    <Content Include="Views\Packaging\Harvest.ascx" />
-    <Content Include="Views\Packaging\Modules.ascx" />
-    <Content Include="Views\Packaging\Sources.ascx" />
-    <Content Include="Views\Packaging\_Subnav.ascx" />
-    <Content Include="Views\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\" />
-    <Folder Include="Models\" />
-    <Folder Include="Scripts\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
-      <Name>Orchard.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.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>40980</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>

src/Orchard.Web/Modules/Futures.Widgets/Drivers/WidgetsPartDriver.cs

@@ -1,20 +0,0 @@
-using System.Web.Routing;
-using Futures.Widgets.Models;
-using Orchard.ContentManagement.Drivers;
-
-namespace Futures.Widgets.Drivers {
-    public class WidgetsPartDriver : ContentItemDriver<WidgetPart> {
-        public override RouteValueDictionary GetEditorRouteValues(WidgetPart item) {
-            return new RouteValueDictionary {
-                {"Area", "Futures.Widgets"},
-                {"Controller", "Admin"},
-                {"Action", "Edit"},
-                {"Id", item.ContentItem.Id}
-            };
-        }
-
-        protected override bool UseDefaultTemplate {
-            get { return true; }
-        }
-    }
-}

src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj

@@ -39,6 +39,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -58,7 +59,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="Drivers\WidgetsPartDriver.cs" />
     <Compile Include="Handlers\WidgetsPartHandler.cs" />
     <Compile Include="DataMigrations\WidgetsDataMigration.cs" />
     <Compile Include="Models\WidgetsPartRecord.cs" />
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Views\Admin\Edit.ascx" />
+    <None Include="Views\Admin\Edit.cshtml" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>

src/Orchard.Web/Modules/Futures.Widgets/ViewModels/WidgetEditViewModel.cs

@@ -1,8 +1,7 @@
-using Orchard.Mvc.ViewModels;
-
+
 namespace Futures.Widgets.ViewModels {
-    public class WidgetEditViewModel : BaseViewModel {
-        public ContentItemViewModel Widget { get; set; }
+    public class WidgetEditViewModel  {
+        public dynamic Widget { get; set; }
         public string ReturnUrl { get; set;}
     }
 }

src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.ascx

@@ -1,11 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<WidgetEditViewModel>" %>
-<%@ Import Namespace="Futures.Widgets.ViewModels" %>
-<h1><%: Html.TitleForPage(T("Edit Widget").ToString()) %></h1>
-<% using (Html.BeginFormAntiForgeryPost()) { %>
-    <%: Html.ValidationSummary() %>
-    <%: Html.EditorForItem(m => m.Widget) %>
-    <fieldset>
-        <%: Html.HiddenFor(m => m.ReturnUrl) %>
-        <input class="button primaryAction" type="submit" name="submit.Save" value="Save"/>
-    </fieldset>
-<%} %>

src/Orchard.Web/Modules/Futures.Widgets/Views/Admin/Edit.cshtml

@@ -0,0 +1,9 @@
+@model Futures.Widgets.ViewModels.WidgetEditViewModel
+
+<h1>@Html.TitleForPage(T("Edit Widget").ToString())</h1>
+
+@using (Html.BeginFormAntiForgeryPost()) { 
+    @Html.ValidationSummary()
+    @Display(Model.Widget)
+	@Html.HiddenFor(m => m.ReturnUrl)
+} 

src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs

@@ -1,40 +1,44 @@
 using System.Web.Mvc;
 using Futures.Widgets.Models;
+using Orchard;
 using Orchard.ContentManagement;
 using Orchard.Mvc.Filters;
-using Orchard.Mvc.ViewModels;
 using Orchard.Settings;
 using Orchard.UI.Admin;
 
 namespace Futures.Widgets {
     public class WidgetFilter : FilterProvider, IActionFilter {
         private readonly IContentManager _contentManager;
+        private readonly IWorkContextAccessor _workContextAccessor;
 
-        public WidgetFilter(IContentManager contentManager) {
+        public WidgetFilter(IContentManager contentManager, IWorkContextAccessor workContextAccessor) {
             _contentManager = contentManager;
+            _workContextAccessor = workContextAccessor;
         }
 
-        public virtual ISite CurrentSite { get; set; }
-
         public void OnActionExecuting(ActionExecutingContext filterContext) {
         }
 
         public void OnActionExecuted(ActionExecutedContext filterContext) {
-            var model = BaseViewModel.From(filterContext.Result);
-            if (model == null || AdminFilter.IsApplied(filterContext.RequestContext)) {
+            var workContext = _workContextAccessor.GetContext(filterContext);
+
+            if (workContext == null ||
+                workContext.Page == null ||
+                workContext.CurrentSite == null ||
+                AdminFilter.IsApplied(filterContext.RequestContext)) {
                 return;
             }
 
-            var siteWidgets = CurrentSite.As<WidgetsPart>();
+            var siteWidgets = workContext.CurrentSite.As<WidgetsPart>();
             if (siteWidgets == null) {
                 return;
             }
 
-            var zones = model.Zones;
+            var zones = workContext.Page.Zones;
             foreach (var widget in siteWidgets.Widgets) {
-                zones.AddDisplayItem(
-                    widget.Record.Zone + ":" + widget.Record.Position,
-                    _contentManager.BuildDisplayModel(widget, "Widget"));
+                var widgetShape = _contentManager.BuildDisplayModel(widget);
+
+                zones[widget.Record.Zone].Add(widgetShape, widget.Record.Position);
             }
         }
     }

src/Orchard.Web/Modules/Orchard.ArchiveLater/ArchiveLaterResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.ArchiveLater {
+    public class ArchiveLaterResourceManifest : ResourceManifest {
+        public ArchiveLaterResourceManifest() {
+            DefineStyle("ArchiveLater_DatePicker").SetUrl("datetime.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj

@@ -74,6 +74,7 @@
     <Compile Include="Handlers\UnpublishingTaskHandler.cs" />
     <Compile Include="Models\ArchiveLaterPart.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ArchiveLaterResourceManifest.cs" />
     <Compile Include="Services\ArchiveLaterService.cs" />
     <Compile Include="Services\IArchiveLaterService.cs" />
     <Compile Include="ViewModels\ArchiveLaterViewModel.cs" />

src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml

@@ -1,5 +1,12 @@
 @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
 @using System.Web.Mvc.Html
+@{
+    Style.Require("jQueryUtils_TimePicker");
+    Style.Require("jQueryUI_DatePicker");
+    Style.Require("ArchiveLater_DatePicker");
+    Script.RequireFoot("jQueryUI_DatePicker");
+    Script.RequireFoot("jQueryUtils_TimePicker");
+}
 
 <fieldset>
     <legend>@T("Archive Settings")</legend>

src/Orchard.Web/Modules/Orchard.Blogs/BlogsResourceManifest.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Blogs {
+    public class BlogsResourceManifest : ResourceManifest {
+        public BlogsResourceManifest() {
+            DefineStyle("BlogsAdmin").SetUrl("admin.css");
+            DefineStyle("BlogsArchives").SetUrl("archives.css");
+
+            DefineScript("BlogsArchives").SetUrl("archives.js").SetDependencies("jQuery");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
+    <Compile Include="BlogsResourceManifest.cs" />
     <Compile Include="Commands\BlogCommands.cs" />
     <Compile Include="Controllers\BlogAdminController.cs" />
     <Compile Include="DataMigrations\BlogsDataMigration.cs" />

src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogArchives.cshtml

@@ -2,9 +2,9 @@
 @using Orchard.Blogs.ViewModels
 @{
     BlogPostArchiveViewModel model = Model.Archives;
+    Style.Require("BlogsArchives");
+    Script.RequireFoot("BlogsArchives");
 }
-@//todo: IResourceManager -> Html.RegisterStyle("archives.css");
-@//todo: IResourceManager -> Html.RegisterFootScript("archives.js");
 <div class="archives">
     <h3>@T("Archives")</h3>
     @if (model.Archives.Count() > 0) {

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml

@@ -1,6 +1,8 @@
 @using Orchard.Blogs.Extensions
+@{
+    Style.Require("BlogsAdmin");
+}
 @if (AuthorizedFor(Orchard.Blogs.Permissions.ManageBlogs)) {
-//todo: IResourceManager -> Html.RegisterStyle("admin.css"); 
 <div class="item-properties actions">
     <p><a href="@Url.BlogEdit((string)Model.Slug)" class="edit">@T("Blog Properties")</a></p>
 </div>

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml

@@ -1,8 +1,8 @@
 @using Orchard.Blogs.Extensions
 @using Orchard.UI.Resources
 @{
-    Html.RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
-    Html.RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });
+    RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest((string)Model.Slug) });
+    RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd((string)Model.Slug) });
 }
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.manage)

src/Orchard.Web/Modules/Orchard.ContentTypes/ContentTypesResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.ContentTypes {
+    public class ContentTypesResourceManifest : ResourceManifest {
+        public ContentTypesResourceManifest() {
+            DefineStyle("ContentTypesAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj

@@ -70,6 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
+    <Compile Include="ContentTypesResourceManifest.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="ViewModels\AddPartsViewModel.cs" />
     <Compile Include="Controllers\AdminController.cs" />

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.AddFieldViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Add New Field To \"{0}\"", Model.Part.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     <fieldset>

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.AddPartsViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     <fieldset>

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.EditTypeViewModel
-@Html.RegisterStyle("admin.css")
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Edit Content Type").ToString())</h1>
 <p class="breadcrumb">@Html.ActionLink(T("Content Types").Text, "index")@T(" &#62; ")@T("Edit Content Type")</p>
 @using (Html.BeginFormAntiForgeryPost()) {

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.ListContentTypesViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Manage Content Types").ToString())</h1>
 <div class="manage">
     @Html.ActionLink(T("Create new type").ToString(), "Create", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" })

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.RemoveFieldViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Remove the \"{0}\" part from  \"{1}\"", Model.Name, Model.Part.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
     <p>@T("Looks like you couldn't use the fancy way to remove the field. Try hitting the button below to force the issue.")</p>
     <fieldset>

src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.ContentTypes.ViewModels.RemovePartViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("ContentTypesAdmin");
 <h1>@Html.TitleForPage(T("Remove the \"{0}\" part from  \"{1}\"", Model.Name, Model.Type.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
     <p>@T("Looks like you couldn't use the fancy way to remove the part. Try hitting the button below to force the issue.")</p>
     <fieldset>

src/Orchard.Web/Modules/Orchard.Indexing/IndexingResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Indexing {
+    public class IndexingResourceManifest : ResourceManifest {
+        public IndexingResourceManifest() {
+            DefineStyle("IndexingAdmin").SetUrl("admin.css"); // todo: this does not exist
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj

@@ -59,6 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
+    <Compile Include="IndexingResourceManifest.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="DataMigrations\IndexingDataMigration.cs" />

src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml

@@ -1,4 +1,5 @@
 @model Orchard.Indexing.ViewModels.IndexViewModel
+@Style.Require("IndexingAdmin");
 
 <h1>@Html.TitleForPage(T("Search Index Management").ToString())</h1>
 @using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Indexing"})) { 

src/Orchard.Web/Modules/Orchard.Media/MediaResourceManifest.cs

@@ -0,0 +1,11 @@
+using Orchard.Localization;
+using Orchard.UI.Navigation;
+using Orchard.UI.Resources;
+
+namespace Orchard.Media {
+    public class MediaResourceManifest : ResourceManifest {
+        public MediaResourceManifest() {
+            DefineStyle("MediaAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj

@@ -71,6 +71,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="MediaResourceManifest.cs" />
     <Compile Include="DataMigrations\MediaDataMigration.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
     <Compile Include="Models\MediaSettingsPart.cs" />

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Media.ViewModels.MediaItemAddViewModel
-
 @using Orchard.Media.Helpers
 @using Orchard.Media.Models
+@Style.Require("MediaAdmin");
 
 <h1>@Html.TitleForPage(T("Add Media").ToString())</h1>
 <div class="breadCrumbs">

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Media.ViewModels.MediaFolderCreateViewModel
-
 @using Orchard.Media.Helpers
 @using Orchard.Media.Models
+@Style.Require("MediaAdmin");
 
 <h1>@Html.TitleForPage(T("Add a Folder").ToString())</h1>
 <div class="breadCrumbs">

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Media.ViewModels.MediaFolderEditViewModel
-
 @using Orchard.Media.Helpers
 @using Orchard.Media.Models
+@Style.Require("MediaAdmin");
 
 <h1>@Html.TitleForPage(T("Manage Folder").ToString())</h1>
 

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Media.ViewModels.MediaItemEditViewModel
-
 @using Orchard.Media.Helpers
 @using Orchard.Media.Models
+@Style.Require("MediaAdmin");
 
 <h1>@Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())</h1>
 

src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml

@@ -1,7 +1,7 @@
 @model Orchard.Media.ViewModels.MediaFolderEditPropertiesViewModel
-
 @using Orchard.Media.Helpers
 @using Orchard.Media.Models
+@Style.Require("MediaAdmin");
 
 <h1>@Html.TitleForPage(T("Folder Properties").ToString())</h1>
 <div class="breadCrumbs">

src/Orchard.Web/Modules/Orchard.Modules/ModulesResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Modules {
+    public class ModulesResourceManifest : ResourceManifest {
+        public ModulesResourceManifest() {
+            DefineStyle("ModulesAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj

@@ -66,6 +66,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
+    <Compile Include="ModulesResourceManifest.cs" />
     <Compile Include="Commands\FeatureCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />

src/Orchard.Web/Modules/Orchard.MultiTenancy/MultiTenancyResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.MultiTenancy {
+    public class MultiTenancyResourceManifest : ResourceManifest {
+        public MultiTenancyResourceManifest() {
+            DefineStyle("MultiTenancyAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj

@@ -66,6 +66,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Annotations\SqlDatabaseConnectionStringAttribute.cs" />
+    <Compile Include="MultiTenancyResourceManifest.cs" />
     <Compile Include="Commands\TenantCommand.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Extensions\UrlHelperExtensions.cs" />

src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml

@@ -1,9 +1,7 @@
 @model Orchard.MultiTenancy.ViewModels.TenantsIndexViewModel
 @using Orchard.MultiTenancy.Extensions
 
-@{
-	Html.RegisterStyle("admin.css");
-}
+@Style.Require("MultiTenancyAdmin");
 
 <h1>@Html.TitleForPage(T("List of Site's Tenants").ToString())</h1>
 <div class="manage">@Html.ActionLink(T("Add a Tenant").ToString(), "Add", new {area = "Orchard.MultiTenancy"}, new { @class = "button primaryAction" })</div>

src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj

@@ -78,6 +78,7 @@
     <Compile Include="Controllers\DownloadStreamResult.cs" />
     <Compile Include="Controllers\GalleryController.cs" />
     <Compile Include="DefaultPackagingUpdater.cs" />
+    <Compile Include="PackagingResourceManifest.cs" />
     <Compile Include="Services\AtomExtensions.cs" />
     <Compile Include="Services\IPackageBuilder.cs" />
     <Compile Include="Services\IPackageExpander.cs" />
@@ -103,7 +104,7 @@
     <None Include="Views\Gallery\Harvest.cshtml" />
     <None Include="Views\Gallery\Modules.cshtml" />
     <None Include="Views\Gallery\Sources.cshtml" />
-    <Content Include="Views\Gallery\_Subnav.ascx" />
+    <None Include="Views\Gallery\_Subnav.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>

src/Orchard.Web/Modules/Orchard.Packaging/PackagingResourceManifest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Packaging {
+    public class PackagingResourceManifest : ResourceManifest {
+        public PackagingResourceManifest() {
+            DefineStyle("PackagingAdmin").SetUrl("admin.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml

@@ -5,7 +5,7 @@
 
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary(T("Package creation was unsuccessful. Please correct the errors and try again.").ToString())
-    @foreach (var group in Model.Extensions.Where(x => !x.Location.StartsWith("~/Core")).GroupBy(x => x.ExtensionType)) {
+    foreach (var group in Model.Extensions.Where(x => !x.Location.StartsWith("~/Core")).GroupBy(x => x.ExtensionType)) {
     <fieldset>
         <legend>@T("Harvest") @group.Key</legend>
         <ul>
@@ -18,9 +18,9 @@
             </li>
             }
         </ul>
-        }
         @Html.ValidationMessageFor(m => m.ExtensionName)
     </fieldset>
+    }
     <fieldset>
         @Html.LabelFor(m=>m.FeedUrl)
         @Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text=T("Download").ToString(),Value="Download"}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = T("Push to {0}", x.FeedUrl).ToString(), Value = x.FeedUrl })))

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml

@@ -1,5 +1,5 @@
 @model Orchard.Packaging.ViewModels.PackagingModulesViewModel
-@Html.RegisterStyle("admin.css");
+@Style.Require("PackagingAdmin");
 
 <h1>@Html.TitleForPage(T("Browse Gallery").ToString())</h1>
 

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx

@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingHarvestViewModel>" %>
-<p>
-    <%:Html.ActionLink(T("Browse Repository Packages").ToString(), "Index") %>
-    &bull;
-    <%:Html.ActionLink(T("Harvest Local Packages").ToString(), "Harvest") %>
-    &bull;
-    <%:Html.ActionLink(T("Edit Repository Sources").ToString(), "Sources") %>
-</p>

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.cshtml

@@ -0,0 +1,8 @@
+@model Orchard.Packaging.ViewModels.PackagingHarvestViewModel
+<p>
+    @Html.ActionLink(T("Browse Repository Packages").ToString(), "Index")
+    &bull;
+    @Html.ActionLink(T("Harvest Local Packages").ToString(), "Harvest")
+    &bull;
+    @Html.ActionLink(T("Edit Repository Sources").ToString(), "Sources")
+</p>

src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/HomeController.cs

@@ -1,13 +0,0 @@
-using System.Web.Mvc;
-
-namespace Orchard.Sandbox.Controllers
-{
-    public class Home : Controller {
-        
-        public ActionResult Index()
-        {            
-            return RedirectToAction("index","page");
-        }
-
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/PageController.cs

@@ -1,109 +0,0 @@
-using System.Linq;
-using System.Web.Mvc;
-using Orchard.Localization;
-using Orchard.ContentManagement;
-using Orchard.Sandbox.Drivers;
-using Orchard.Sandbox.Models;
-using Orchard.Sandbox.ViewModels;
-using Orchard.Security;
-using Orchard.Settings;
-using Orchard.UI.Notify;
-
-namespace Orchard.Sandbox.Controllers {
-    public class PageController : Controller, IUpdateModel {
-        public PageController(IOrchardServices orchardServices) {
-            Services = orchardServices;
-        }
-
-        public IOrchardServices Services { get; set; }
-        public virtual ISite CurrentSite { get; set; }
-        public virtual IUser CurrentUser { get; set; }
-        public Localizer T { get; set; }
-
-        public ActionResult Index() {
-            var model = new PageIndexViewModel {
-                Pages = Services.ContentManager.Query<SandboxPagePart, SandboxPagePartRecord>()
-                    .OrderBy(x => x.Name)
-                    .List()
-                    .Select(x => Services.ContentManager.BuildDisplayModel(x, "SummaryList"))
-            };
-            return View(model);
-        }
-
-        public ActionResult Show(int id) {
-            return View(new PageShowViewModel {
-                Page = Services.ContentManager.BuildDisplayModel<SandboxPagePart>(id, "Detail")
-            });
-        }
-
-        public ActionResult Create() {
-            var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
-            if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
-                Services.Notifier.Error(T("Anonymous users can not create pages"));
-                return RedirectToAction("index");
-            }
-
-            return View(new PageCreateViewModel());
-        }
-
-
-        [HttpPost]
-        public ActionResult Create(PageCreateViewModel model) {
-            var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
-            if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
-                Services.Notifier.Error(T("Anonymous users can not create pages"));
-                return RedirectToAction("index");
-            }
-
-            var page = Services.ContentManager.Create<SandboxPagePart>(SandboxPagePartDriver.ContentType.Name, item => {
-                item.Record.Name = model.Name;
-            });
-            return RedirectToAction("show", new { page.ContentItem.Id });
-        }
-
-
-        public ActionResult Edit(int id) {
-            if (IsEditAllowed() == false) {
-                return RedirectToAction("show", new { id });
-            }
-
-            var latest = Services.ContentManager.GetLatest<SandboxPagePart>(id);
-            return View(new PageEditViewModel {
-                Page = Services.ContentManager.BuildEditorModel(latest)
-            });
-        }
-
-        [HttpPost, ActionName("Edit"), ValidateInput(false)]
-        public ActionResult _Edit(int id) {
-            if (IsEditAllowed() == false) {
-                return RedirectToAction("show", new { id });
-            }
-            var latest = Services.ContentManager.GetDraftRequired<SandboxPagePart>(id);
-            var model = new PageEditViewModel {
-                Page = Services.ContentManager.UpdateEditorModel(latest, this)
-            };
-            if (!ModelState.IsValid) {
-                Services.TransactionManager.Cancel();
-                return View(model);
-            }
-            Services.ContentManager.Publish(latest.ContentItem);
-            return RedirectToAction("show", new { id });
-        }
-
-        bool IsEditAllowed() {
-            var settings = CurrentSite.Get<ContentPart<SandboxSettingsPartRecord>>();
-            if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {
-                Services.Notifier.Error(T("Anonymous users can not edit pages"));
-                return false;
-            }
-            return true;
-        }
-
-        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
-            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
-        }
-        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
-            ModelState.AddModelError(key, errorMessage.ToString());
-        }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs

@@ -1,34 +0,0 @@
-using Orchard.ContentManagement.MetaData;
-using Orchard.Data.Migration;
-
-namespace Orchard.Sandbox.DataMigrations {
-    public class SandboxDataMigration : DataMigrationImpl {
-
-        public int Create() {
-            SchemaBuilder.CreateTable("SandboxPagePartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Name")
-                );
-
-            SchemaBuilder.CreateTable("SandboxSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<bool>("AllowAnonymousEdits")
-                );
-
-            return 1;
-        }
-
-        public int UpdateFrom1() {
-
-            ContentDefinitionManager.AlterTypeDefinition("SandboxPage", 
-                cfg => cfg
-                    .WithPart("SandboxPagePart")
-                    .WithPart("CommonPart")
-                    .WithPart("RoutePart")
-                    .WithPart("BodyPart")
-                );
-            
-            return 2;
-        }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Drivers/SandboxPagePartDriver.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Web.Routing;
-using JetBrains.Annotations;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Drivers;
-using Orchard.Mvc.ViewModels;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.Drivers {
-    [UsedImplicitly]
-    public class SandboxPagePartDriver : ContentItemDriver<SandboxPagePart> {
-        public readonly static ContentType ContentType = new ContentType {
-                                                                             Name = "SandboxPage",
-                                                                             DisplayName = "Sandbox Page"
-                                                                         };
-
-        protected override ContentType GetContentType() {
-            return ContentType;
-        }
-        protected override string GetDisplayText(SandboxPagePart item) {
-            return item.Record.Name;
-        }
-
-        public override RouteValueDictionary GetDisplayRouteValues(SandboxPagePart item) {
-            return new RouteValueDictionary(
-                new {
-                        area = "Orchard.Sandbox",
-                        controller = "Page",
-                        action = "Show",
-                        id = item.ContentItem.Id,
-                    });
-        }
-
-        public override RouteValueDictionary GetEditorRouteValues(SandboxPagePart item) {
-            return new RouteValueDictionary(
-                new {
-                        area = "Orchard.Sandbox",
-                        controller = "Page",
-                        action = "Edit",
-                        id = item.ContentItem.Id,
-                    });
-        }
-
-        protected override DriverResult Display(SandboxPagePart part, string displayType) {
-            return Combined(
-                ContentItemTemplate("Items/Sandbox.Page").LongestMatch(displayType, "Summary"),
-                ContentPartTemplate(part, "Parts/Sandbox.Page.Title").Location("title"));
-        }
-
-        protected override DriverResult Editor(ContentItemViewModel<SandboxPagePart> model) {
-            return ContentItemTemplate("Items/Sandbox.Page");
-        }
-
-        protected override DriverResult Editor(ContentItemViewModel<SandboxPagePart> model, IUpdateModel updater) {
-            updater.TryUpdateModel(model, Prefix, null, null);
-            return ContentItemTemplate("Items/Sandbox.Page");
-        }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Handlers/SandboxPagePartHandler.cs

@@ -1,20 +0,0 @@
-using JetBrains.Annotations;
-using Orchard.Data;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.Handlers {
-    [UsedImplicitly]
-    public class SandboxPagePartHandler : ContentHandler {
-        public SandboxPagePartHandler(IRepository<SandboxPagePartRecord> pageRepository, IRepository<SandboxSettingsPartRecord> settingsRepository) {
-            // define the "SandboxPage" content type
-            Filters.Add(StorageFilter.For(pageRepository) );
-
-            // add settings to site, and simple record-template gui
-            Filters.Add(new ActivatingFilter<ContentPart<SandboxSettingsPartRecord>>("Site"));
-            Filters.Add(StorageFilter.For(settingsRepository));
-            Filters.Add(new TemplateFilterForRecord<SandboxSettingsPartRecord>("SandboxSettings", "Parts/Sandbox.SiteSettings"));
-        }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPagePart.cs

@@ -1,6 +0,0 @@
-using Orchard.ContentManagement;
-
-namespace Orchard.Sandbox.Models {
-    public class SandboxPagePart : ContentPart<SandboxPagePartRecord> {
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxPagePartRecord.cs

@@ -1,7 +0,0 @@
-using Orchard.ContentManagement.Records;
-
-namespace Orchard.Sandbox.Models {
-    public class SandboxPagePartRecord : ContentPartRecord {
-        public virtual string Name { get; set; }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxSettingsPartRecord.cs

@@ -1,7 +0,0 @@
-using Orchard.ContentManagement.Records;
-
-namespace Orchard.Sandbox.Models {
-    public class SandboxSettingsPartRecord : ContentPartRecord {
-        public virtual bool AllowAnonymousEdits { get; set; }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt_

@@ -1,11 +0,0 @@
-name: Sandbox
-antiforgery: enabled
-author: The Orchard Team
-website: http://orchardproject.net
-version: 0.5.0
-orchardversion: 0.5.0
-description: The sandbox module is a testing ground for Orchard developers and should not be activated except for testing and development purposes.
-features:
-    Orchard.Sandbox:
-        Description: A module to mess around with. Currently wiki-like.
-        Category: Developer

src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageCreateViewModel.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Orchard.Mvc.ViewModels;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.ViewModels {
-    public class PageCreateViewModel : BaseViewModel {
-        public string Name { get; set; }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageEditViewModel.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Orchard.Mvc.ViewModels;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.ViewModels {
-    public class PageEditViewModel : BaseViewModel {
-        public ContentItemViewModel<SandboxPagePart> Page { get; set; }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs

@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-using Orchard.Mvc.ViewModels;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.ViewModels {
-    public class PageIndexViewModel : BaseViewModel {
-        public IEnumerable<ContentItemViewModel<SandboxPagePart>> Pages { get; set; }
-    } 
-}

src/Orchard.Web/Modules/Orchard.Sandbox/ViewModels/PageShowViewModel.cs

@@ -1,8 +0,0 @@
-using Orchard.Mvc.ViewModels;
-using Orchard.Sandbox.Models;
-
-namespace Orchard.Sandbox.ViewModels {
-    public class PageShowViewModel : BaseViewModel {
-        public ContentItemViewModel<SandboxPagePart> Page { get; set; }
-    }
-}

src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.Summary.ascx

@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Sandbox.Models" %>
-<div class="item">
-<% Html.Zone("title");
-   Html.Zone("metatop");
-   Html.Zone("body"); %>
-</div>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Items/Sandbox.Page.ascx

@@ -1,23 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Sandbox.Models" %>
-<div class="item">
-    <% Html.Zone("first"); %>
-    <div class="title">
-        <% Html.Zone("title"); %>
-    </div>
-    <% Html.Zone("metatop"); %>
-    <div class="actions">
-        <%: Html.ItemEditLink(T("Edit this page").ToString(), Model.Item) %>
-        <%: Html.ActionLink(T("Return to list").ToString(), "index") %>
-        <% Html.Zone("actions"); %>
-    </div>
-    <div class="body">
-        <% Html.Zone("body"); %>
-    </div>
-    <% Html.Zone("metabottom"); %>
-    <div class="footer">
-        <% Html.ZonesExcept("last"); %>
-        <% Html.Zone("last"); %>
-    </div>
-</div>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/DisplayTemplates/Parts/Sandbox.Page.Title.ascx

@@ -1,3 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IContent>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
-<h2><%: Html.ItemDisplayLink(Model) %></h2>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Items/Sandbox.Page.ascx

@@ -1,8 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SandboxPagePart>>" %>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Sandbox.Models"%>
-<fieldset>
-    <%: Html.LabelFor(m => m.Item.Record.Name) %>
-    <%: Html.EditorFor(m => m.Item.Record.Name) %>
-</fieldset>
-<% Html.ZonesAny(); %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/EditorTemplates/Parts/Sandbox.SiteSettings.ascx

@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SandboxSettingsPartRecord>" %>
-<%@ Import Namespace="Orchard.Sandbox.Models"%>
-<fieldset>
-    <legend>Sandbox</legend>
-    <div>
-        <%: Html.EditorFor(m => m.AllowAnonymousEdits) %>
-        <label class="forcheckbox" for="SandboxSettings_AllowAnonymousEdits"><%: T("Anyone can create and edit pages") %></label>
-        <%: Html.ValidationMessage("AllowAnonymousEdits", "*") %>
-    </div>
-</fieldset>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Create.aspx

@@ -1,10 +0,0 @@
-<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageCreateViewModel>" %>
-<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%: Html.TitleForPage(T("Create Page").ToString())%></h1>
-<% using (Html.BeginFormAntiForgeryPost()) { %>
-    <fieldset>
-        <%: Html.LabelFor(x => x.Name) %>
-        <%: Html.EditorFor(x => x.Name) %>
-        <input type="submit" name="submit" value="<%: T("Add") %>" />
-    </fieldset>
-<% } %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Edit.aspx

@@ -1,9 +0,0 @@
-<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageEditViewModel>" %>
-<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%: Html.TitleForPage(T("Edit Page").ToString()) %></h1>
-<%using (Html.BeginFormAntiForgeryPost()) { %>
-    <%: Html.EditorForItem(Model.Page) %>
-    <fieldset>
-        <input type="submit" name="submit" value="<%: T("Save") %>" />
-    </fieldset>
-<% } %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Index.aspx

@@ -1,5 +0,0 @@
-<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PageIndexViewModel>" %>
-<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<h1><%: Html.TitleForPage(T("Sandbox Pages").ToString()) %></h1>
-<p><%: Html.ActionLink(T("Add new page").ToString(), "create") %></p>
-<%: Html.UnorderedList(Model.Pages, (sp, i) => Html.DisplayForItem(sp), "pages contentItems") %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Page/Show.aspx

@@ -1,3 +0,0 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<PageShowViewModel>" %>
-<%@ Import Namespace="Orchard.Sandbox.ViewModels" %>
-<%: Html.DisplayForItem(Model.Page) %>

src/Orchard.Web/Modules/Orchard.Sandbox/Views/Web.config

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <system.web>
-    <httpHandlers>
-      <add path="*" verb="*"
-          type="System.Web.HttpNotFoundHandler"/>
-    </httpHandlers>
-
-    <!--
-        Enabling request validation in view pages would cause validation to occur
-        after the input has already been processed by the controller. By default
-        MVC performs request validation before a controller processes the input.
-        To change this behavior apply the ValidateInputAttribute to a
-        controller or action.
-    -->
-    <pages
-        validateRequest="false"
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
-      </controls>
-    </pages>
-  </system.web>
-
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj

@@ -65,6 +65,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SearchResourceManifest.cs" />
     <Compile Include="Controllers\SearchController.cs" />
     <Compile Include="DataMigrations\SearchDataMigration.cs" />
     <Compile Include="Drivers\SearchSettingsPartDriver.cs" />

src/Orchard.Web/Modules/Orchard.Search/SearchResourceManifest.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Orchard.UI.Resources;
+
+namespace Orchard.Search {
+    public class SearchResourceManifest : ResourceManifest {
+        public SearchResourceManifest() {
+            DefineStyle("SearchAdmin").SetUrl("admin.css"); // todo: this does not appear to be used anywhere
+            DefineStyle("Search").SetUrl("search.css");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml

@@ -5,7 +5,7 @@
     <legend>@T("Search")</legend>
     <div>
         @{var entryIndex = 0;}
-        @if (Model.Entries != null) {
+        @if (Model.Entries != null && Model.Entries.Any()) {
             foreach(var modelEntry in Model.Entries) {
                if(Model.Entries[entryIndex].Selected) {
                    <input type="checkbox" value="true" checked="checked" name="@Html.FieldNameFor(m => m.Entries[entryIndex].Selected)" id="@Html.FieldIdFor(m => m.Entries[entryIndex].Selected)"/> 
@@ -18,5 +18,8 @@
                entryIndex = entryIndex + 1;
             }
         }
+        else {
+            <span class="hint">@T("There are currently no fields to search from. Please update you index, and check some indexable content exists.")</span>
+        }
     </div>
 </fieldset>

src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml

@@ -1,4 +1,5 @@
 @model Orchard.Search.ViewModels.SearchViewModel
+@Style.Require("Search");
 
 <h1>@Html.TitleForPage(T("Search").Text)</h1>
 @Html.Zone("search")

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -18,6 +18,7 @@ using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.Descriptor;
 using Orchard.Environment.Descriptor.Models;
+using Orchard.Indexing;
 using Orchard.Localization;
 using Orchard.Localization.Services;
 using Orchard.Reports.Services;
@@ -90,9 +91,10 @@ namespace Orchard.Setup.Services {
                     "Orchard.Comments",
                     "Orchard.Tags",
                     "Orchard.Media",
-                    //"Futures.Widgets"
+                    "Futures.Widgets",
 
-                    "Orchard.DevTools"
+                    "Orchard.DevTools",
+                    "Orchard.jQuery"
                 };
 
                 context.EnabledFeatures = hardcoded;
@@ -210,7 +212,7 @@ namespace Orchard.Setup.Services {
                         //.WithPart("TagsPart")
                         //.WithPart("LocalizationPart")
                         .Creatable()
-                        //.Indexed()
+                        .Indexed()
                         );
                     contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg
                         .WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault));

src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Web;
+using System.Web.Mvc;
 using System.Web.Routing;
 using Autofac;
 using Orchard.Commands;
@@ -35,7 +36,9 @@ using Orchard.Themes;
 using Orchard.UI.Notify;
 using Orchard.UI.PageClass;
 using Orchard.UI.PageTitle;
+using Orchard.UI.Resources;
 using Orchard.UI.Zones;
+using IFilterProvider = Orchard.Mvc.Filters.IFilterProvider;
 
 namespace Orchard.Setup {
     public class SetupMode : Module {
@@ -60,6 +63,8 @@ namespace Orchard.Setup {
             builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
             builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
             builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
+            builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
+            builder.RegisterType<ResourceFilter>().As<FilterProvider>().InstancePerLifetimeScope();
 
             // setup mode specific implementations of needed service interfaces
             builder.RegisterType<SafeModeThemeService>().As<IThemeService>().InstancePerLifetimeScope();

src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml

@@ -1,13 +1,11 @@
-<div>
-  @model Orchard.Setup.ViewModels.SetupViewModel
+@model Orchard.Setup.ViewModels.SetupViewModel
 
-  <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
+<h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
 
-  @using (Html.BeginFormAntiForgeryPost()) {
-  <text>
-    @Html.ValidationSummary()
-    <h2>@T("Please answer a few questions to configure your site.")</h2>
-    <fieldset class="site">
+@using (Html.BeginFormAntiForgeryPost()) {
+Html.ValidationSummary();
+<h2>@T("Please answer a few questions to configure your site.")</h2>
+<fieldset class="site">
     <div>
         <label for="SiteName">@T("What is the name of your site?")</label>
         @Html.TextBoxFor(svm => svm.SiteName, new { autofocus = "autofocus" })
@@ -24,9 +22,9 @@
         <label for="ConfirmAdminPassword">@T("Confirm the password:")</label>
         @Html.PasswordFor(svm => svm.ConfirmPassword)
     </div>
-    </fieldset>
-    @if (!Model.DatabaseIsPreconfigured) {
-    <fieldset class="data">
+</fieldset>
+if (!Model.DatabaseIsPreconfigured) {
+<fieldset class="data">
     <legend>@T("How would you like to store your data?")</legend>
         @Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage")
     <div>
@@ -48,11 +46,9 @@
             @Html.EditorFor(svm => svm.DatabaseTablePrefix)
         </div>
     </div>
-    </fieldset>
-    }
-    <fieldset>
-      <input class="button primaryAction" type="submit" value='@T("Finish Setup")' />
-    </fieldset>
-  </text>
-  }
-</div>
+</fieldset>
+}
+<fieldset>
+    <input class="button primaryAction" type="submit" value="@T("Finish Setup")" />
+</fieldset>
+}