From 8f07cedbc5f572cc0d1c272a724d9f45c7b25fb4 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Thu, 11 Dec 2014 13:52:49 -0500
Subject: [PATCH] Changes to item detail page holdings: - fixed customized
 holding location links - moved shelving location after library location and
 before call number

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
---
 .../src/templates/opac/parts/library_name_link.tt2   |  6 +++++-
 .../src/templates/opac/parts/record/copy_table.tt2   | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

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 3179e5f62b..e039543257 100644
--- a/Open-ILS/src/templates/opac/parts/library_name_link.tt2
+++ b/Open-ILS/src/templates/opac/parts/library_name_link.tt2
@@ -4,6 +4,9 @@
         opac_root = ctx.kpac_root;
     END;
 
+    org_obj = ctx.get_aou(copy_info.circ_lib);
+    parent_org_name = ctx.get_aou(org_obj.parent_ou).name;
+    
     org_name = ctx.get_aou(copy_info.circ_lib).name;
     org_sname = ctx.get_aou(copy_info.circ_lib).shortname;
     lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url');
@@ -12,7 +15,8 @@
         lib_url = mkurl(opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1);
     END; 
     IF lib_url; '<a property="seller" typeof="Library" href="'; lib_url | url; '">'; END;
-    '<span property="name">'; org_name | html; '</span>';
+    '<span property="name">'; parent_org_name _ ': ' _ org_name | html; '</span>';
     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 c87c27e595..3978f58af9 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -32,14 +32,14 @@ END;
             [% IF serial_holdings -%]
             <th scope='col'>[% l("Issue Label") %]</th>
             [%- ELSE -%]
-            <th scope='col'>[% l("Location") %]</th>
+            <th scope='col'>[% l("Library System: Library Branch Name") %]</th>
             [%- END %]
+            <th scope='col'>[% l("Shelving Location") %]</th>
             <th scope='col'>[% l("Call Number / Copy Notes") %]</th>
             [%- IF has_parts == 'true' %]
             <th scope='col'>[% l("Part") %]</th>
             [%- END %]
             <th scope='col'>[% l("Barcode") %]</th>
-            <th scope='col'>[% l("Shelving Location") %]</th>
             [%- IF ctx.is_staff %]
             <th scope='col'>[% l("Age Hold Protection") %]</th>
             <th scope='col'>[% l("Active/Create Date") %]</th>
@@ -65,9 +65,9 @@ END;
             </a>
         </li></ul>
     </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_location | html %]</td>
     <td>[% copy_info.copy_status | html %]</td>
     <td>[% copy_info.due_date | html %]</td>
 </tr>
@@ -93,14 +93,15 @@ END; # FOREACH bib
             [%- IF serial_holdings %]<td class='rdetail-issue-issue'>
                 [%- copy_info.holding_label | html; -%]
             </td>
-            [%- ELSE %]<td>
-            [%- INCLUDE "opac/parts/library_name_link.tt2"; -%]
+        [%- ELSE %]
+            <td>
+                [%- 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><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}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">Text</a>)[% END %]</td>
+            </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}) %]">Text</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td>[% copy_info.part_label | html %]</td>
             [%- END %]
@@ -137,7 +138,6 @@ END; # FOREACH bib
                     '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />';
                 END; -%]
             </td>
-            <td property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
             [%- IF ctx.is_staff %]
             <td>
                 [% copy_info.age_protect ?
-- 
2.11.0