[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en includes/baske... [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/30 14:14:45

Modified files:
        koha-tmpl/opac-tmpl/prog/en/includes: basket.js 
        koha-tmpl/opac-tmpl/prog/en: opac-results.tmpl 

Log message:
        reintroducing basket selection on result page.
        fixing bugs in basket.js (normalizing API to biblionumber)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.12&r2=1.1.2.13

Patches:
Index: includes/basket.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/basket.js,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- includes/basket.js  15 Jan 2007 17:11:03 -0000      1.1.2.4
+++ includes/basket.js  30 Jan 2007 14:14:45 -0000      1.1.2.5
@@ -135,15 +135,15 @@
 
 function addMultiple(){
     var c_value = "";
-    if(document.myform.bibid.length > 0) {
-        for (var i=0; i < document.myform.bibid.length; i++) {
-            if (document.myform.bibid[i].checked) {
-                c_value = c_value + document.myform.bibid[i].value + "/";
+    if(document.bookbag_form.biblionumber.length > 0) {
+        for (var i=0; i < document.bookbag_form.biblionumber.length; i++) {
+            if (document.bookbag_form.biblionumber[i].checked) {
+                c_value = c_value + 
document.bookbag_form.biblionumber[i].value + "/";
             }
         }
         addSelRecords(c_value);
     } else {
-        c_value = c_value + document.myform.bibid.value + "/";
+        c_value = c_value + document.bookbag_form.biblionumber.value + "/";
         addSelRecords(c_value);
     }
 }
@@ -189,7 +189,7 @@
 
 
 function selRecord(num, status) {
-    var str = document.myform.records.value
+    var str = document.bookbag_form.records.value
     if (status){
         str += num+"/";
     }
@@ -197,7 +197,7 @@
         str = delRecord(num, str);
     }
 
-    document.myform.records.value = str;
+    document.bookbag_form.records.value = str;
 }
 
 function delSelRecords() {
@@ -207,7 +207,7 @@
     var valCookie = readCookie(nameCookie, 1);
 
     if (valCookie) {
-        var str = document.myform.records.value;
+        var str = document.bookbag_form.records.value;
         if (str.length > 0){
             recordsSel = 1;
             var str2 = valCookie;
@@ -291,7 +291,7 @@
 
 
 function quit() {
-    if (document.myform.records.value) {
+    if (document.bookbag_form.records.value) {
         var rep = false;
         rep = confirm(MSG_CONFIRM_DEL_RECORDS);
         if (rep) {

Index: opac-results.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -b -r1.1.2.12 -r1.1.2.13
--- opac-results.tmpl   11 Jan 2007 14:37:04 -0000      1.1.2.12
+++ opac-results.tmpl   30 Jan 2007 14:14:45 -0000      1.1.2.13
@@ -25,7 +25,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="total" -->
-<h3><!-- TMPL_VAR NAME="total" --> results found.</h3>
+<h3><!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR 
NAME="searchdesc" -->'.</h3>
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="searchdesc" -->
 <h3> No Result found !</h3>
@@ -117,7 +117,7 @@
         <!-- TMPL_IF NAME="sort_by_loop" -->
         <p>
             Re-sort results
-            <select id="sort_by" name="sort_by" 
onChange="document.myform.submit();">
+            <select id="sort_by" name="sort_by" 
onChange="javascript:document.myform.submit();">
                 <option value="">Field-weighted, Relevance Ranked</option>
                 <!-- TMPL_LOOP NAME="sort_by_loop" -->
                 <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF 
NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF 
-->><!-- TMPL_VAR NAME="label" --></option>
@@ -126,7 +126,7 @@
         </p>
         <!-- /TMPL_IF -->
         <!-- RESORT END -->
-        
+</form>
         <!-- ######### -->
         
         <!-- FACETS START -->
@@ -162,7 +162,11 @@
         <!-- ######### -->
         
         <!-- TABLE RESULTS START -->
-        
+        <!-- TMPL_IF name="opacbookbag" -->
+            <form action="opac-searchresults.pl" method="get" 
name="bookbag_form">
+            <input type="submit" class="button" value="Add checked items to 
book bag" onclick="addMultiple(); return false;" /> 
+            <input type="reset" value="Clear All" class="button" />
+        <!-- /TMPL_IF -->
         <table>
             <tr>
                 <th>&nbsp;</th>
@@ -180,6 +184,9 @@
                 <tr>
                     <!-- /TMPL_IF -->
                     <td>
+                        <!-- TMPL_IF name="opacbookbag" -->
+                            <input type="checkbox" name="biblionumber" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to book bag" 
/>
+                        <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="AmazonContent" -->
                         <a class="p1" 
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->">
                             <img src="<!-- TMPL_IF NAME="isbn" 
-->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" 
-->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE 
-->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- 
/TMPL_IF -->" alt="image" class="thumbnail" />