Tweaks to layout of holdings on item details page.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Conflicts:
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2

diff --git a/Open-ILS/src/templates/opac/parts/library_name_link.tt2 b/Open-ILS/src/templates/opac/parts/library_name_link.tt2
index 7e8202b..96fadca 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/library_name_link.tt2
+++ b/Open-ILS/src/templates/opac/parts/library_name_link.tt2
@@ -15,8 +15,12 @@
         lib_url = mkurl(opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1);
     END; 
     IF lib_url; '<a property="offeredBy" typeof="Library" href="'; lib_url | url; '">'; END;
-    '<span property="name">'; parent_org_name _ ': ' _ org_name | html; '</span>';
+    '<span property="name">'; parent_org_name _ ':' | html; '</a></span>';
+    '<br/> &nbsp; &nbsp; &nbsp; ';
+    IF lib_url; '<a property="offeredBy" typeof="Library" href="'; lib_url | url; '">'; END;
+    org_name;
     IF lib_url; '</a>'; END;
+
 -%]
 
 

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index c128b57..d55956b 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -26,7 +26,7 @@ FOREACH copy_info IN copies;
 END;
 -%]
 [%- IF has_copies; %]
-<table class="table_no_border_space table_no_cell_pad table_no_border" width="100%" id="rdetails_status" style="border:1px #999 solid;">
+<table  width="100%" cellpadding="5" style="border:1px #999 solid;">
     <thead>
         <tr>
             [% IF serial_holdings -%]
@@ -55,7 +55,7 @@ END;
     <tbody class="copy_details_table">
 [%- FOREACH peer IN ctx.foreign_copies;
         FOREACH bib IN peer.foreign_copy_maps; %]
-    <tr class="copy_details_row"><td style="background-color:#fff;">
+    <tr class="copy_details_row"><td>
     [%- bib_lib_name = ctx.get_aou(bib.target_copy.circ_lib).name | html;
         l("[_1] (foreign item)", bib_lib_name); -%]
         <ul><li>
@@ -66,12 +66,12 @@ END;
             </a>
         </li></ul>
     </td>
-    <td style="background-color:#fff;">[% copy_info.copy_location | html %]</td>
-    <td style="background-color:#fff;">[% bib.target_copy.call_number.label | html %]</td>
-    <td style="background-color:#fff;">[% bib.target_copy.barcode | html %]</td>
-    <td style="background-color:#fff;">[% copy_info.copy_status | html %]</td>
+    <td>[% copy_info.copy_location | html %]</td>
+    <td>[% bib.target_copy.call_number.label | html %]</td>
+    <td>[% bib.target_copy.barcode | html %]</td>
+    <td>[% copy_info.copy_status | html %]</td>
     [%- IF ctx.is_staff %]
-    <td style="background-color:#fff;">[% copy_info.due_date | html %]</td>
+    <td>[% copy_info.due_date | html %]</td>
     [%- END %]
 </tr>
    [%- END; # FOREACH peer
@@ -97,20 +97,21 @@ END; # FOREACH bib
                 [%- copy_info.holding_label | html; -%]
             </td>
         [%- ELSE %]
-            <td>
+            <td valign="top" style="background-color:#fff;">
                 [%- INCLUDE "opac/parts/library_name_link.tt2"; -%]
                 <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                 <meta property="price" content="0.00">
             </td>
         [% END %]
-            <td property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
-            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Send Text Message</a>)[% END %]</td>
+            <td property="availableAtOrFrom" valign="top" style="background-color:#fff;">[% copy_info.copy_location | html %]</td>
+            <td valign="top" style="background-color:#fff;"><span property="sku">[% callnum | html %]</span>[% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %]<br/>(<a href="[% mkurl(ctx.opac_root 
+                           _ '/sms_cn', {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]">Send Call No. in Text Message</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
-            <td>[% copy_info.part_label | html %]</td>
+            <td valign="top" style="background-color:#fff;">[% copy_info.part_label | html %]</td>
             [%- END %]
-            <td property="serialNumber">
+            <td property="serialNumber" valign="top" style="background-color:#fff;text-align:center;">
                 [% copy_info.barcode | html -%]
-                [% IF ctx.is_staff %]
+                [% IF ctx.is_staff %]<br/>
                   [%- IF ctx.is_browser_staff %]
                     <a target="_blank" href="[% ctx.base_path %]/staff/cat/item/[% copy_info.id %]">[% l('view') %]</a>
                     [% IF ctx.has_perm('UPDATE_COPY', copy_info.circ_lib) 
@@ -138,12 +139,11 @@ END; # FOREACH bib
             </td>
             <td property="availableAtOrFrom">[%- INCLUDE "opac/parts/location_name_link.tt2"; -%]</td>
             [%- IF ctx.is_staff %]
-            <td>[% copy_info.circ_modifier | html %]</td>
-            <td>
+            <td valign="top" style="background-color:#fff;">
                 [% copy_info.age_protect ?
                     ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
             </td>
-            <td>[% 
+            <td valign="top" style="background-color:#fff;">[% 
                 IF ctx.get_org_setting(copy_info.circ_lib, 'circ.holds.age_protect.active_date') == 1;
                     disp_date = copy_info.active_date ? copy_info.active_date : copy_info.create_date;
                 ELSE;
@@ -161,7 +161,7 @@ END; # FOREACH bib
             %]</td>
             [% END # is_staff %]
             [% IF ctx.is_staff OR serial_holdings %]
-            <td>[%  # Show copy/volume hold links to staff (without
+            <td valign="top" style="background-color:#fff;">[%  # Show copy/volume hold links to staff (without
                 # checking whether they have permissions to do those).
                 overall_holdable = (
                     copy_info.holdable == 't' AND
@@ -209,11 +209,12 @@ END; # FOREACH bib
                     l("Not holdable");
                 END %]</td>
             [%- END %]
-            <td>[%-
+            <td valign="top" style="background-color:#fff;">[%-
                 schema_copy_status.${copy_info.status_code};
                 copy_info.copy_status | html;
             -%]</td>
-            <td>[%
+            [%- IF ctx.is_staff %]
+            <td valign="top" style="background-color:#fff;">[%
                 IF copy_info.due_date;
                     date.format(
                         ctx.parse_datetime(copy_info.due_date, copy_info.circ_circ_lib),