From fc4d959fdd99f985dc687ac6fa237e4683890208 Mon Sep 17 00:00:00 2001 From: senator Date: Wed, 16 Feb 2011 17:04:02 -0500 Subject: [PATCH] copy details in the right place in the layout; some hide_me's sprinkled around for now --- .../perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm | 2 +- Open-ILS/web/css/skin/default/opac/style.css | 6 +- .../default/opac/parts/record/cn_details.tt2 | 39 +----------- .../templates/default/opac/parts/record/extras.tt2 | 12 ++-- .../default/opac/parts/record/summary.tt2 | 73 ++++++++++++++++------ 5 files changed, 64 insertions(+), 68 deletions(-) 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 14456a70fc..87ff6080d8 100644 --- 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 faa3f57447..5fcfe9d029 100644 --- 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 2a5167ec06..1156a5a32b 100644 --- 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 @@ - - +
[% l("print these details") %] - - - - - - [% IF ctx.is_staff %] - - - - [% END %] - - - - [% FOR copy_info IN ctx.copies %] - - - - - [% IF ctx.is_staff %] - - - - [% END %] - - - [% END %] 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 8a5382689a..5d714bc2bb 100644 --- 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 @@ - -
+
[% l("Barcode") %][% l("Status") %][% l("Location") %][% l("Age Hold Protection") %][% l("Create Date") %][% l("Holdable") %][% l("Due Date") %]
[% copy_info.barcode %][% copy_info.copy_status %][% copy_info.copy_location %][% copy_info.age_protect %][% date.format(ctx.parse_datetime(copy_info.create_date), DATE_FORMAT) %] - [% IF copy_info.holdable == 't' AND - copy_info.location_holdable == 't' AND - copy_info.status_holdable == 't'; - l('Yes'); - ELSE; - l('No'); - END; - %] - [% date.format(ctx.parse_datetime(copy_info.create_date), DATE_FORMAT) %]
@@ -258,7 +257,7 @@ -
- - - - - - - -
LocationCall NumberSelving LocationStatusDue Date
- - - - - - - - + + + + + + + [% IF ctx.is_staff %] + + + + [% END %] + + + + + + [% FOR copy_info IN ctx.copies %] + + + + + + [% IF ctx.is_staff %] + + + + [% END %] + + + [% END %]
[% l("Location") %][% l("Call Number") %][% l("Barcode") %][% l("Shelving Location") %][% l("Age Hold Protection") %][% l("Create Date") %][% l("Holdable") %][% l("Status") %][% l("Due Date") %]
[% + # XXX KCLS-specific kludging + org_name = ctx.find_aou(copy_info.circ_lib).name; + dir = org_name | lower | replace('[^\w]', '') | + replace('.+320th', '320th'); %] + [% org_name %] + [% copy_info.call_number_label %][% copy_info.barcode %][% copy_info.copy_location %] + [% copy_info.age_protect ? + ctx.find_crahp(copy_info.age_protect).name : l('None') %] + [% date.format( + ctx.parse_datetime(copy_info.create_date), + DATE_FORMAT + ) %][% (copy_info.holdable == 't' AND + copy_info.location_holdable == 't' AND + copy_info.status_holdable == 't') ? l('Yes') : l('No') %][% copy_info.copy_status %][% + IF copy_info.due_date; + date.format( + ctx.parse_datetime(copy_info.due_date), + DATE_FORMAT + ); + ELSE; + '-'; + END %]
-
+ -
+
Expand all tabs -- 2.11.0