Merge branch 'serials_mods' of git://github.com/colinsc/koha into to-push

Description by Colin Campbell:

A number of commits, subsequent to enabling warnings in C4::Serials and
eradicating errors and removing dead code.
These are extracted from an install branch running at UN FAO in Rome.
Commits have been rebased on current 3.2 HEAD.
These are not major new functionality, but  a series of fixes to
eradicate some randomness caused by undefined values. Includes a commit
to fix Licenses in the serials directory.

* 'serials_mods' of git://github.com/colinsc/koha:
  Check value is defined before splitting it
  Fix FSF Address in directory serials/
  Bug 4380 Use syspref to resolve which bib display is used
  Remove bottleneck making claims page unuseable
  Clean up Pod Documentation
  add warnings to Serials.pm
  Add Text to claim date column's header
  Basic refactoring of serials-edit.pm
  Remove unused or unnecessary variables in claims processing

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index d519aed..845ee85 100755 (executable)
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -936,9 +936,17 @@ if ( $op eq "addbiblio" ) {
             exit;
         }
                elsif($is_a_modif){
-               print $input->redirect(
-                "/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"
-            );
+            my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
+            my $views = { C4::Search::enabled_staff_search_views };
+            if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+                print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber");
+            } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+                print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+            } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+                print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber");
+            } else {
+                print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber");
+            }
             exit;
 
                }else {

diff --git a/docs/history.txt b/docs/history.txt
index 9a35544..b58551d 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -150,6 +150,7 @@ July 11 2003         Koha 2.0.0pre2 released
 July 17 2003    Students at ESIEE develop a feature to allow Koha to use LDAP to authenticate
 July 17 2003    Ecole des mines de Paris commit to using Koha
 July 17 2003    The University of Buffalo decide to use Koha as a teaching tool for Library and Information Studies Students
+August 1 2003  Calyx begin their first Koha installation
 August 19 2003  NPL announces they are live with Koha
 August 26 2003  Richard Anderson (at Katipo) becomes the 28th committer to Koha
 September 9 2003        Koha 2.0.0pre3 released

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 190c9da..cf72ba8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1830,6 +1830,7 @@ h1#xml a {
        padding : 10px;
        text-align : center;
        width : 180px;
+       z-index : 50;
 }
 #cartmenulink {
         background: transparent url("../../img/cart-small.gif") 0 3px no-repeat;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index 6855411..ff67047 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -3,7 +3,7 @@
 <div id="search-facets">
 <h4>Refine your search</h4>
 <ul>
-       <li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
+       <li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
        <!-- TMPL_IF NAME="related" --> <li>(related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)</li><!-- /TMPL_IF -->
        </li>
 
@@ -17,8 +17,8 @@
 <!-- TMPL_IF NAME="type_label_Series" -->Series<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="type_label_Libraries" -->Libraries<!-- /TMPL_IF -->
 <ul>
-        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index 9d21456..d2f870b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -188,6 +188,7 @@
             <ul>
                 <li><strong>BibLibre</strong>, France</li>
                <li><strong>ByWater Solutions</strong>, USA</li>
+               <li><strong>Calyx</strong>, Australia</li>
                <li><strong>Catalyst IT</strong>, New Zealand</li>
                 <li><strong>Katipo Communications</strong>, New Zealand</li>
                 <li><strong>LibLime</strong>, USA</li> 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
index 4928d2c..9f11c66 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
@@ -7,10 +7,26 @@
 <!-- TMPL_INCLUDE NAME="greybox.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="background-job.inc" -->
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+$(document).ready(function(){
+  $("#staged-record-matching-rules select").change(function(){
+      var str = $(this).attr("id");
+      $("#reset_"+str).parent().show();
+  });
+  $("a.reset").click(function(){
+      var str = $(this).attr("id");
+      str = str.replace("reset_","")
+      $("#"+str+" option[selected='selected']").attr("selected","selected");
+      $(this).parent().hide();
+  });
+});
+//]]>
+</script>
 <style type="text/css">
        #jobpanel,#jobstatus,#jobfailed { display : none; }
        #jobstatus { margin:.4em; }
-       #jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }</style>
+       #jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; } span.change-status { font-style:italic; color:#666; display:none; }</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -59,62 +75,14 @@
 <!-- /TMPL_UNLESS -->
 
 <!-- TMPL_IF name="batch_info" -->
