Bug 22015: Move DataTables CSS to global include

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / tools / holidays.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 4ad136e..8ba0d6d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -5,7 +5,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; [% Branches.GetName( branch ) | html %] calendar</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") | $raw %]
 <style> .key { padding : 3px; white-space:nowrap; line-height:230%; }
 .ui-datepicker { font-size : 150%; }
 .ui-datepicker th, .ui-datepicker .ui-datepicker-title select { font-size : 80%; }
@@ -516,7 +515,19 @@ td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Bl
             $("a.helptext").click(function(){
                 $(this).parent().find(".hint").toggle(); return false;
             });
-            $("#dateofrange").datepicker();
+            $("#dateofrange").datepicker({
+              beforeShow: function() {
+                var startdate = $("#jcalendar-container").datepicker("getDate");
+                if (startdate !== null) {
+                   var sd = new Date(startdate);
+                   var ed = new Date($(this).datepicker("getDate"));
+                   if (ed < sd) {
+                     $(this).datepicker("setDate", startdate);
+                     $(this).datepicker("option", "defaultDate", startdate);
+                   }
+                }
+              }
+            });
             $("#datecancelrange").datepicker();
             $("#dateofrange").each(function () { this.value = "" });
             $("#datecancelrange").each(function () { this.value = "" });
@@ -530,6 +541,16 @@ td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Bl
                 },
             onSelect: function(dateText, inst) {
                 dateChanged($(this).datepicker("getDate"));
+                var enddate = $("#dateofrange").datepicker("getDate");
+                $("#dateofrange").datepicker("option", "defaultDate", $(this).datepicker("getDate"));
+                if (enddate !== null) {
+                   var ed = new Date(enddate);
+                   var sd = new Date($(this).datepicker("getDate"));
+                   if (ed < sd) {
+                     $("#dateofrange").datepicker("setDate", $(this).datepicker("getDate"));
+                     $("#dateofrange").datepicker("option", "defaultDate", enddate);
+                   }
+                }
             },
             defaultDate: new Date("[% keydate | html %]")
             });