X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fcirc%2Foverdue.tt;h=f45dbeabfeaa20691c2b486b4d09ca8b8bd5d726;hb=3ce542ce2668770a5669d2fb98b666f42a5bd388;hp=c230e7625268c229563137af4c07cc6b69d5d57c;hpb=0486d0c6b781fbda73df19eb825ef330bdc4544a;p=srvgit

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index c230e76252..f45dbeabfe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -1,79 +1,67 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Items Overdue as of [% todaysdate %]</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Items overdue as of [% todaysdate %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/JavaScript" language="JavaScript">
-//<![CDATA[
-    function clone_parent(node) {
+[% INCLUDE 'calendar.inc' %]
+<script type="text/javascript">
+ //<![CDATA[
+     function clone_parent(node) {
         var parent = node.parentNode;
-		var clone = parent.cloneNode(true);
+        var clone = parent.cloneNode(true);
+        parent.parentNode.insertBefore(clone, parent.nextSibling);
         $("a", clone).attr("style", "visibility: visible");
         $("input", clone).attr("value", "");
 
-		var theid = $("span", clone).attr("id") || "";
-		var parts = theid.match(/^pattrodue-getready-(.*)$/);
-		if (parts && parts.length > 1)
-		{
-			var appendid = "-" + Math.floor(Math.random()*1000+1);
-			$("span", clone).attr("id",theid+appendid);
 
-			theid = $("input", clone).attr("id");
-			$("input", clone).attr("id",theid+appendid);
+        var theid = $("span", clone).attr("id") || "";
+        var theid = $("span", clone).attr("id") || "";
+        var parts = theid.match(/^pattrodue-getready-(.*)$/);
+        if (parts && parts.length > 1)
+        {
+            var appendid = "-" + Math.floor(Math.random()*1000+1);
+            $("span", clone).attr("id",theid+appendid);
 
-			theid = $("div[id]", clone).attr("id");
-			$("div[id]", clone).attr("id",theid+appendid);
+            theid = $("input", clone).attr("id");
+            $("input", clone).attr("id",theid+appendid);
 
-			var attrcode = $("script", clone).attr("x-code");
-			var newsuffix = parts[1] + appendid;
-            [% IF ( CircAutocompl ) %]
-                create_auto_completion_responder(newsuffix,attrcode);
-            [% END %]
-		}
+            theid = $("div[id]", clone).attr("id");
+            $("div[id]", clone).attr("id",theid+appendid);
+
+            var attrcode = $("script", clone).attr("x-code");
+            var newsuffix = parts[1] + appendid;
+            create_auto_completion_responder(newsuffix,attrcode);
+        }
 
-        parent.parentNode.insertBefore(clone, parent.nextSibling);
     }
+
+
     function delete_parent(node) {
         var parent = node.parentNode;
         parent.parentNode.removeChild(parent);
     }
-    [% IF ( CircAutocompl ) %]
-	function create_auto_completion_responder(uniqueid,attrcode) {
-		YAHOO.util.Event.onContentReady("pattrodue-getready-"+uniqueid, function() {
-			new function() {
-				// Define a custom formatter function
-				this.fnCustomFormatter = function(oResultItem, sQuery) {
-					var description = oResultItem[0];
-					var authorised_value = oResultItem[1];
-					var aMarkup = [
-						"<div class='pattrodue-result'>",
-						description,
-						" (",
-						authorised_value,
-						")",
-						"</div>"];
-					return (aMarkup.join(""));
-				};
-
-				// Instantiate an XHR DataSource
-				this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ypattrodue-attr-search-authvalue.pl/"+attrcode, ["\n", "\t"]);
-				this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-				this.oACDS.maxCacheEntries = 60;
-				this.oACDS.queryMatchSubset = true;
 
-				// Instantiate an AutoComplete Widget with uniqueid
-				var myInput = document.getElementById('pattrodue-input-'+uniqueid);
-				var myContainer = document.getElementById('pattrodue-container-'+uniqueid);
-				this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-				this.oAutoComp.formatResult = this.fnCustomFormatter;
-			}
-		});
-	}
-    [% END %]
+    function create_auto_completion_responder(uniqueid,attrcode) {
+       $("#pattrodue-getready-" + uniqueid).ready(function(){
+            $( "#pattrodue-input-" + uniqueid ).autocomplete({
+                source: "/cgi-bin/koha/circ/ypattrodue-attr-search-authvalue.pl/"+attrcode,
+                select: function( event, ui ) {
+                    $( "#pattrodue-input-"+uniqueid ).val( ui.item.description );
+                    return false;
+                }
+            })
+            .data( "autocomplete" )._renderItem = function( ul, item ) {
+                return $( "<li></li>" )
+                .data( "item.autocomplete", item )
+                .append( "<a>" + item.description + " (" + item.authorised_value + ")</a>" )
+                .appendTo( ul )
+                .css("font-size","90%").css("width","13em");
+            };
+        });
+    }
 //]]>
 </script>
 <style type="text/css">
     .sql {display:none;}
 </style>
-[% INCLUDE 'calendar.inc' %]
 </head>
 <body id="circ_overdue" class="circ">
 [% INCLUDE 'header.inc' %]
@@ -89,14 +77,14 @@
 
 [% IF ( noreport ) %]
 
-<h2>Overdue Report</h2>
+<h2>Overdue report</h2>
 
 <p>Please choose one or more filters to proceed.</p>
 
 [% ELSE %]
 
 <h2>[% nnoverdue %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %]
-	 Overdue as of [% todaysdate %][% IF ( isfiltered ) %] (filtered)[% END %]</h2>
+overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2>
 
 <p>
     [% IF ( isfiltered ) %]
@@ -109,7 +97,7 @@
 <div class="searchresults">
 <table id="overduest">
 <thead><tr>
-    <th>Due Date</th>
+    <th>Due date</th>
     <th>Patron</th>
     <th>Library</th>
     <th>Title</th>
@@ -140,35 +128,15 @@
 <div class="yui-b">
 <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
   <fieldset class="brief">
-<h4>Filter On:</h4>
+<h4>Filter on:</h4>
 	<fieldset><legend>Date due:</legend>
 	<ol>
-    <li><label for="dateduefrom">From:</label>
-	<input type="text" id="dateduefrom" name="dateduefrom" size="10" value="[% dateduefrom %]" />
-	<img src="[% themelang %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show Calendar" />
-	<script language="JavaScript" type="text/javascript">
-	    Calendar.setup(
-	    {
-		inputField : "dateduefrom",
-		ifFormat : "[% DHTMLcalendar_dateformat %]",
-		button : "dateduefrom_button"
-	    }
-	    );
-	</script>
+    <li><label for="from">From:</label>
+    <input type="text" id="from" name="dateduefrom" size="10" value="[% dateduefrom %]" class="datepickerfrom" />
 	</li>
 	<li>
-	<label for="datedueto">To:</label>
-	<input type="text" id="datedueto" name="datedueto" size="10" value="[% datedueto %]" />
-	<img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" />
-	<script language="JavaScript" type="text/javascript">
-	    Calendar.setup(
-	    {
-		inputField : "datedueto",
-		ifFormat : "[% DHTMLcalendar_dateformat %]",
-		button : "datedueto_button"
-	    }
-	    );
-	</script>
+    <label for="to">To:</label>
+    <input type="text" id="to" name="datedueto" size="10" value="[% datedueto %]" class="datepickerto" />
     </li>
     </ol></fieldset>
     <ol>
@@ -186,20 +154,19 @@
             [% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]
             [% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>
             [% ELSE %]<option value="debarred">Restricted</option>[% END %]
-            [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost Card</option>
-            [% ELSE %]<option value="lost">Lost Card</option>[% END %]
+            [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>
+            [% ELSE %]<option value="lost">Lost card</option>[% END %]
         </select>
     </li>
 	[% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]
 		<!-- domid cgivalue ismany isclone ordinal code description repeatable authorised_value_category -->
 		<li>
 			<label>[% patron_attr_filter_loo.description %]:</label>
-            [% IF ( patron_attr_filter_loo.authorised_value_category AND CircAutocompl) %]
-                <script type="text/JavaScript" language="JavaScript" x-code="[% patron_attr_filter_loo.code |html %]">create_auto_completion_responder([% patron_attr_filter_loo.domid %],"[% patron_attr_filter_loo.code |html %]");</script>
+            [% IF ( patron_attr_filter_loo.authorised_value_category ) %]
+                <script type="text/javascript" x-code="[% patron_attr_filter_loo.code |html %]">create_auto_completion_responder([% patron_attr_filter_loo.domid %],"[% patron_attr_filter_loo.code |html %]");</script>
 				<span id="pattrodue-getready-[% patron_attr_filter_loo.domid %]">
 						<div class="pattrodue-autocomplete">
 							<input autocomplete="off" id="pattrodue-input-[% patron_attr_filter_loo.domid %]" name="patron_attr_filter_[% patron_attr_filter_loo.code |html %]" value="[% patron_attr_filter_loo.cgivalue |html %]"  class="pattrodue-input" type="text" />
-							<div id="pattrodue-container-[% patron_attr_filter_loo.domid %]" class="pattrodue-container"></div>
 						</div>
 				</span>
 			[% ELSE %]
@@ -237,18 +204,18 @@
       </select>
     </li>
 
-    <li><label for="order">Sort By:</label> <select name="order" id="order">
+    <li><label for="order">Sort by:</label> <select name="order" id="order">
 [% FOREACH ORDER_LOO IN ORDER_LOOP %]
     [% IF ( ORDER_LOO.selected ) %]
     <option value="[% ORDER_LOO.ordervalue %]" selected="selected">
     [% ELSE %]
     <option value="[% ORDER_LOO.ordervalue %]">
     [% END %]
-    [% IF ( ORDER_LOO.order_date_due ) %]Due Date
+    [% IF ( ORDER_LOO.order_date_due ) %]Due date
     [% ELSIF ( ORDER_LOO.order_borrower ) %]Patron
     [% ELSIF ( ORDER_LOO.order_barcode ) %]Barcode
     [% ELSIF ( ORDER_LOO.order_title ) %]Title
-    [% ELSIF ( ORDER_LOO.order_date_due_desc ) %]Due Date desc
+    [% ELSIF ( ORDER_LOO.order_date_due_desc ) %]Due date desc
     [% ELSIF ( ORDER_LOO.order_borrower_desc ) %]Patron desc
     [% ELSIF ( ORDER_LOO.order_barcode_desc ) %]Barcode desc
     [% ELSIF ( ORDER_LOO.order_title_desc ) %]Title desc
@@ -272,7 +239,7 @@
 </li>
 </ol>
    <fieldset class="action">
-      <input type="submit" value="Apply Filter" class="submit" />
+      <input type="submit" value="Apply filter" class="submit" />
       <input type="hidden" name="op" value="apply filter" />
    </fieldset>
    </fieldset>