[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_5 updated. 165d51a2843954dafdd9cbb904908d17f789daea
Evergreen Git
git at git.evergreen-ils.org
Fri Nov 22 15:41:57 EST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_5 has been updated
via 165d51a2843954dafdd9cbb904908d17f789daea (commit)
from 7db96d3ea576c2f774208c450f3baf9a72e02703 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 165d51a2843954dafdd9cbb904908d17f789daea
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Oct 27 13:11:37 2013 -0400
Fix copy_table HTML markup errors
TD elements take a "headers" attribute, not a "header" attribute. Also,
we have a few typos in identifying the header attributes.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 9c5feb7..a40d376 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -473,8 +473,8 @@ div.format_icon {
white-space: nowrap;
}
-#rdetails_status td[header=copy_header_library],
-#rdetails_status td[header=copy_header_shelfloc] {
+#rdetails_status td[headers=copy_header_library],
+#rdetails_status td[headers=copy_header_shelfloc] {
white-space: normal;
}
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 e9f962e..9c8407b 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -34,7 +34,7 @@ END;
[%- ELSE -%]
<th id='copy_header_library'>[% l("Location") %]</th>
[%- END %]
- <th id='copy_header_callnmber'>[% l("Call Number / Copy Notes") %]</th>
+ <th id='copy_header_callnumber'>[% l("Call Number / Copy Notes") %]</th>
[%- IF has_parts == 'true' %]
<th id='copy_header_part'>[% l("Part") %]</th>
[%- END %]
@@ -54,7 +54,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 header='copy_header_shelfloc'>
+ <tr class="copy_details_row"><td headers='copy_header_shelfloc'>
[%- bib_lib_name = ctx.get_aou(bib.target_copy.circ_lib).name | html;
l("[_1] (foreign item)", bib_lib_name); -%]
<ul><li>
@@ -65,11 +65,11 @@ END;
</a>
</li></ul>
</td>
- <td header='copy_header_callnumber'>[% bib.target_copy.call_number.label | html %]</td>
- <td header='copy_header_barcode'>[% bib.target_copy.barcode | html %]</td>
- <td header='copy_header_shelfloc'>[% copy_info.copy_location | html %]</td>
- <td header='copy_header_status'>[% copy_info.copy_status | html %]</td>
- <td header='copy_header_due_date'>[% copy_info.due_date | html %]</td>
+ <td headers='copy_header_callnumber'>[% bib.target_copy.call_number.label | html %]</td>
+ <td headers='copy_header_barcode'>[% bib.target_copy.barcode | html %]</td>
+ <td headers='copy_header_shelfloc'>[% copy_info.copy_location | html %]</td>
+ <td headers='copy_header_status'>[% copy_info.copy_status | html %]</td>
+ <td headers='copy_header_due_date'>[% copy_info.due_date | html %]</td>
</tr>
[%- END; # FOREACH peer
END; # FOREACH bib
@@ -90,10 +90,10 @@ END; # FOREACH bib
END;
-%]
<tr class="copy_details_offers_row" property="offers" typeof="Offer">
- [%- IF serial_holdings %]<td header='copy_header_holding_label' class='rdetail-issue-issue'>
+ [%- IF serial_holdings %]<td headers='copy_header_holding_label' class='rdetail-issue-issue'>
[%- copy_info.holding_label | html; -%]
</td>
- [%- ELSE %]<td header='copy_header_library' property="seller">
+ [%- ELSE %]<td headers='copy_header_library' property="seller">
[%-
org_name = ctx.get_aou(copy_info.circ_lib).name;
lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url');
@@ -104,11 +104,11 @@ END; # FOREACH bib
<link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
<link property="itemOffered" href="#schemarecord">
</td>[% END %]
- <td header='copy_header_callnumber'><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>
+ <td headers='copy_header_callnumber'><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 header='copy_header_part'>[% copy_info.part_label | html %]</td>
+ <td headers='copy_header_part'>[% copy_info.part_label | html %]</td>
[%- END %]
- <td header='copy_header_barcode' property="serialNumber">
+ <td headers='copy_header_barcode' property="serialNumber">
[%- IF ctx.is_staff -%]
<a href="javascript:void(0)" onclick="xulG.new_tab(xulG.urls.XUL_COPY_STATUS, {}, {'from_item_details_new': true, 'barcodes': ['[%- copy_info.barcode | html | replace('\'', '\\\'') -%]']})">[% copy_info.barcode | html %]</a>
[%- ELSE -%][% copy_info.barcode | html %]
@@ -117,19 +117,19 @@ END; # FOREACH bib
'<meta property="gtin13" content="' _ attrs.gtin13 _ '" />';
END; -%]
</td>
- <td header='copy_header_shelfloc' property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
+ <td headers='copy_header_shelfloc' property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
[%- IF ctx.is_staff %]
- <td header='copy_header_age_hold'>
+ <td headers='copy_header_age_hold'>
[% copy_info.age_protect ?
ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
</td>
- <td header='copy_header_date_format'>[% date.format(
+ <td headers='copy_header_date_format'>[% date.format(
ctx.parse_datetime(copy_info.create_date),
DATE_FORMAT
) %]</td>
[% END # is_staff %]
[% IF ctx.is_staff OR serial_holdings %]
- <td header='copy_header_holdable'>[% # Show copy/volume hold links to staff (without
+ <td headers='copy_header_holdable'>[% # Show copy/volume hold links to staff (without
# checking whether they have permissions to do those).
overall_holdable = (
copy_info.holdable == 't' AND
@@ -177,11 +177,11 @@ END; # FOREACH bib
l("Not holdable");
END %]</td>
[%- END %]
- <td header='copy_header_status'>[%-
+ <td headers='copy_header_status'>[%-
schema_copy_status.${copy_info.status_code};
copy_info.copy_status | html;
-%]</td>
- <td header='due_date'>[%
+ <td headers='copy_header_due_date'>[%
IF copy_info.due_date;
date.format(
ctx.parse_datetime(copy_info.due_date),
@@ -198,7 +198,7 @@ END; # FOREACH bib
[% END %]
[% END %]
-<tr><td header='copy_header_shelfloc'>
+<tr><td headers='copy_header_shelfloc'>
[%- IF copy_info.peer_bib_marc.size > 1;
'<ul>';
FOREACH bib IN copy_info.peer_bib_marc;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style.css.tt2 | 4 +-
.../src/templates/opac/parts/record/copy_table.tt2 | 38 ++++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list