Calendar (js) tweaks: histsearch fixed, viewlog template updated

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / histsearch.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index d68cd4a..b6baacf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -19,71 +19,41 @@
                <!-- TMPL_UNLESS NAME="suggestions_loop" --><form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
 <fieldset class="rows">
        <legend>Search Orders</legend>
-                                       <ol>
-                                       <li><label for="title">Title: </label> <input type="text" name="title" id="title" value="<!-- TMPL_VAR name="title"-->" /></li>
-                                       <li><label for="author">Author: </label> <input type="text" name="author" id="author" value="<!-- TMPL_VAR name="author" -->" /></li>
-                                       <li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="<!-- TMPL_VAR name="name" -->" /></li>
-                                       <li><label for="from">From: </label> 
-                                               <input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" /> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
-                                               <script language="JavaScript" type="text/javascript">
-                                                       function validate1(date) {
-                                                               var day = date.getDate();
-                                                               var month = date.getMonth() + 1;
-                                                               var year = date.getFullYear();
-                                                               var weekDay = date.getDay();
-                                                               var dayMonth = month + '-' + day;
-                                                               var dateString = year + '-' + month + '-' + day;
-                                                               var dateTo = document.getElementById('to').value.split("-");
-                                                               var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-                                                               if (date > limitDate) {
-                                                                       return true;
-                                                               } else {
-                                                                       return false;
-                                                               }
-                                                       }
-                                                       Calendar.setup(
-                                                               {
-                                                                       inputField : "from",
-                                                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                                                                       button : "openCalendarFrom",
-                                                                       disableFunc : validate1,
-                                                                       dateStatusFunc : validate1
-                                                               }
-                                                       );
-                                               </script></li>
-                                               <li><label for="to">To: </label> 
-                                               <input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" /> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
-                                               <script type="text/javascript">
-                                                       function validate2(date) {
-                                                               var day = date.getDate();
-                                                               var month = date.getMonth() + 1;
-                                                               var year = date.getFullYear();
-                                                               var weekDay = date.getDay();
-                                                               var dayMonth = month + '-' + day;
-                                                               var dateString = year + '-' + month + '-' + day;
-                                                               var dateFrom = document.getElementById('from').value.split("-");
-                                                               var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-                                                               if (limitDate > date) {
-                                                                       return true;
-                                                               } else {
-                                                                       return false;
-                                                               }
-                                                       }
-       
-                                                       Calendar.setup(
-                                                               {
-                                                                       inputField : "to",
-                                                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                                                                       button : "openCalendarTo",
-                                                                       disableFunc : validate2,
-                                                                       dateStatusFunc : validate2
-                                                               }
-                                                       );
-                                               </script></li>
-                       </ol>
-                       </fieldset>
-                       <fieldset class="action"><input type="submit" value="Search" /></fieldset>
-               </form><!-- /TMPL_UNLESS -->
+               <ol>
+               <li><label for="title">Title: </label> <input type="text" name="title" id="title" value="<!-- TMPL_VAR name="title"-->" /></li>
+               <li><label for="author">Author: </label> <input type="text" name="author" id="author" value="<!-- TMPL_VAR name="author" -->" /></li>
+               <li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="<!-- TMPL_VAR name="name" -->" /></li>
+               <li><label for="from">From: </label> 
+                       <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR name="from_placed_on" -->" />
+                       <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+               </li>
+               <li><label for="to">To: </label> 
+                       <input type="text" size="10" id="to" name="to" value="<!-- TMPL_VAR name="to_placed_on" -->" />
+                       <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
+                       <script type="text/javascript">
+                               // return true if the date is blocked.
+                               function disable_from(date) {var limit = get_Calendar_limit(date,'to'  ); return (limit && limit < date);}  // true or false
+                               function disable_to  (date) {var limit = get_Calendar_limit(date,'from'); return (limit && limit > date);}  // true or false
+                               Calendar.setup({
+                                       inputField : "from",
+                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                                       button : "openCalendarFrom",
+                                       disableFunc : disable_from,
+                                       dateStatusFunc : disable_from
+                               });
+                               Calendar.setup({
+                                       inputField : "to",
+                                       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                                       button : "openCalendarTo",
+                                       disableFunc : disable_to,
+                                       dateStatusFunc : disable_to
+                    });
+                       </script>
+               </li>
+               </ol>
+       </fieldset>
+       <fieldset class="action"><input type="submit" value="Search" /></fieldset>
+       </form><!-- /TMPL_UNLESS -->
        <!-- TMPL_IF NAME="suggestions_loop" --><h1>Search Results</h1>
        <div id="acqui_histsearch">
                <table>