diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml index b5ef9118a..21830c122 100644 --- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml @@ -6,9 +6,9 @@ Layout.Title = T("Navigation").ToString(); Style.Include("navigation-admin.css"); - Script.Require("jQueryUI_Sortable"); - Script.Include("jquery.mjs.nestedSortable.js"); - Script.Include("navigation-admin.js"); + Script.Require("jQueryUI_Sortable").AtFoot(); + Script.Include("jquery.mjs.nestedSortable.js").AtFoot(); + Script.Include("navigation-admin.js").AtFoot(); }
@T("You need to hit \"Save All\" in order to save your changes.")
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/ModalAdminFilter.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/ModalAdminFilter.cs index b177cd410..cd47539f2 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/ModalAdminFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/ModalAdminFilter.cs @@ -15,7 +15,7 @@ namespace Orchard.MediaLibrary { if (!(filterContext.Result is ViewResult) || !UI.Admin.AdminFilter.IsApplied(filterContext.RequestContext)) return; _resourceManager.Include("stylesheet", "~/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css", null); - _resourceManager.Include("script", "~/Modules/Orchard.MediaLibrary/Scripts/modal-window.js", null); + _resourceManager.Include("script", "~/Modules/Orchard.MediaLibrary/Scripts/modal-window.js", null).AtFoot(); } public void OnResultExecuted(ResultExecutedContext filterContext) { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml index c429c144e..bf59188cf 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml @@ -3,13 +3,13 @@ @{ var viewModel = Model; - Script.Require("ShapesBase"); + Script.Require("ShapesBase").AtFoot(); Style.Require("MediaManagerAdmin"); - Script.Require("jQuery"); - Script.Require("jQueryUI_Droppable"); - Script.Include("knockout-2.3.0.js"); - Script.Include("history.js"); - Script.Include("media-library.js"); + Script.Require("jQuery").AtFoot(); + Script.Require("jQueryUI_Droppable").AtFoot(); + Script.Include("knockout-2.3.0.js").AtFoot(); + Script.Include("history.js").AtFoot(); + Script.Include("media-library.js").AtFoot(); Style.Require("FontAwesome"); Layout.Title = T("Media Library"); diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml index 5420fe349..533b70f31 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml @@ -4,15 +4,15 @@ @{ - Script.Require("jQuery"); - Script.Require("jQueryUI"); + Script.Require("jQuery").AtFoot(); + Script.Require("jQueryUI").AtFoot(); Style.Include("orchard-medialibrary-admin.css"); Style.Include("orchard-mediaproviders-admin.css"); Style.Include("orchard-clientstorage-admin.css"); - Script.Require("jQueryFileUpload"); - Script.Include("knockout-2.3.0.js"); + Script.Require("jQueryFileUpload").AtFoot(); + Script.Include("knockout-2.3.0.js").AtFoot(); } @Display.Metas() diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml index 189914a34..d99186a77 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml @@ -7,7 +7,7 @@ Script.Require("jQueryUI_Sortable").AtFoot(); Style.Include("media-library-picker-admin.css"); - Script.Require("jQueryColorBox"); + Script.Require("jQueryColorBox").AtFoot(); Style.Require("jQueryColorBox"); var settings = Model.Field.PartFieldDefinition.Settings.GetModel(); diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml index 1569efb97..7504fb0e9 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/OEmbed/Index.cshtml @@ -4,8 +4,8 @@ @{ - Script.Require("jQuery"); - Script.Require("jQueryUI"); + Script.Require("jQuery").AtFoot(); + Script.Require("jQueryUI").AtFoot(); Style.Include("orchard-medialibrary-admin.css"); Style.Include("orchard-mediaproviders-admin.css"); diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml index 0b0251555..6d3356405 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml @@ -8,8 +8,8 @@ @{ - Script.Require("jQuery"); - Script.Include("knockout-2.3.0.js"); + Script.Require("jQuery").AtFoot(); + Script.Include("knockout-2.3.0.js").AtFoot(); Style.Include("orchard-mediaproviders-admin.css"); Style.Include("orchard-websearch-admin.css"); diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index b9df1a943..954bc51f8 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -11,9 +11,9 @@ Style.Include("ie.css").UseCondition("gte IE 9").SetAttribute("media", "screen, projection"); Style.Include("ie8.css").UseCondition("IE 8").SetAttribute("media", "screen, projection"); Style.Include("ie7.css").UseCondition("lte IE 7").SetAttribute("media", "screen, projection"); - Script.Require("jQuery"); - Script.Require("ShapesBase"); - Script.Include("admin.js"); + Script.Require("jQuery").AtFoot(); + Script.Require("ShapesBase").AtFoot(); + Script.Include("admin.js").AtFoot(); /* Some useful shortcuts or settings ***************************************************************/ diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml index 83df54787..594d855f7 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml @@ -1,7 +1,7 @@ @using Orchard.Utility.Extensions; @{ Script.Require("jQuery"); - Script.Include("admin.js"); + Script.Include("admin.js").AtFoot(); IEnumerable firstLevelMenuItems = Model; if (Model.ImageSets != null) {