-<fieldset class="rows">
-  <ol>
-    <li><span class="label">File name</span> <!-- TMPL_VAR name="file_name" --></li>
-    <li><span class="label">Comments</span> <!-- TMPL_IF NAME="comments" --><!-- TMPL_VAR name="comments" -->(none)<!-- /TMPL_IF --></li>
-    <li><span class="label">Staged</span> <!-- TMPL_VAR name="upload_timestamp" --></li>
-    <li><span class="label">Status</span> <!-- TMPL_VAR name="import_status" --></li>
-    <li><span class="label">Matching rule applied</span> 
-<!-- TMPL_IF name="current_matcher_id" -->
-  <!-- TMPL_VAR name="current_matcher_code" --> (<!-- TMPL_VAR name="current_matcher_description" -->)
-<!-- TMPL_ELSE -->
-  No matching rule in effect
-<!-- /TMPL_IF -->
-    </li>
-    <li><span class="label">Action if matching record found</span> <!-- TMPL_VAR NAME="overlay_action" --></li>
-    <li><span class="label">Action if no match found</span> <!-- TMPL_VAR NAME="nomatch_action" --></li>
-    <li><span class="label">Item processing</span> <!-- TMPL_VAR NAME="item_action" --></li>
-  </ol>
-</fieldset>
 
 <!-- TMPL_IF name="can_commit" -->
-<div id="matchingrules">
-  <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-  <fieldset class="rows">
-    <input type="hidden" name="op" value="redo-matching" />
-    <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
-    <input type="hidden" name="current_matcher_id" value="<!-- TMPL_VAR name="current_matcher_id" -->" />
-    <ol>
-    <li><label for="new_matcher_id">New matching rule</label>
-    <select name="new_matcher_id" id="new_matcher_id">
-       <option value="">Do not look for matching records</option> 
-       <!-- TMPL_LOOP name="available_matchers" -->
-          <!-- TMPL_IF name="selected" -->
-          <option value="<!-- TMPL_VAR name="matcher_id" -->" selected="selected">
-             <!-- TMPL_VAR name="code" --> (<!-- TMPL_VAR name="description" -->)
-          </option>
-          <!-- TMPL_ELSE -->
-          <option value="<!-- TMPL_VAR name="matcher_id" -->">
-            <!-- TMPL_VAR name="code" --> (<!-- TMPL_VAR name="description" -->)
-          </option>
-          <!-- /TMPL_IF -->
-       <!-- /TMPL_LOOP -->
-    </select>
-    </li>
-    <li><label for="overlay_action">Action if matching record found</label>
-     <!-- TMPL_INCLUDE NAME="tools-overlay-action.inc" -->
-    </li>
-    <li><label for="overlay_action">Action if no match found</label>
-     <!-- TMPL_INCLUDE NAME="tools-nomatch-action.inc" -->
-    </li>
-    <li><label for="overlay_action">Item processing</label>
-     <!-- TMPL_INCLUDE NAME="tools-item-action.inc" -->
-    </li>
-    </ol>
-    <fieldset class="action"><input type="submit" class="button" value="Apply different matching rule" /></fieldset>
-    </fieldset>
-  </form>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+<input type="hidden" name="op" value="redo-matching" />
+<input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
+<input type="hidden" name="current_matcher_id" value="<!-- TMPL_VAR name="current_matcher_id" -->" />
+<!-- /TMPL_IF -->
+
   <!-- TMPL_IF name="rematch_attempted" -->
     <!-- TMPL_IF name="rematch_failed" -->
       <div class="dialog alert">Failed to apply different matching rule</div>
@@ -133,8 +101,46 @@
   <!-- TMPL_IF name="changed_item_action" -->
       <div class="dialog message">Changed item processing option</div>
   <!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
