Reorganizing jQuery Time Entry resources

src/Orchard.Web/Modules/Orchard.Resources/Assets.json

@@ -42,12 +42,8 @@
         "output": "Styles/jQuery.Calendars/jquery.calendars.picker.full.css"
     },
     {
-        "inputs": [ "Assets/Css/TimeEntry/jquery.timeentry.css" ],
-        "output": "Styles/TimeEntry/jquery.timeentry.css"
-    },
-    {
-        "inputs": [ "Assets/Js/TimeEntry/jquery.timeentry.js" ],
-        "output": "Scripts/TimeEntry/jquery.timeentry.js"
+        "inputs": [ "Assets/Css/jQuery.TimeEntry/jquery.timeentry.css" ],
+        "output": "Styles/jQuery.TimeEntry/jquery.timeentry.css"
     },
     {
         "inputs": [ "Assets/Css/DateTimeEditor/jquery-datetime-editor.css" ],

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

@@ -312,31 +312,6 @@
     <Content Include="Assets\Js\jQuery.Utilities\jquery.utils.js" />
     <Content Include="Assets\Js\Knockout\knockout-3.4.0.js" />
     <Content Include="Assets\Js\Moment\moment.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ar.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ca.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-cs.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-de.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-es.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-fa.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-fr.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-hu.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-is.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-it.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ja.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-lt.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-lv.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-nl.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-pl.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-pt.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ro.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ru.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-sk.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-sv.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-tr.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-vi.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-zh-CN.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry-zh-TW.js" />
-    <Content Include="Assets\Js\TimeEntry\jquery.timeentry.js" />
     <Content Include="Assets\Js\Underscore\underscore.js" />
     <Content Include="Assets\Js\Uri\uri.js" />
     <Content Include="Scripts\Angular\angular-resource.js" />
@@ -747,6 +722,30 @@
     <Content Include="Scripts\jQuery.Colorbox\i18n\jquery.colorbox-vi.js" />
     <Content Include="Scripts\jQuery.Colorbox\i18n\jquery.colorbox-zh-CN.js" />
     <Content Include="Scripts\jQuery.Colorbox\i18n\jquery.colorbox-zh-TW.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-ar.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-ca.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-cs.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-de.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-es.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-fa.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-fr.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-hu.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-is.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-it.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-ja.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-lt.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-lv.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-nl.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-pl.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-pt.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-ro.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-ru.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-sk.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-sv.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-tr.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-vi.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-zh-CN.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry-zh-TW.js" />
     <Content Include="Scripts\jQueryUI\jquery-ui.js" />
     <Content Include="Scripts\jQueryUI\jquery-ui.min.js" />
     <Content Include="Scripts\jQuery.BlockUI\jquery.blockui.js" />
@@ -769,8 +768,8 @@
     <Content Include="Scripts\knockout.min.js" />
     <Content Include="Scripts\moment.js" />
     <Content Include="Scripts\moment.min.js" />
-    <Content Include="Scripts\TimeEntry\jquery.timeentry.js" />
-    <Content Include="Scripts\TimeEntry\jquery.timeentry.min.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.js" />
+    <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.min.js" />
     <Content Include="Scripts\underscore.js" />
     <Content Include="Scripts\underscore.min.js" />
     <Content Include="Scripts\uri.js" />
@@ -823,24 +822,24 @@
     <Content Include="Styles\jQueryUI\jquery-ui.structure.min.css" />
     <Content Include="Styles\jQueryUI\jquery-ui.theme.css" />
     <Content Include="Styles\jQueryUI\jquery-ui.theme.min.css" />
-    <Content Include="Styles\TimeEntry\images\spinnerBlue.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerBlueBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerDefault.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerDefaultBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerGem.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerGemBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerGreen.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerGreenBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerOrange.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerOrangeBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerSquare.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerSquareBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerText.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerTextBig.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerUpDown.png" />
-    <Content Include="Styles\TimeEntry\images\spinnerUpDownBig.png" />
-    <Content Include="Styles\TimeEntry\jquery.timeentry.css" />
-    <Content Include="Styles\TimeEntry\jquery.timeentry.min.css" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerBlue.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerBlueBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerDefault.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerDefaultBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerGem.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerGemBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerGreen.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerGreenBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerOrange.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerOrangeBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerSquare.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerSquareBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerText.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerTextBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerUpDown.png" />
+    <Content Include="Styles\jQuery.TimeEntry\spinnerUpDownBig.png" />
+    <Content Include="Styles\jQuery.TimeEntry\jquery.timeentry.css" />
+    <Content Include="Styles\jQuery.TimeEntry\jquery.timeentry.min.css" />
     <Content Include="Web.config" />
     <Content Include="Scripts\Web.config" />
     <Content Include="Styles\Web.config" />
@@ -956,6 +955,7 @@
     <Compile Include="ResourceManifests\jQueryCalendars.cs" />
     <Compile Include="ResourceManifests\jQueryFileUpload.cs" />
     <Compile Include="ResourceManifests\jQueryColorbox.cs" />
+    <Compile Include="ResourceManifests\jQueryTimeEntry.cs" />
     <Compile Include="ResourceManifests\jQueryUtilities.cs" />
     <Compile Include="ResourceManifests\jQueryUI.cs" />
     <Compile Include="ResourceManifests\Uri.cs" />

src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/jQueryTimeEntry.cs

@@ -0,0 +1,18 @@
+using Orchard.UI.Resources;
+
+namespace Orchard.Resources.ResourceManifests {
+    public class jQueryTimeEntry : IResourceManifestProvider {
+        public void BuildManifests(ResourceManifestBuilder builder) {
+            var manifest = builder.Add();
+
+            manifest.DefineScript("jQueryTimeEntry")
+                .SetUrl("jQuery.TimeEntry/jquery.timeentry.min.js", "jQuery.TimeEntry/jquery.timeentry.js")
+                .SetDependencies("jQueryPlugin")
+                .SetVersion("2.0.1");
+
+            manifest.DefineStyle("jQueryTimeEntry")
+                .SetUrl("jQuery.TimeEntry/jquery.timeentry.min.css", "jQuery.TimeEntry/jquery.timeentry.css")
+                .SetVersion("2.0.1");
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/jQueryUI.cs

@@ -35,15 +35,6 @@ namespace Orchard.Resources.ResourceManifests {
             // Right now no customization in the styles, but the resource might be used later.
             manifest.DefineStyle("jQueryUI_Orchard").SetDependencies("jQueryUI_Full");
 
-            // jQuery Time Entry.
-            manifest.DefineScript("jQueryTimeEntry")
-                .SetUrl("TimeEntry/jquery.timeentry.min.js", "TimeEntry/jquery.timeentry.js")
-                .SetDependencies("jQueryPlugin")
-                .SetVersion("2.0.1");
-            manifest.DefineStyle("jQueryTimeEntry")
-                .SetUrl("TimeEntry/jquery.timeentry.min.css", "TimeEntry/jquery.timeentry.css")
-                .SetVersion("2.0.1");
-
             // jQuery Date/Time Editor Enhancements.
             manifest.DefineStyle("jQueryDateTimeEditor")
                 .SetUrl("jquery-datetime-editor.min.css", "jquery-datetime-editor.css")

src/Orchard.Web/Modules/Orchard.Resources/Views/TimeEntryLocalization.cshtml

@@ -42,7 +42,7 @@
         };
         $.timeEntry.setDefaults($.timeEntry.regionalOptions['@HttpUtility.JavaScriptStringEncode(currentCulture.Name)']);
         $.timeEntry.setDefaults({
-            spinnerImage: '@HttpUtility.JavaScriptStringEncode(Url.Content("~/Modules/Orchard.Resources/Styles/images/spinnerDefault.png"))'
+            spinnerImage: '@HttpUtility.JavaScriptStringEncode(Url.Content("~/Modules/Orchard.Resources/Styles/jQuery.TimeEntry/spinnerDefault.png"))'
         });
     })
     //]]>