Copy/hold details in aux_util box, remove barcode from copy table

- Moved copy/hold detail info into aux_util box
- Removed barcode from copy table if !staffclient
- padding/spacing done more consistently

Signed-off-by: William Rockwood <wrockwood@tadl.org>

diff --git a/css/tadl.css b/css/tadl.css
index 5fe4447..515fe34 100644 (file)
--- a/css/tadl.css
+++ b/css/tadl.css
@@ -504,6 +504,12 @@ span#rdetail_hold_counts {
        width: 242px;
 }
 
+.rdetail_aux_copycounts,
+.rdetail_aux_holdcounts {
+       padding: 5px 10px 0 10px;
+       margin: 0;
+}
+
 div.place_hold {
     border-bottom: 1px solid #e6e6e6;
     padding-top: 10px;

diff --git a/templates_tadlskin/opac/parts/record/copy_counts.tt2 b/templates_tadlskin/opac/parts/record/copy_counts.tt2
index a7ad420..b097ac4 100644 (file)
--- a/templates_tadlskin/opac/parts/record/copy_counts.tt2
+++ b/templates_tadlskin/opac/parts/record/copy_counts.tt2
@@ -1,6 +1,5 @@
 <span id="rdetail_copy_counts">
-    <h2>[% l('Available copies') %]</h2>
-    <ul>
+<!--    <h2>[% l('Available copies') %]</h2> -->
     [%- depths = ctx.copy_summary.size;
         depth = 0;
         displayed_ous = {};
@@ -20,7 +19,6 @@
             ou_name = cp_org_unit.name;
             displayed_ous.$ou_name = 1;
     %]
-    <li>
     [% l('[quant,_1,copy,copies] at [_2].', ou_avail, ou_name) | html %]
     [%- this_depth = ctx.get_aou(ou_id).ou_type.depth;
         IF ou_avail > 0 && this_depth != ctx.copy_depth %]
@@ -28,7 +26,7 @@
        title="[% l('Show copies at [_1]', ou_name); %]">
        [%- l('(Show)'); %]</a>
     [%- END; %]
-    </li>
+    <br />
     [%- depth = depth + 1;
         END;
 
@@ -38,7 +36,7 @@
         UNLESS depth < 0 || displayed_ous.exists(ou_name);
     %]
     [%- IF attrs.plib_copy_counts.$depth.count > 0; %]
-    <li class="preferred">[%
+    [%
         l('[_1] of [quant,_2,copy,copies] available at [_3].',
             attrs.plib_copy_counts.$depth.available,
             attrs.plib_copy_counts.$depth.count,
@@ -46,8 +44,7 @@
     %] <a href="[% mkurl('', {locg => ou_id}, ['copy_offset']); %]"
        title="[% l('Show copies at [_1]', ou_name); %]">[%
        l('(Show preferred library)');
-    %]</a></li>
+    %]</a><br />
     [%- END %]
     [%- END %]
-    </ul>
 </span>

diff --git a/templates_tadlskin/opac/parts/record/copy_table.tt2 b/templates_tadlskin/opac/parts/record/copy_table.tt2
index 36a5e1e..8a582cb 100644 (file)
--- a/templates_tadlskin/opac/parts/record/copy_table.tt2
+++ b/templates_tadlskin/opac/parts/record/copy_table.tt2
@@ -26,6 +26,7 @@ FOREACH copy_info IN copies;
 END;
 -%]
 [%- IF has_copies; %]
+<div style="clear:both;">
 <table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
     <thead>
         <tr>
@@ -38,7 +39,9 @@ END;
             [%- IF has_parts == 'true' %]
             <th id='copy_header_part'>[% l("Part") %]</th>
             [%- END %]
+            [%- IF ctx.is_staff -%]
             <th id='copy_header_barcode'>[% l("Barcode") %]</th>
+            [%- END %]
             <th id='copy_header_shelfloc'>[% l("Shelving Location") %]</th>
             [%- IF ctx.is_staff %]
             <th id='copy_header_age_hold'>[% l("Age Hold Protection") %]</th>
@@ -81,11 +84,10 @@ END;
             [%- IF has_parts == 'true' %]
             <td header='copy_header_part'>[% copy_info.part_label | html %]</td>
             [%- END %]
-            <td header='copy_header_barcode'>
                 [%- IF ctx.is_staff -%]
+            <td header='copy_header_barcode'>
                     <a href="javascript:void(0)" onclick="xulG.new_tab(xulG.urls.XUL_COPY_STATUS, {}, {'from_item_details_new': true, 'barcodes': ['[%- copy_info.barcode | html | replace('\'', '\\\'') -%]']})">[% copy_info.barcode | html %]</a>
-                [%- ELSE -%][% copy_info.barcode | html %]
-                [%- END -%]</td>
+                </td>[%- END -%]
             <td header='copy_header_shelfloc'>[% copy_info.copy_location | html %]</td>
             [%- IF ctx.is_staff %]
             <td header='copy_header_age_hold'>
@@ -178,4 +180,5 @@ END;
         [%- END %]
     </tbody>
 </table>
+</div>
 [% END; %]

diff --git a/templates_tadlskin/opac/parts/record/summary.tt2 b/templates_tadlskin/opac/parts/record/summary.tt2
index 4e4a244..8c8ea06 100644 (file)
--- a/templates_tadlskin/opac/parts/record/summary.tt2
+++ b/templates_tadlskin/opac/parts/record/summary.tt2
@@ -43,6 +43,13 @@
 
     <div id="rdetail_actions_div">
        [% IF !args.ezproxy %]
+                               <div class="rdetail_aux_utils" style="margin:0; padding:0 10px;">
+                                       [%- INCLUDE "opac/parts/record/copy_counts.tt2" %]
+                               </div>
+                               <div class="rdetail_aux_utils" style="margin:0; padding:0 10px;">
+            [%- l("[quant,_1,hold,holds] with [quant,_2,copy,copies].", 
+                ctx.record_hold_count, ctx.copy_summary.0.count) %]
+                               </div>
         <div class="rdetail_aux_utils">
             <a href="[% mkurl(ctx.opac_root _ '/place_hold', 
                 {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]" 
@@ -117,13 +124,7 @@ IF num_uris > 0;
     IF ctx.copy_summary.0.count
 %]
 <div id="copy_hold_counts">
-[%- INCLUDE "opac/parts/record/copy_counts.tt2" %]
     <span id="rdetail_hold_counts">
-        <h2>[% l('Current holds') %]</h2>
-        <p>
-            [%- l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].", 
-                ctx.record_hold_count, ctx.copy_summary.0.count) %]
-        </p>
     </span>
 [%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %]
 </div>