+
+<fieldset class="rows" id="staged-record-matching-rules">
+  <ol>
+    <li><span class="label">File name:</span> <!-- TMPL_VAR name="file_name" --></li>
+    <li><span class="label">Comments:</span> <!-- TMPL_IF NAME="comments" --><!-- TMPL_VAR name="comments" -->(none)<!-- /TMPL_IF --></li>
+    <li><span class="label">Staged:</span> <!-- TMPL_VAR name="upload_timestamp" --></li>
+    <li><span class="label">Status:</span> <!-- TMPL_VAR name="import_status" --></li>
+    <li> 
+<!-- TMPL_IF NAME="can_commit" --><label for="new_matcher_id">Matching rule applied:</label><select name="new_matcher_id" id="new_matcher_id">
+       <option value="">Do not look for matching records</option> 
+       <!-- TMPL_LOOP name="available_matchers" -->
+          <!-- TMPL_IF name="selected" -->
+          <option value="<!-- TMPL_VAR name="matcher_id" -->" selected="selected">
+             <!-- TMPL_VAR name="code" --> (<!-- TMPL_VAR name="description" -->)
+          </option>
+          <!-- TMPL_ELSE -->
+          <option value="<!-- TMPL_VAR name="matcher_id" -->">
+            <!-- TMPL_VAR name="code" --> (<!-- TMPL_VAR name="description" -->)
+          </option>
+          <!-- /TMPL_IF -->
+       <!-- /TMPL_LOOP -->
+    </select> <span class="change-status">Changed. <a href="#" class="reset" id="reset_new_matcher_id">Reset</a></span><!-- TMPL_ELSE --><span class="label">Matching rule applied</span><!-- TMPL_IF name="current_matcher_id" -->
+  <!-- TMPL_VAR name="current_matcher_code" --> (<!-- TMPL_VAR name="current_matcher_description" -->)
+<!-- TMPL_ELSE -->
+  No matching rule in effect
+<!-- /TMPL_IF --><!-- /TMPL_IF -->
+    </li>
+    <li><!-- TMPL_IF NAME="can_commit" --> <label for="overlay_action">Action if matching record found:</label>
+     <!-- TMPL_INCLUDE NAME="tools-overlay-action.inc" --> <span class="change-status">Changed. <a href="#" class="reset" id="reset_overlay_action">Reset</a></span><!-- TMPL_ELSE --><span class="label">Action if matching record found:</span><!-- TMPL_VAR NAME="overlay_action" --><!-- /TMPL_IF --></li>
+     
+    <li><!-- TMPL_IF NAME="can_commit" --><label for="nomatch_action">Action if no match found:</label>
+     <!-- TMPL_INCLUDE NAME="tools-nomatch-action.inc" --> <span class="change-status">Changed. <a href="#" class="reset" id="reset_nomatch_action">Reset</a></span><!-- TMPL_ELSE --><span class="label">Action if no match found:</span><!-- TMPL_VAR NAME="nomatch_action" --><!-- /TMPL_IF --></li>
+    
+    <li><!-- TMPL_IF NAME="can_commit" --><label for="item_action">Item processing:</label>
+     <!-- TMPL_INCLUDE NAME="tools-item-action.inc" --> <span class="change-status">Changed. <a href="#" class="reset" id="reset_item_action">Reset</a></span><!-- TMPL_ELSE --><span class="label">Item processing:</span><!-- TMPL_VAR NAME="item_action" --><!-- /TMPL_IF --></li>
+  </ol>
+<!-- TMPL_IF NAME="can_commit" --><fieldset class="action"><input type="submit" value="Apply different matching rules" class="button" /></fieldset></form><!-- /TMPL_IF -->
+</fieldset>
+
+
 <div>
   <!-- TMPL_IF name="can_commit" -->
   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
@@ -142,7 +148,7 @@
     <input type="hidden" name="runinbackground" value="" />
     <input type="hidden" name="completedJobID" value="" />
     <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
-    <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Import into catalog" onclick="return submitBackgroundJob(this.form);" /></fieldset>
+    <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" onclick="return submitBackgroundJob(this.form);" /></fieldset>
   </form>
   <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
      <div id="jobfailed"></div></div>
@@ -263,7 +269,7 @@ Page
 
   </tr>
   <!-- TMPL_LOOP name="biblio_list" -->
-  <tr>
+  <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
     <td><!-- TMPL_VAR name="record_sequence"--></td>
     <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=<!-- TMPL_VAR name='import_record_id' -->" rel="gb_page_center[600,500]"><!-- TMPL_VAR name="citation"--></a></td>
     <td><!-- TMPL_VAR name="status"--></td>

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index b590473..bd072fb 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -459,7 +459,6 @@ a .term {
 
 #toolbar a.print {
        background: transparent url(../../images/print-small.png) 5px 50% no-repeat;
-       display : none;
        text-decoration : none;
        padding-left : 23px;
 }

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/print.css b/koha-tmpl/opac-tmpl/prog/en/css/print.css
index cdb4d4c..85df351 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/print.css
@@ -145,13 +145,28 @@ body#basket a {
        font-weight : bold;
 }
 
-body#basket table, body#basket td, body#basket th {
+body#basket table {
+       border-top : 1px solid #EEE;
+       border-left : 1px solid #EEE;
+}
+body#basket td,
+body#basket th {
        background-color : transparent;
-       border : 0;
        padding : 2px;
 }
 
 body#basket th {
