copy details in the right place in the layout; some hide_me's sprinkled

around for now

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
index 14456a7..87ff608 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
@@ -19,7 +19,7 @@ sub init_ro_object_cache {
     my $ctx = $self->ctx;
 
     # fetch-on-demand-and-cache subs for commonly used public data
-    my @public_classes = qw/ccs aout cifm citm clm cmf/;
+    my @public_classes = qw/ccs aout cifm citm clm cmf crahp/;
 
     for my $hint (@public_classes) {
 

diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index faa3f57..5fcfe9d 100644 (file)
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -408,7 +408,7 @@ div.select-wrapper:hover {
        padding: 7px 0px 3px 13px;
 }
 
-#rdetails_status_head td {
+#rdetails_status thead td {
        background-color: #d8d8d8;
        padding: 13px 0px 13px 13px;
        font-size: 10px;
@@ -416,8 +416,8 @@ div.select-wrapper:hover {
        font-weight: bold;
 }
 
-#rdetails_status_head2 td {
-       padding: 0px;
+#rdetails_status tbody td {
+       padding-left: 13px;;
 }
 
 .rdetail_extras {

diff --git a/Open-ILS/web/templates/default/opac/parts/record/cn_details.tt2 b/Open-ILS/web/templates/default/opac/parts/record/cn_details.tt2
index 2a5167e..1156a5a 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/record/cn_details.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/record/cn_details.tt2
@@ -1,47 +1,11 @@
-<!-- ****************** rdetail_cn_details.xml ***************************** -->
-<table class='hide_me'>
+<table class="hide_me">
     <tbody>
         <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
             <td colspan='10'>
                 <div style='text-align: center; margin-top: 6px; margin-bottom: 6px'>
                     <a name='print' href='#' class='classic_link'>[% l("print these details") %]</a>
                     <table class='data_grid data_grid_center' style='width: 100%'>
-                        <thead>
-                            <tr>
-                                <td width='33%'>[% l("Barcode") %]</td>
-                                <td>[% l("Status") %]</td>
-                                <td>[% l("Location") %]</td>
-                                [% IF ctx.is_staff %]
-                                <td>[% l("Age Hold Protection") %]</td>
-                                <td>[% l("Create Date") %]</td>
-                                <td>[% l("Holdable") %]</td>
-                                [% END %]
-                                <td>[% l("Due Date") %]</td>
-                            </tr>
-                        </thead>
                         <tbody name='copies_tbody' class='copy_details_table' width='100%'>
-                            [% FOR copy_info IN ctx.copies %]
-                            <tr name='copies_row'>
-                                <td>[% copy_info.barcode %]</td>
-                                <td>[% copy_info.copy_status %]</td>
-                                <td>[% copy_info.copy_location %]</td>
-                                [% IF ctx.is_staff %]
-                                <td>[% copy_info.age_protect %]</td>
-                                <td>[% date.format(ctx.parse_datetime(copy_info.create_date), DATE_FORMAT) %]</td>
-                                <td>
-                                    [%  IF copy_info.holdable == 't' AND 
-                                            copy_info.location_holdable == 't' AND
-                                            copy_info.status_holdable == 't';
-                                            l('Yes');
-                                        ELSE;
-                                            l('No');
-                                        END; 
-                                    %]
-                                </td>
-                                [% END %]
-                                <td>[% date.format(ctx.parse_datetime(copy_info.create_date), DATE_FORMAT) %]</td>
-                            </tr>
-                            [% END %]
 
                                 <!-- XXX keeping for now for reference...
                                 <td>
@@ -125,4 +89,3 @@
         </div>
     </div>
 </div>
-<!-- ****************** end: rdetail_cn_details.xml ***************************** -->

diff --git a/Open-ILS/web/templates/default/opac/parts/record/extras.tt2 b/Open-ILS/web/templates/default/opac/parts/record/extras.tt2
index 8a53826..5d714bc 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/record/extras.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/record/extras.tt2
@@ -1,5 +1,4 @@
-<!-- ****************** rdetail_extras.xml ***************************** -->
-<div xmlns:xi="http://www.w3.org/2001/XInclude" id="rdetail_main_div" class="">
+<div id="rdetail_main_div">
     <table class='hide_me rdetails_extra_links'>
         <thead>
             <tr>
@@ -258,7 +257,7 @@
             </div>
         </div>
 
-        <div rel="rdetail_cn_browse_div" rel2="cn" class="rdetail_extras"
+        <div rel="rdetail_cn_browse_div" rel2="cn" class="rdetail_extras hide_me"
             id="rdetail_viewcn_link">
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
@@ -286,7 +285,7 @@
         [% INCLUDE "default/opac/parts/record/cn_details.tt2" %]
 
         <div rel="rdetail_copy_info_div" rel2="copyinfo"
-            class="rdetail_extras" id="rdetail_copy_info_link">
+            class="hide_me rdetail_extras" id="rdetail_copy_info_link">
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
                 <a href='javascript:rdetailShowExtra("copyinfo");'><img
@@ -298,7 +297,7 @@
 
         [% INCLUDE "default/opac/parts/record/copyinfo.tt2" %]
 
-        <div rel="rdetail_marc_div" rel2="marc" class="rdetail_extras" id="rdetail_viewmarc_link">
+        <div rel="rdetail_marc_div" rel2="marc" class="rdetail_extras hide_me" id="rdetail_viewmarc_link">
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
                 <a href='javascript:rdetailShowExtra("marc");'><img
@@ -315,7 +314,4 @@
     <div id='rdetail_preview_title' class='hide_me'>[% l("See the full text of this book.") %]</div>
     <div id='rdetail_preview_badge' class='hide_me'>[% l("Show a preview of this book from Google Book Search") %]</div>
 </div>
-
 <!-- XXX TODO Novelist stuff here? -->
-
-<!-- ****************** end: rdetail_extras.xml ***************************** -->

diff --git a/Open-ILS/web/templates/default/opac/parts/record/summary.tt2 b/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
index 712042e..05c73f3 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
@@ -120,27 +120,64 @@
 <br /><br />
 
 <table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
-    <tr id="rdetails_status_head">
-        <td width="25%">Location</td>
-        <td width="20%">Call Number</td>
-        <td width="18%">Selving Location</td>
-        <td width="17%">Status</td>
-        <td width="20%">Due Date</td>
-    </tr>
-</table>
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tbody id="rdetails_status2" class="hide_me">
-        <tr id="rdetails_status_head2">
-            <td width="25%"></td>
-            <td width="20%"></td>
-            <td width="18%"></td>
-            <td width="17%"></td>
-            <td width="20%"></td>
+    <thead>
+        <tr id="rdetails_status_head">
+            <td>[% l("Location") %]</td>
+            <td>[% l("Call Number") %]</td>
+            <td>[% l("Barcode") %]</td>
+            <td>[% l("Shelving Location") %]</td>
+            [% IF ctx.is_staff %]
+            <td>[% l("Age Hold Protection") %]</td>
+            <td>[% l("Create Date") %]</td>
+            <td>[% l("Holdable") %]</td>
+            [% END %]
+            <td>[% l("Status") %]</td>
+            <td>[% l("Due Date") %]</td>
+        </tr>
+    </thead>
+    <tbody class="copy_details_table">
+        [% FOR copy_info IN ctx.copies %]
+        <tr>
+            <td>[%
+                # XXX KCLS-specific kludging
+                org_name = ctx.find_aou(copy_info.circ_lib).name;
+                dir = org_name | lower | replace('[^\w]', '') |
+                    replace('.+320th', '320th'); %]
+                <a href="http://www.kcls.org/[% dir %]/"
+                    class="classic_link">[% org_name %]</a>
+            </td>
+            <td>[% copy_info.call_number_label %]</td>
+            <td>[% copy_info.barcode %]</td>
+            <td>[% copy_info.copy_location %]</td>
+            [% IF ctx.is_staff %]
+            <td>
+                [% copy_info.age_protect ?
+                    ctx.find_crahp(copy_info.age_protect).name : l('None') %]
+            </td>
+            <td>[% date.format(
+                ctx.parse_datetime(copy_info.create_date),
+                DATE_FORMAT
+            ) %]</td>
+            <td>[% (copy_info.holdable == 't' AND
+                    copy_info.location_holdable == 't' AND
+                    copy_info.status_holdable == 't') ? l('Yes') : l('No') %]</td>
+            [% END %]
+            <td>[% copy_info.copy_status %]</td>
+            <td>[%
+                IF copy_info.due_date;
+                    date.format(
+                        ctx.parse_datetime(copy_info.due_date),
+                        DATE_FORMAT
+                    );
+                ELSE;
+                    '-';
+                END %]</td>
         </tr>
+        [% END %]
     </tbody>
 </table>
 
-<div id="rdetail_locs_expand">
+<div id="rdetail_locs_expand" class="hide_me">
     <a href="#"><img
         src="[% ctx.media_prefix %]/images/plus_sign.png" /></a>
     <a style="position:relative;top:-3px;" href="#">Show more locations</a>
@@ -152,7 +189,7 @@
     <a style="position:relative;top:-3px;" href="#">Collapse locations</a>
 </div>
 
-<div id="rdetail_extras_expand">
+<div id="rdetail_extras_expand" class="hide_me">
     <a href="#"><img
         src="[% ctx.media_prefix %]/images/plus_sign.png" /></a>
     <a style="position:relative;top:-3px;" href="#">Expand all tabs</a>