projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31fbe0d)
Bug 6347 - Fix for itemlevel holds in OPAC
authorChris Cormack <chris@bigballofwax.co.nz>
Mon, 16 May 2011 21:23:52 +0000 (09:23 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 29 May 2011 03:46:57 +0000 (15:46 +1200)
Edits by Owen:

- More variable scope corrections
- Minor markup and style tweak
- Table column span correction

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Item level holds can be placed and hold saved
- Table and layout are ok now

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt patch | blob | history
opac/opac-reserve.pl patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index bfcbf4a..52dbf1c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -152,6 +152,7 @@
  });
 // ]]>
 </script>
+<style type="text/css">td ul { padding : 0; } td li { white-space: nowrap; font-size: 90%; list-style-type:none; padding : .3em 0; }</style>
 </head>
 
 <body id="opac-holds">
@@ -373,11 +374,13 @@
       <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
     </td>[% END %]
 
-                    [% IF ( bibitemloo.holdable ) %][% IF ( OPACItemHolds ) %]
+                    [% IF ( bibitemloo.holdable ) %]
+                   <!-- HOLD ABLE -->
+                   [% IF ( OPACItemHolds ) %]
+                   <!-- ITEM HOLDS -->
                                           <td class="place_on_type" style="display:none">
-                                            <table>
-                                              <tr>
-                                                <td>
+                                            <ul>
+                                                <li>
                                                   [% UNLESS ( bibitemloo.holdable ) %]
                                                     <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                            id="reqany_[% bibitemloo.biblionumber %]"
@@ -394,10 +397,8 @@
                                                     />
                                                   [% END %]
                                                   <label for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
-                                                </td>
-                                              </tr>
-                                              <tr>
-                                                <td>
+                                                </li>
+                                                <li>
                                                   [% UNLESS ( bibitemloo.holdable ) %]
                                                     <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                            id="reqspecific_[% bibitemloo.biblionumber %]"
@@ -413,9 +414,8 @@
                                                     />
                                                   [% END %]
                                                   <label for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
-                                                </td>
-                                              </tr>
-                                            </table>
+                                                </li>
+                                            </ul>
                                           </td>
                                         [% END %][% END %]
 
@@ -442,9 +442,8 @@
                   [% IF ( OPACItemHolds ) %]
                   [% IF ( bibitemloo.holdable ) %]
                     <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
-                      <td colspan="1">
-                      </td>
-                      <td colspan="[% bibitemloo.itemtable_colspan %]">
+                      <td>&nbsp;</td>
+                      <td colspan="[% itemtable_colspan %]">
                         <table>
                           <caption>Select a specific copy:</caption>
                           <tr>
@@ -468,7 +467,7 @@
                             <tr class="[% itemLoo.backgroundcolor %]">
                               <td>
                                 [% IF ( itemLoo.available ) %]
-                                  <input type="radio" class="checkitem checkitem_[% itemLoo.biblionumber %]" name="checkitem_[% itemLoo.biblionumber %]"
+                                  <input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]"
                                          value="[% itemLoo.itemnumber %]" />
                                 [% ELSE %]
                                   <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]" />
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index d50480a..a92a976 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -477,11 +477,11 @@ if ( $numBibsAvailable == 0 || !$anyholdable) {
     $template->param( none_available => 1 );
 }
 
-my $itemTableColspan = 5;
-if (!$template->param('OPACItemHolds')) {
+my $itemTableColspan = 7;
+if (! $template->{VARS}->{'OPACItemHolds'}) {
     $itemTableColspan--;
 }
-if ($template->param('singleBranchMode')) {
+if (! $template->{VARS}->{'singleBranchMode'}) {
     $itemTableColspan--;
 }
 $template->param(itemtable_colspan => $itemTableColspan);
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git