+       background-color : #EEE;
+}
+
+body#basket th,
+body#basket th[scope=col] {
+       text-align : center;
+       vertical-align : middle;
+}
+
+body#basket th[scope=row] {
+       font-size : 89%;
        text-align : right;
        vertical-align : top;
        width : 10%;

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index aba1e3b..e272906 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -19,7 +19,7 @@
 <!-- /TMPL_UNLESS -->
 <ul>
         <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index 78bb779..4eb2909 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -4,6 +4,15 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
 <meta http-equiv="Content-Language" content="en-us" />
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
+    <script type="text/javascript">
+    //<![CDATA[
+    $(document).ready(function(){
+        print();
+        location.href="/cgi-bin/koha/opac-basket.pl?bib_list=<!-- TMPL_VAR NAME="bib_list" --><!-- TMPL_IF NAME="verbose" -->&verbose=1<!-- /TMPL_IF -->";
+    });
+    //]]>
+    </script>
 <style type="text/css">
     @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);
 </style>
@@ -13,13 +22,11 @@
        <script type="text/javascript">
        //<![CDATA[
 
-$(document).ready(function()
-    {
-        $("#itemst").tablesorter({
-                        headers: { 0: { sorter: false }}
-                });
-    }
-);
+$(document).ready(function(){
+    $("#itemst").tablesorter({
+        headers: { 0: { sorter: false }}
+    });
+});
 
 <!-- TMPL_IF NAME="TagsEnabled" -->
 var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");
@@ -109,13 +116,13 @@ function tagAdded() {
        </script>
        <!-- /TMPL_IF -->
 </head>
-<!-- TMPL_IF NAME="print_basket" --><body id="basket" onload="print();history.back();"><!-- TMPL_ELSE --><body id="basket"><!-- /TMPL_IF -->
+<body id="basket">
 
 <div id="doc" class="yui-t7">
 <div class="container">
-<!-- TMPL_UNLESS NAME="print_basket" -->
 <h1>Your Cart</h1>
 
+<!-- TMPL_UNLESS NAME="print_basket" -->
 <div id="toolbar">
 <ul>
        <li><!-- TMPL_IF NAME="verbose" --><a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief Display</a><!-- TMPL_ELSE --><a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More Details</a><!-- /TMPL_IF --></li>
@@ -320,11 +327,11 @@ function tagAdded() {
        <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add"  style="display:inline"/>
        <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
      </span>
-<!-- /TMPL_UNLESS -->
 </p>
+<!-- /TMPL_UNLESS -->
     <table id="itemst">
        <thead><tr>
-           <th>&nbsp;</th>
+           <!-- TMPL_UNLESS NAME="print_basket" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
            <th>Title</th>
            <th>Author</th>
            <th>Year</th>
@@ -370,13 +377,11 @@ function tagAdded() {
     </table></form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="print_basket" -->
-<a href="#back" class="screen">&lt;&lt; Back to Cart</a>
-<!-- TMPL_ELSE -->
+<!-- TMPL_UNLESS NAME="print_basket" -->
 <form name="myform" action="opac-basket.pl" method="get">
     <input type="hidden" name="records" id="records" />
 </form>
-<!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
 
 </div>
 </div>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 4e9b022..812c91b 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -304,8 +304,7 @@
                    <!-- TMPL_IF NAME="reserve_in_future" -->
                    <td>
                        <input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
-                       <!-- <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->" style="cursor: pointer;" /> -->
-                       <script language="JavaScript" type="text/javascript">
+                 <script language="JavaScript" type="text/javascript">
                        //<![CDATA[
                        $("#reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").attr( 'readonly', 'readonly' );
 
@@ -344,7 +343,7 @@
                    <!-- /TMPL_IF -->
        <td>
            <input name="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10" readonly="readonly" />
-           <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate" style="cursor: pointer;" />
+           <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->" style="cursor: pointer;" />
            <script language="JavaScript" type="text/javascript">
                //<![CDATA[
                function validate1(date) {
@@ -362,15 +361,15 @@
                        {
                                inputField : "expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->",
                                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                               button : "CalendarExpirationDate",
+                               button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
                                disableFunc : validate1,
                                dateStatusFunc : validate1,
                        }
                );
                //]]>
            </script>
-               <br/>
-               <a href='#' onclick="document.getElementById('expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->').value='';">Clear Date</a>
+               <p style="margin:.3em 2em;">
+               <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->').value='';return false;">Clear Date</a></p>
        </td>
 
                     <!-- TMPL_IF NAME="OPACItemHolds" -->

diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 26e2e17..9562d2f 100755 (executable)
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -115,6 +115,7 @@ my $resultsarray = \@results;
 # my $itemsarray=\@items;
 
 $template->param(
+    bib_list => $bib_list,
     BIBLIO_RESULTS => $resultsarray,
 );