Corrected problems with holdings list on item record pages.

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

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 7c2825f..34dff7c 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -31,14 +31,13 @@
             <cell name="Easter" img="cat-easter.png" type="maintopic">keyword:easter</cell>
             <cell name="4th of July" img="cat-independence.png" type="maintopic">(keyword:independence day || keyword:fourth of july)</cell>
             <cell name="Back to School" img="cat-school.png" type="maintopic">(keyword:back to school || keyword:goes to school)</cell>
-            <cell name="Halloween" img="cat-halloween.png" type="maintopic">keyword:halloween</cell> 
-            -->
             <cell name="Thanksgiving" img="cat-thanksgiving.png" type="maintopic">keyword:thanksgiving</cell>
-            <!--
+            -->
+
             <cell name="Christmas" img="cat-christmas.png" type="maintopic">keyword:christmas</cell>
             <cell name="Hannukah" img="cat-hannukah.png" type="maintopic">keyword:hannukah</cell>
             <cell name="Kwanzaa" img="cat-kwanzaa.png" type="maintopic">keyword:kwanzaa</cell>
-            --> 
+             
             <cell name="Dinosaurs" img="cat-dinosaur.png" type="maintopic">keyword:dinosaur</cell>
             <cell name="Princesses" img="cat-princess.png" type="maintopic">keyword:princess</cell>
             <cell type="topic">10</cell>

diff --git a/Open-ILS/src/templates/kpac/parts/copy_table.tt2 b/Open-ILS/src/templates/kpac/parts/copy_table.tt2
index 304b0d9..c3ff07c 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/copy_table.tt2
+++ b/Open-ILS/src/templates/kpac/parts/copy_table.tt2
@@ -15,9 +15,9 @@ END;
 <table cellpadding="0" cellspacing="0" border="0" width="100%" class="item_location_table">
     <tbody>
         <tr class="header">
-            <td class="location">[% l('Location') %]</td>
-            <td class="callnumber">[% l('Call Number') %]</td>
+            <td class="location">[% l('Library System: Library Name') %]</td>
             <td class="shelving_location">[% l('Shelving Location') %]</td>
+            <td class="callnumber">[% l('Call Number') %]</td>
             <td class="status">[% l('Status') %]</td>
         </tr>
         [%- 
@@ -39,25 +39,13 @@ END;
             <td class="location">
             [%- INCLUDE "opac/parts/library_name_link.tt2"; -%]
             </td>
-#      Check this with Terran
-#          [%  
-#             org_obj = ctx.get_aou(copy_info.circ_lib); 
-#               IF org_obj.parent_ou;   
-#                       parent_org_name = ctx.get_aou(org_obj.parent_ou).name;
-#                       org_name = parent_org_name _ ' - ' _ org_obj.name; 
-#               ELSE; 
-#               org_name = org_obj.name; END;
-#               lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url');
-#               IF lib_url; '<a href="'; lib_url | url; '">'; END;
-#               org_name | html
-#               %]</td>
-            
+
+            <td class="shelving_location">[% copy_info.copy_location | html %]</td>            
             [%- IF has_parts == 'true' %]
             <td class="callnumber">[% l('[_1] ([_2])', callnum, copy_info.part_label) | html %]</td>
             [% ELSE %]
             <td class="callnumber">[% callnum | html %]</td>
             [%- END %]
-            <td class="shelving_location">[% copy_info.copy_location | html %]</td>
             <td class="status">[% copy_info.copy_status | html %]</td>
         </tr>
         [%- END %]