From cc106d8a51b015cf75c1d8283514800e2c59ae12 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Mon, 7 May 2012 16:40:36 -0700
Subject: [PATCH] Reorganizing date and time pickers' dependencies

--HG--
branch : 1.4.x
---
 .hgsubstate                                                 | 2 +-
 .../Core/Common/Views/Parts.Common.Date.Edit.cshtml         | 4 ----
 .../Views/EditorTemplates/Parts/ArchiveLater.cshtml         | 4 ----
 .../Views/EditorTemplates/Parts/PublishLater.cshtml         | 4 ----
 .../Orchard.jQuery/Views/DatePickerLocalization.cshtml      | 6 ++++++
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.hgsubstate b/.hgsubstate
index 7df13f6cd..824913279 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -5,4 +5,4 @@ cfc264d41c1d299c104d76c5032d8ffee3047dcd src/Orchard.Web/Modules/Orchard.Rules
 0b96793c3737e50863270c24debf6d44065b73bb src/Orchard.Web/Modules/Orchard.Tokens
 4ed51e0e76c2aacc2de90ce9984fd00cfdfae2ce src/orchard.web/Modules/Orchard.Alias
 0e660c8cfbfb5217abfb7cf6adf6f2cf484174d6 src/orchard.web/Modules/Orchard.Projections
-bbd96451a4e80b4564dbb23ab947711feed3b5d2 src/orchard.web/modules/Orchard.Fields
+92bea953e399da87adbc0654a30fd5e55c9bf9e1 src/orchard.web/modules/Orchard.Fields
diff --git a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
index 1ae70c628..7ddec6858 100644
--- a/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Parts.Common.Date.Edit.cshtml
@@ -1,11 +1,7 @@
 @model Orchard.Core.Common.DateEditor.DateEditorViewModel
 @{
 	var DateEditor = Model;
-    Script.Require("jQueryUI_DatePicker");
-    Script.Require("jQueryUI_TimePicker");
     Style.Require("Common_DatePicker");
-    Style.Require("jQueryUI_DatePicker");
-    Style.Require("jQueryUI_TimePicker"); 
 }
 <fieldset class="createdutc-datetime">
     @Html.LabelFor(m => DateEditor.CreatedDate, T("Created On"))
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
index 950e48d9f..fd9a8d4f5 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/EditorTemplates/Parts/ArchiveLater.cshtml
@@ -1,11 +1,7 @@
 @model Orchard.ArchiveLater.ViewModels.ArchiveLaterViewModel
 @using System.Web.Mvc.Html;
 @{
-    Style.Require("jQueryUI_DatePicker");
-    Style.Require("jQueryUI_TimePicker");
     Style.Require("ArchiveLater_DatePicker");
-    Script.Require("jQueryUI_DatePicker");
-    Script.Require("jQueryUI_TimePicker");
 }
 
 <fieldset class="archive-later-datetime">
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
index 6ee79bdcb..6151cf171 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
@@ -1,10 +1,6 @@
 @model Orchard.PublishLater.ViewModels.PublishLaterViewModel
 @{
-    Script.Require("jQueryUI_DatePicker");
-    Script.Require("jQueryUI_TimePicker");
     Style.Require("PublishLater_DatePicker");
-    Style.Require("jQueryUI_DatePicker");
-    Style.Require("jQueryUI_TimePicker");
 }
 <fieldset class="publish-later-datetime">
     <legend>@T("Publish")</legend>
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml b/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
index 12635b8f2..3799ca5da 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Views/DatePickerLocalization.cshtml
@@ -2,6 +2,12 @@
 @using System.Globalization
 
 @{
+    
+    Style.Require("jQueryUI_DatePicker");
+    Style.Require("jQueryUI_TimePicker");
+    Script.Require("jQueryUI_DatePicker");
+    Script.Require("jQueryUI_TimePicker");
+
     var cultureInfo = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture);
     
     var dateTimeLocalization = WorkContext.Resolve<IDateTimeLocalization>();