[Koha-patches] [PATCH] Refining some circ reports interfaces, adding table sorting.
Owen Leonard
oleonard at myacpl.org
Tue Apr 22 16:54:17 CEST 2008
---
.../intranet-tmpl/prog/en/css/staff-global.css | 14 ++
.../prog/en/modules/admin/branches.tmpl | 26 ++-
.../prog/en/modules/circ/overdue.tmpl | 95 ++++++----
.../prog/en/modules/circ/pendingreserves.tmpl | 195 +++++++++++---------
.../prog/en/modules/circ/reserveratios.tmpl | 200 +++++++++++---------
.../prog/en/modules/circ/transferstodo.tmpl | 49 +++--
.../prog/en/modules/circ/transferstoreceive.tmpl | 50 ++++--
7 files changed, 371 insertions(+), 258 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index baadc3f..2962295 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -448,6 +448,20 @@ fieldset.brief div.hint, fieldset.rows div.hint {
margin-bottom : .4em;
}
+div.yui-b fieldset.brief {
+ padding : .4em .7em;
+}
+
+div.yui-b fieldset.brief ol {
+ font-size : 85%;
+ margin : 0;
+ padding : 0;
+}
+
+div.yui-b fieldset.brief select {
+ width: 12em;
+}
+
fieldset.rows {
border-width : 1px;
border-bottom : 1px solid black;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index d5732a9..5ab2659 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -2,6 +2,7 @@
<title>Koha › Administration › <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Libraries, branches, & Groups › Edit Group <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Libraries, branches, & Groups › New Group<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Libraries, branches, & Groups › Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
<!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Libraries, branches, & Groups › Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Libraries, branches, & Groups › Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Libraries, branches, & Groups<!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -35,6 +36,11 @@
$(document).ready(function() {
yuiToolbar();
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#branchest").tablesorter({
+ sortList: [[0,0]],
+ headers: { 3:{sorter:false},4:{sorter:false},5:{sorter:false},6:{sorter:false}}
+ });
});
// YUI Toolbar Functions
@@ -130,18 +136,23 @@
<!-- TMPL_IF name="MESSAGE7" --><div class="dialog message">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
<!-- TMPL_IF name="MESSAGE8" --><div class="dialog message">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
- <table>
- <tr>
- <th>Name</th>
+<!-- TMPL_IF NAME="branches" -->
+ <table id="branchest">
+<thead> <tr>
+ <th>Name</th>
<th>Code</th>
<th>Address</th>
<th>Properties</th>
<th>IP</th>
<th>Printer</th>
<th colspan="2"> </th>
- </tr>
+ </tr></thead><tbody>
<!-- TMPL_LOOP name="branches" -->
- <tr>
+ <!-- TMPL_IF NAME="toggle" -->
+ <tr>
+ <!-- TMPL_ELSE -->
+ <tr class="highlight">
+ <!-- /TMPL_IF -->
<td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
<td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
<td>
@@ -183,8 +194,11 @@
<a href="<!-- TMPL_VAR name="action" -->?branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->&branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&op=delete">Delete</a>
</td>
</tr>
- <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP --></tbody>
</table>
+ <!-- TMPL_ELSE -->
+ <div class="dialog message">There are no branches defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add">Start defining libraries</a>.</div>
+ <!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchcategories" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index 7539d8c..9d235f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -1,6 +1,25 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Circulation › Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+ id: 'articles',
+ is: function(s) {return false; },
+ format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+ type: 'text'
+});
+ $(document).ready(function() {
+ $('#patronlists > ul').tabs();
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#overduest").tablesorter({
+ sortList: [[0,0]],
+ headers: { 1: { sorter: 'articles' }}
+ });
+ });
+//]]>
+</script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -8,17 +27,49 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Overdues as of <!-- TMPL_VAR NAME="todaysdate" --></div>
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
- <div class="yui-g">
+ <div class="yui-b">
<h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
- <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
- <fieldset class="rows">
- <legend>Filter on :</legend>
+ <h3>Results</h3>
+<a href="overdue.pl?op=csv&branch=<!-- TMPL_VAR name="branchfilter" -->">Download file of all overdues</a> (for <!-- TMPL_IF name="branchfilter" -->branch <!-- TMPL_VAR name="branchfilter" --><!-- TMPL_ELSE -->all branches<!-- /TMPL_IF -->. Other filters are ignored)
+<div class="searchresults">
+<table id="overduest">
+<thead><tr>
+ <th>Due Date</th>
+ <th>Patron</th>
+ <th>Branch</th>
+ <th>Title</th>
+</tr></thead>
+
+<tbody><!-- TMPL_LOOP NAME="overdueloop" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="duedate" --></td>
+ <!-- TMPL_IF NAME="email" -->
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a> <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">[email]</a> (<!-- TMPL_VAR NAME="phone" -->)</td>
+ <!-- TMPL_ELSE -->
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a> (<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->
+ <!--TMPL_IF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSE --><!--TMPL_IF NAME="phonepro" --> <!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->)</td>
+ <!-- /TMPL_IF -->
+ <td><!-- TMPL_VAR name="branchcode" --></td>
+ <td>
+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
+ <p><!-- TMPL_VAR NAME="author" --></p>
+ </td>
+ </tr>
+<!-- /TMPL_LOOP --></tbody>
+</table>
+</div>
+</div>
+</div>
+<div class="yui-b">
+<form method="post" action="/cgi-bin/koha/circ/overdue.pl">
+ <fieldset class="brief">
+<h4>Filter On:</h4>
<ol>
<li><label>Name or cardnumber:</label><input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->" /></li>
<li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
@@ -62,43 +113,11 @@
<!-- TMPL_IF NAME="showall" --><input type="checkbox" id="showall" name="showall" value="show" checked="checked" /><!-- TMPL_ELSE --><input type="checkbox" id="showall" name="showall" value="show" /><!-- /TMPL_IF -->
</li>
</ol>
- </fieldset>
<fieldset class="action">
<input type="submit" value="Apply Filter" class="submit" />
</fieldset>
+ </fieldset>
</form>
-
- <h3>Results</h3>
-<a href="overdue.pl?op=csv&branch=<!-- TMPL_VAR name="branchfilter" -->">Download file of all overdues</a> (for <!-- TMPL_IF name="branchfilter" -->branch <!-- TMPL_VAR name="branchfilter" --><!-- TMPL_ELSE -->all branches<!-- /TMPL_IF -->. Other filters are ignored)
-<div class="searchresults">
-<table>
-<tr>
- <th>Due Date</th>
- <th>Patron</th>
- <th>Branch</th>
- <th>Title</th>
-</tr>
-
-<!-- TMPL_LOOP NAME="overdueloop" -->
- <tr>
- <td><!-- TMPL_VAR NAME="duedate" --></td>
- <!-- TMPL_IF NAME="email" -->
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a> <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">[email]</a> (<!-- TMPL_VAR NAME="phone" -->)</td>
- <!-- TMPL_ELSE -->
- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a> (<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->
- <!--TMPL_IF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSE --><!--TMPL_IF NAME="phonepro" --> <!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->)</td>
- <!-- /TMPL_IF -->
- <td><!-- TMPL_VAR name="branchcode" --></td>
- <td>
- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
- <p><!-- TMPL_VAR NAME="author" --></p>
- </td>
- </tr>
-<!-- /TMPL_LOOP -->
-</table>
</div>
</div>
-</div>
-
-</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 3d7a49b..74cba1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -8,6 +8,25 @@
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
<!-- End of additions -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+ id: 'articles',
+ is: function(s) {return false; },
+ format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+ type: 'text'
+});
+ $(document).ready(function() {
+ $("th a").hide();
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#holdst").tablesorter({
+ sortList: [[3,0]],
+ headers: { 0:{sorter:false},1:{sorter:false},3: { sorter: 'articles' },7:{sorter:false}}
+ });
+ });
+//]]>
+</script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -16,93 +35,19 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Pending Holds</div>
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
- <div class="yui-g">
-
-<h1>Pending holds placed between <!-- TMPL_VAR NAME="from" --> and <!-- TMPL_VAR NAME="to" --></h1>
-<div id="filters">
-<br />
-<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
-<p>
-
-<label for="from">
- Start date:
-</label>
-<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
-<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>
-<label for="to" >
- End date:
-</label>
-<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" />
-<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>
-<br/>
-<i>(Inclusive, default is 10 years ago to yesterday, set "to" to today as needed. )</i>
-<input type="submit" value="Go" class="submit"/>
-</p>
-</form>
-<p>The following holds have not been filled. Please retrieve them and check them in</p>
-</div>
+ <div class="yui-b">
+<h2>Pending holds placed between <!-- TMPL_VAR NAME="from" --> and <!-- TMPL_VAR NAME="to" --></h2>
+<h3>Reported on <!-- TMPL_VAR NAME="todaysdate" --></h3>
+<p>The following holds have not been filled. Please retrieve them and check them in.</p>
<div class="searchresults">
<!-- TMPL_IF NAME="reserveloop" -->
- <table>
- <tr>
+ <table id="holdst">
+ <thead><tr>
<th>
Pull This Many Items
</th>
@@ -112,7 +57,7 @@ Calendar.setup(
<th>
Patrons with Holds
</th>
- <th >Title
+ <th>Title
<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
</th>
<th>
@@ -135,9 +80,9 @@ Calendar.setup(
<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=date&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
</th>
- </tr>
+ </tr></thead>
- <!-- TMPL_LOOP NAME="reserveloop" -->
+ <tbody> <!-- TMPL_LOOP NAME="reserveloop" -->
<tr>
<!-- TMPL_IF name="borrowernumber" -->
<td><p><b><!-- TMPL_VAR NAME="pullcount" --></b></p></td>
@@ -179,12 +124,92 @@ Calendar.setup(
<!-- TMPL_IF NAME="statusw" --><p>Waiting</p><!-- /TMPL_IF --><!-- TMPL_IF NAME="statusf" --><p>Fullfilled</p><!-- /TMPL_IF -->
</td>
</tr>
- <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP --></tbody>
</table>
<!-- TMPL_ELSE -->
<b>No items found.</b>
<!-- /TMPL_IF -->
</div>
+
+</div>
+</div>
+<div class="yui-b">
+<div id="filters">
+
+<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
+<fieldset class="brief">
+<h4>Refine Results</h4>
+<ol>
+<li>
+<label for="from">
+ Start date:
+</label>
+<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
+<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">
+ End date:
+</label>
+<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" />
+<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>
+<p><i>(Inclusive, default is 10 years ago to yesterday, set "to" to today as needed. )</i></p>
+<fieldset class="action"><input type="submit" value="Submit" class="submit"/></fieldset>
+</fieldset>
+</form>
+
</div>
</div>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
index 3194139..d7f94a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
@@ -8,6 +8,25 @@
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
<!-- End of additions -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+ id: 'articles',
+ is: function(s) {return false; },
+ format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+ type: 'text'
+});
+ $(document).ready(function() {
+ $("th a").hide();
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#holdst").tablesorter({
+ sortList: [[0,0]],
+ headers: { 1: { sorter: 'articles' }}
+ });
+ });
+//]]>
+</script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -16,25 +35,98 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Hold Ratios</div>
-<div id="doc" class="yui-t7">
+<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
- <div class="yui-g">
-
-<h1>Hold Ratios to Calculate Items Needed<br/>
- Calculated on <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
- to <!-- TMPL_VAR NAME="to" --></h1>
-<div id="filters">
-<br />
+ <div class="yui-b">
+<h1>Hold Ratios to Calculate Items Needed</h1>
+ <h3>Calculated on <!-- TMPL_VAR NAME="todaysdate" -->. From <!-- TMPL_VAR NAME="from" -->
+ to <!-- TMPL_VAR NAME="to" --></h3>
+<p>These items have a large number of holds.</p>
+<div class="searchresults">
+ <!-- TMPL_IF NAME="reserveloop" -->
+ <table id="holdst">
+<thead> <tr>
+ <th>Reserves
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=reservecount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Items
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itemcount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Title
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Holding Branches
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=branch&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Location
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=location&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Itype
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itype&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Call Numbers
+ <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=callnumber&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
+ </th>
+ <th>Items Needed
+ </th>
+ </tr></thead>
+
+ <tbody><!-- TMPL_LOOP NAME="reserveloop" -->
+ <!-- TMPL_IF name="ratio_ge_one" -->
+ <tr>
+ <td>
+ <p><!-- TMPL_VAR NAME="reservecount" --></p>
+ </td>
+ <td>
+ <p><!-- TMPL_VAR NAME="itemcount" --></p>
+ </td>
+ <td>
+ <p>
+ <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+ <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+ <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+ </a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </p>
+ <p><!-- TMPL_VAR NAME="notes" --></p>
+ </td>
+ <td><p><!-- TMPL_VAR NAME="listbranch" --></p></td>
+ <td><p><!-- TMPL_VAR NAME="location" --></p></td>
+ <td><p><!-- TMPL_VAR NAME="itype" --></p></td>
+ <td><p><!-- TMPL_VAR NAME="listcall" --></p></td>
+ <td><p><b>Order: <!-- TMPL_VAR NAME="ratiocalc" --></b></p></td>
+ </tr>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP --></tbody>
+ </table>
+ <!-- TMPL_ELSE -->
+ <b>No items found.</b>
+ <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+<div class="yui-b">
<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
-<p>
-<label for="ratio">
+<fieldset class="brief">
+<h4>Refine Results:</h4>
+<ol><li><label for="ratio">
Hold Ratio:
</label>
-<input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" />
-<label for="from">
+<input type="text" size="5" id="ratio" name="ratio" value="<!-- TMPL_VAR NAME="ratio" -->" /></li>
+<li><label for="from">
Start date:
</label>
<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
@@ -64,8 +156,8 @@ Calendar.setup(
dateStatusFunc : validate1
}
);
-</script>
-<label for="to" >
+</script></li>
+<li><label for="to" >
End date:
</label>
<input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
@@ -96,87 +188,13 @@ Calendar.setup(
dateStatusFunc : validate2
}
);
-</script>
+</script></li></ol>
(inclusive)
-<input type="submit" value="Go" class="submit"/>
-</p>
+<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
+</fieldset>
</form>
-<p>These items have a large number of holds.</p>
-</div>
-<div class="searchresults">
- <!-- TMPL_IF NAME="reserveloop" -->
- <table>
- <tr>
- <th >Reserves
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=reservecount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th >Items
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itemcount&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th >Title
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=biblio&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th>Holding Branches
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=branch&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th>Location
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=location&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th>Itype
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=itype&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th>Call Numbers
- <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=<!-- TMPL_VAR NAME="ratio" -->&order=callnumber&from=<!-- TMPL_VAR NAME="from" -->&to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
- </th>
- <th >Items Needed
- </th>
- </tr>
-
- <!-- TMPL_LOOP NAME="reserveloop" -->
- <!-- TMPL_IF name="ratio_ge_one" -->
- <tr>
- <td>
- <p><!-- TMPL_VAR NAME="reservecount" --></p>
- </td>
- <td>
- <p><!-- TMPL_VAR NAME="itemcount" --></p>
- </td>
- <td>
- <p>
- <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
- </a>
- <!-- TMPL_ELSE -->
- <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
- <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
- </a>
- <!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
- <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
- </a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- </p>
- <p><!-- TMPL_VAR NAME="notes" --></p>
- </td>
-
- <td><p><!-- TMPL_VAR NAME="listbranch" --></p></td>
- <td><p><!-- TMPL_VAR NAME="location" --></p></td>
- <td><p><!-- TMPL_VAR NAME="itype" --></p></td>
- <td><p><!-- TMPL_VAR NAME="listcall" --></p></td>
- <td><p><b>Order: <!-- TMPL_VAR NAME="ratiocalc" --></b></p></td>
- </tr>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </table>
- <!-- TMPL_ELSE -->
- <b>No items found.</b>
- <!-- /TMPL_IF -->
-</div>
</div>
</div>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index a264991..1703e2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -1,6 +1,24 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Circulation › Transfers to do</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+ id: 'articles',
+ is: function(s) {return false; },
+ format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+ type: 'text'
+});
+ $(document).ready(function() {
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#transferst").tablesorter({
+ sortList: [[1,0]],
+ headers: { 1: { sorter: 'articles' },4:{sorter:false}}
+ });
+ });
+//]]>
+</script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -15,44 +33,33 @@
<div class="yui-g">
- <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
+ <h1>Transfers to do, <!-- TMPL_VAR NAME="show_date" --></h1>
<!-- TMPL_IF name="branchesloop" -->
<div id="resultlist">
<!-- TMPL_LOOP NAME="branchesloop" -->
<!-- TMPL_IF NAME="branchcode" -->
- <table>
- <tr>
- <th colspan="5">Holds waiting for: <!-- TMPL_VAR NAME="branchname" --> </th>
- </tr>
- <tr>
+ <h4>Holds waiting for: <!-- TMPL_VAR NAME="branchname" --></h4>
+ <table id="transferst">
+ <thead><tr>
<th>Date of hold</th>
<th>Title</th>
<th>Patron</th>
<th>Localisation</th>
<th>Action</th>
- </tr>
- <!-- TMPL_LOOP NAME="reserv" -->
+ </tr></thead>
+ <tbody><!-- TMPL_LOOP NAME="reserv" -->
<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
<td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold over <!-- /TMPL_IF --></td>
- <td>
- <p>
- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
- (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
- <br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
- </p>
- </td>
- <td>
- <p>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br />
+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<b><!-- TMPL_VAR NAME="itemtype" --> </b>) <br />Barcode : <!-- TMPL_VAR NAME="barcode" --></td>
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br />
<!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borrowermail" -->
<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borrowermail" -->
</a>
<!--/TMPL_IF-->
- </p>
</td>
- <td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
+ <td><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
<td>
<form name="dotransfer" action="/cgi-bin/koha/circ/waitingreserves.pl" method="post">
<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
@@ -62,7 +69,7 @@
</form>
</td>
</tr>
- <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP --></tbody>
</table>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index bc0224e..b6ccf66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -1,6 +1,24 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Circulation › Transfers to your library</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pack.js"></script>
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$.tablesorter.addParser({
+ id: 'articles',
+ is: function(s) {return false; },
+ format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+ type: 'text'
+});
+ $(document).ready(function() {
+ $.tablesorter.defaults.widgets = ['zebra'];
+ $("#transferst").tablesorter({
+ sortList: [[1,0]],
+ headers: { 1: { sorter: 'articles' },4:{sorter:false}}
+ });
+ });
+//]]>
+</script>
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -15,35 +33,34 @@
<div class="yui-g">
- <h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <h1>Transfers made to your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
<!-- TMPL_IF name="branchesloop" -->
<p>Your library is the destination for the following transfer(s)</p>
<div id="resultlist">
<!-- TMPL_LOOP NAME="branchesloop" -->
<!-- TMPL_IF NAME="branchcode" -->
- <table style="width: 100%">
+ <table style="width: 100%" id="transferst">
<caption>Coming from <!-- TMPL_VAR NAME="branchname" --></caption>
- <tr>
+ <thead><tr>
<th>Date of transfer</th>
<th>Title</th>
<th>Reserved by </th>
<th>Localisation</th>
<th>Action</th>
- </tr>
- <!-- TMPL_LOOP NAME="reserv" -->
- <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
+ </tr></thead>
+ <tbody><!-- TMPL_LOOP NAME="reserv" -->
+ <!-- TMPL_IF NAME="messcompa" -->
+ <tr class="problem">
+ <!-- TMPL_ELSE -->
+ <tr>
+ <!-- /TMPL_IF -->
<td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF --></td>
- <td>
- <p>
- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <td><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
(<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
- </p>
</td>
- <td>
- <!-- TMPL_IF NAME="borrowername" -->
- <p>
- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->">
+ <td><!-- TMPL_IF NAME="borrowername" -->
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->">
<!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
</a>
<br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
@@ -52,14 +69,13 @@
<!-- TMPL_VAR NAME="borrowermail" -->
</a>
<!--/TMPL_IF-->
- </p>
<!-- TMPL_ELSE -->
<p>
None
</p>
<!-- /TMPL_IF -->
</td>
- <td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
+ <td><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
<td>
<!--<form name="dotransfer" action="currenttransfers.pl" method="post">
<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
@@ -67,7 +83,7 @@
</form>-->
</td>
</tr>
- <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP --> </tbody>
</table>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
--
1.5.2.1
More information about the Koha-patches
mailing list