diff --git a/src/Orchard.Web/Core/ContentsLocation/ContentsLocationResourceManifest.cs b/src/Orchard.Web/Core/ContentsLocation/ContentsLocationResourceManifest.cs new file mode 100644 index 000000000..807d21e67 --- /dev/null +++ b/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"); + } + } +} diff --git a/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml b/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml index b01affaa2..201cc8dff 100644 --- a/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml +++ b/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");
@T("{0}", Model.Definition.DisplayName)
diff --git a/src/Orchard.Web/Core/Localization/Resources/LocalizationResourceManifest.cs b/src/Orchard.Web/Core/Localization/Resources/LocalizationResourceManifest.cs new file mode 100644 index 000000000..172ac3411 --- /dev/null +++ b/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"); + } + } +} diff --git a/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml index 6770f5286..a8c35eef6 100644 --- a/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml +++ b/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");
@if (Model.Localizations.Count() > 0) { //todo: need this info in the view model diff --git a/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.cshtml b/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.cshtml index 0af5af66d..09f237246 100644 --- a/src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.cshtml +++ b/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) {
diff --git a/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.Translation.cshtml b/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.Translation.cshtml index 08c503751..43511aab0 100644 --- a/src/Orchard.Web/Core/Localization/Views/EditorTemplates/Parts/Localization.Translation.cshtml +++ b/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");
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index feaf927c9..2150e8a5a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -74,6 +74,7 @@ + @@ -94,6 +95,7 @@ + @@ -102,6 +104,7 @@ + @@ -109,6 +112,7 @@ + @@ -203,6 +207,7 @@ + diff --git a/src/Orchard.Web/Core/PublishLater/PublishLaterResourceManifest.cs b/src/Orchard.Web/Core/PublishLater/PublishLaterResourceManifest.cs new file mode 100644 index 000000000..6de920ac8 --- /dev/null +++ b/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"); + } + } +} diff --git a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml index 6664e806f..3e4e4ed8d 100644 --- a/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml +++ b/src/Orchard.Web/Core/PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml @@ -1,14 +1,10 @@ @model 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"); + Script.RequireFoot("jQueryUtils_TimePicker"); + Script.RequireFoot("jQueryUI_DatePicker"); + Style.Require("PublishLater_DatePicker"); + Style.Require("jQueryUtils_TimePicker"); + Style.Require("jQueryUI_DatePicker"); }
@T("Publish Settings") diff --git a/src/Orchard.Web/Core/Routable/RoutableResourceManifest.cs b/src/Orchard.Web/Core/Routable/RoutableResourceManifest.cs new file mode 100644 index 000000000..a098cb595 --- /dev/null +++ b/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"); + } + } +} diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml index b937315e9..d9f636b00 100644 --- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml +++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml @@ -12,7 +12,7 @@
- @Html.RegisterFootScript("jquery.slugify.js"); + @Script.RequireFoot("Slugify"); @using(Capture(script => WorkContext.Page.Tail.Add(script))){ - } + Script.Require("TinyMce"); using(Capture(script => WorkContext.Page.Tail.Add(script))) { ")); - var basejs = ResolveUrl("~/Modules/Orchard.Themes/Scripts/base.js"); - Model.Zones.AddAction("content:after", html => - html.ViewContext.Writer.Write(@"")); - var setupjs = ResolveUrl("~/Modules/Orchard.Setup/Scripts/setup.js"); - Model.Zones.AddAction("content:after", html => - html.ViewContext.Writer.Write(@"")); - var siteCss = ResolveUrl("../Styles/site.css"); - Model.Zones.AddAction("head:styles", html => - html.ViewContext.Writer.Write(@"")); - var ie6Css = ResolveUrl("../Styles/ie6.css"); - Model.Zones.AddAction("head:styles", html => - html.ViewContext.Writer.Write(@"")); ---%> +<%@ Import Namespace="Orchard.UI.Resources" %> +<% + Script.Require("jQuery", "1.4.2"); + Script.Require("Theme_Base"); + Script.Require("Setup"); + Style.Require("SafeMode"); + RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type="text/css", Href = ResolveUrl("../Styles/ie6.css")}.AddAttribute("media", "screen, projection")); +%>