X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fhistsearch.tmpl;h=3b29414ccc119daee0ef7a86a768d47716207ed0;hb=182f9df495064b4401b0c581b19cc0adb41f58b8;hp=d68cd4ae33bf0ee35885ccace694a52cde906150;hpb=6c548c265cff6c98afd47352a23f020e326bd22d;p=koha_fer

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 d68cd4ae33..3b29414ccc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -1,6 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_IF NAME="suggestions_loop" -->Orders search &rsaquo; Search Results<!-- TMPL_ELSE -->Order search<!-- /TMPL_IF --></title>
-<!-- TMPL_INCLUDE NAME="doc-head-calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
@@ -19,71 +18,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>
@@ -107,7 +76,7 @@
 					        &nbsp;
 					    <!-- /TMPL_IF -->
 					</td>
-					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
                         <br /><!-- TMPL_VAR NAME="author" --></td>
 					<td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR NAME="name" --></a></td>
 					<td><!-- TMPL_VAR name="creationdate" --></td>