From: Bill Erickson Date: Wed, 3 Aug 2011 14:51:52 +0000 (-0400) Subject: Merge remote branch 'working/user/shadowspar/ttopac-altcleanup' into template-toolkit... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f5775686ac2023ff8502becf86a7b2317599e7b1;p=contrib%2FConifer.git Merge remote branch 'working/user/shadowspar/ttopac-altcleanup' into template-toolkit-opac-master-merge --- f5775686ac2023ff8502becf86a7b2317599e7b1 diff --cc Open-ILS/src/templates/default/opac/parts/printnav.tt2 index 580c0d63ec,0000000000..d0f0a41fd5 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/printnav.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/printnav.tt2 @@@ -1,25 -1,0 +1,25 @@@ +
+
+
- ++ +
+ [% l('Back') %] + [% l('Homepage') %] + [% l('Print Page') %] + [% l('Help') %] + [% l('Forward') %] +
- ++ +
+
+
diff --cc Open-ILS/src/templates/default/opac/parts/record/summary.tt2 index 52f5fde0b5,0000000000..d97f0fdc12 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/record/summary.tt2 @@@ -1,294 -1,0 +1,288 @@@ +[% PROCESS "default/opac/parts/misc_util.tt2"; + USE ResolverResolver; + ctx.page_title = attrs.title | html_entity +%] + + + +[% IF ctx.refworks.enable == 'true' %] + [% INCLUDE 'default/opac/parts/record/refworks.tt2' %] +[% END %] + + + + + + + + + + + +
+ [% ident = attrs.isbn_clean || attrs.upc; IF ident; %] + [% l('Image of item') %] + [% END %] +
+ 		+ + + + + +
+ [% attrs.title %]
+ [% IF attrs.author %] + [% l("Author") %]: + [% attrs.author %] + [% END %] + 		-
++
+
+
+ [% l('place hold') %][% l('Place Hold') %] +
+
+ [% + operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add"; + label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); + %] -
- -
-
- -
-
- -
++ ++ ++ [% label %] ++ +
+
+
+ [% IF attrs.format_icon %] + [% attrs.format_label %] + [% END %] +
+
+
+
+ + + + + + + + [% IF openurl.enabled == 'true'; + FOR issn IN args.issns; + sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl); + FOR res IN sfx; + %] + + + + + [% END %] + [% END %] + [% END %] + + + + + + + + + + +
+ [% IF attrs.isbn %][% l("ISBN") %][% END %] + [% attrs.isbn %] + [% IF attrs.phys_desc %][% l("Physical Description") %][% END %] + [% attrs.phys_desc %]
+ + [% res.public_name %] + [% res.target_coverage %]
+ [% IF attrs.edition; l("Edition"); END %] + [% attrs.edition %]
+ [% IF attrs.publisher; l("Publisher"); END %] + [% attrs.publisher %] + [% IF attrs.pubdate; l("Publication Date"); END %] + [% attrs.pubdate %]
+ + +
+
+ [% l("[quant,_1,Hold,Holds] with [quant,_2,total copy,total copies]", + ctx.record_hold_count, ctx.copy_summary.0.count) %] +
+
[% l('[quant,_1,Copy,Copies] available', ctx.copy_summary.0.available) %]
+
+ +
+
+
+ +[% FOR uri IN args.uris %] +
+ [% uri.link %][% ' - ' _ uri.note IF uri.note %] +
+[% END %] + +
+ + + + + + + + + [% IF ctx.is_staff %] + + + + [% END %] + + + + + + [% last_cn = 0; + FOR copy_info IN ctx.copies; + NEXT IF copy_info.call_number_label == '##URI##' %] + + + + + + [% IF ctx.is_staff %] + + + + [% END %] + + + + [% END %] + + [% IF ctx.copy_offset > 0; + new_offset = ctx.copy_offset - ctx.copy_limit; + IF new_offset < 0; new_offset = 0; END %] + + [% END %] + [% IF ctx.copies.size >= ctx.copy_limit %] + + [% 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.get_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.get_crahp(copy_info.age_protect).name : l('None') %] + [% date.format( + ctx.parse_datetime(copy_info.create_date), + DATE_FORMAT + ) %][% # Show copy/volume hold links to staff (without + # checking whether they have permissions to do those). + overall_holdable = (copy_info.holdable == 't' AND + copy_info.location_holdable == 't' AND + copy_info.status_holdable == 't'); + IF overall_holdable; + l("Place on"); %] + [% l("copy") %] + [% IF copy_info.call_number != last_cn; + last_cn = copy_info.call_number; + l(" / "); %] + [% l("volume") %] + [% END; + ELSE; + l("No"); + END %][% copy_info.copy_status %][% + IF copy_info.due_date; + date.format( + ctx.parse_datetime(copy_info.due_date), + DATE_FORMAT + ); + ELSE; + '-'; + END %]
+ « [% + l('Previous [_1]', ctx.copy_offset - new_offset) + %] + + [% + l('Next [_1]', ctx.copy_limit) + %] » +
+ +
+ + [% l('Show more locations') %] +
+ +
+ + [% l('Collapse locations') %] +
+ +
+ + [% l('Expand all tabs') %] +
+ +
+ + [% l('Collapse all tabs') %] +
+ +
+ + + + + + + + + + + + + +
+ + + + + + +
+
+ [% l("Title") %]: +
+ 		+ [% l('Place Hold') %] + [% l('Reviews and More') %] + [% l('Add to My List') %] +
+
+
+
+ + diff --cc Open-ILS/src/templates/default/opac/parts/result/table.tt2 index 580fefd81f,0000000000..4c8898fad9 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/result/table.tt2 @@@ -1,287 -1,0 +1,282 @@@ +[% PROCESS "default/opac/parts/misc_util.tt2"; + + USE ResolverResolver; + + ctx.result_start = 1 + ctx.page_size * page; + ctx.result_stop = ctx.page_size * (page + 1); + IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; + + result_count = ctx.result_start; +%] + +
+[% BLOCK results_count_header %] +
+ + + + + + +
[% l('Search Results') %] + [% |l(ctx.result_start, ctx.result_stop, ctx.hit_count) %] + Results [_1] - [_2] of [_3] + [% END %] + + [% |l(page + 1, page_count) %](page [_1] of [_2])[% END %] + + + + [% class = 'search_page_nav_link'; + href = '#'; + IF page > 0; + href = propagator _ '&page=' _ (page - 1); + ELSE; class = class _ ' invisible'; END; + %] + ◄ [% l('Previous') %] + + + + [% class = 'search_page_nav_link'; + href = '#'; + IF (page + 1) < page_count; + href = propagator _ '&page=' _ (page + 1); + ELSE; class = class _ ' invisible'; END; + %] + [% l('Next') %] ► + +
+
+[% END %] +[% ctx.results_count_header = PROCESS results_count_header; + ctx.results_count_header %] +
+ + + + + + +
+
SIDEBAR TODO +
+ 		+ + + [% FOR rec IN ctx.records; + attrs = {marc_xml => rec.marc_xml}; + PROCESS get_marc_attrs args=attrs %] + + + + [% END %] + +
+ + + + + + + + + + + + + + + +
[% + result_count; result_count = result_count + 1 + %]. + [% ident = attrs.isbn_clean || attrs.upc; IF ident; %] + [% l('Image of item') %]
+ [% END %] + 		+
+ [% attrs.title %] +
+
+
+ [% attrs.author %] +    + [% attrs.pubdate %] +
+ + [% IF attrs.publisher %] + + + + + [% END %] + [% IF attrs.isbn %] + + + + + [% END %] + [% IF openurl.enabled == 'true'; + FOR issn IN args.issns; + sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl); + FOR res IN sfx; + %] + + + + + [% END %] + [% END %] + [% END %] + + [% IF attrs.edition %] + + + + + [% END %] + [% IF attrs.phys_desc %] + + + + + [% END %] + [% FOR uri IN args.uris %] + + + + + [% END %] + [% IF args.holdings.size > 0 %] + + + + [% END %] +
+ [% l('Publisher:') %] + [% attrs.publisher; %]
+ [% l('ISBN:') %] + [% attrs.isbn %]
+ + [% res.public_name %] + [% res.target_coverage %]
+ [% l('Edition:') %] + [% attrs.edition %]
+ [% l('Phys. Desc.:') %] + + [% args.phys_desc %] +
+ [% l('Electronic resource') %] + [% uri.link %][% ' - ' _ uri.note IF uri.note %]
+ + + + + + + + + [% FOR copy IN args.holdings %] + + + + + + + [% END %] + +
[% l('Library') %][% l('Shelving location') %][% l('Call number') %][% l('Status') %]
[% copy.library %][% copy.location %][% copy.label %][% copy.status %]
+
+
+ [% l('[_1] of [quant,_2,copy,copies] available', + attrs.copy_counts.available, attrs.copy_counts.count) # XXX s/count/nshadow/ ? + #rec.copy_counts.available, rec.copy_counts.visible) + %] +
+
+
+ + + | + | + + + +
+ 		+ + [% IF attrs.format_icon %] + [% attrs.format_label %] + [% END %] + + + + + + + [% l("Browse in Google Books Search") %] + + + +
+
+
[% l('Place hold') %][% l('Place Hold') %] ++ alt=""/>[% l('Place Hold') %] +
+
- [% operation = ctx.mylist.grep(rec.id).size ? "delete" : "add"; - label = (operation == "add") ? l("Add to") : l("Remove from"); %] -
- -
-
- -
-
- -
++ [% ++ operation = ctx.mylist.grep(rec.id).size ? "delete" : "add"; ++ label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); ++ %] ++ ++ ++ [% label %] ++ +
+ +
+
+
+ + +
+ +
+
+
+
+
+ [% ctx.results_count_header %] + +
diff --cc Open-ILS/src/templates/default/opac/parts/searchbar.tt2 index 6f4f01f2a7,0000000000..116387f505 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/searchbar.tt2 @@@ -1,78 -1,0 +1,78 @@@ +[% PROCESS "default/opac/parts/org_selector.tt2" %] +