From: Bill Erickson Date: Wed, 3 Aug 2011 14:50:04 +0000 (-0400) Subject: Merge remote branch 'working/user/rri/ttopac' into template-toolkit-opac-master-merge X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=86e74c400a76655d90f1625a174851fec690036d;p=contrib%2FConifer.git Merge remote branch 'working/user/rri/ttopac' into template-toolkit-opac-master-merge With some minor merge conflict repair Signed-off-by: Bill Erickson --- 86e74c400a76655d90f1625a174851fec690036d diff --cc Open-ILS/src/templates/default/opac/myopac/circ_history.tt2 index a0955585c8,0000000000..9d88fe8932 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates/default/opac/myopac/circ_history.tt2 @@@ -1,102 -1,0 +1,102 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; + myopac_page = "circs" + limit = ctx.circ_history_limit; + offset = ctx.circ_history_offset; +%] + +
+ +
+
+ +
+
+ +
+
+
+ +
+ [% l('Previously Checked Out Items') %] + + + [%# TODO: get total to prevent paging off then end of the list.. %] + + + + [% l('Export List') %] + +
+
+ + [% IF ctx.circs.size < 1 %] -
++
+ [% l('There are no items in your circulation history.') %] +
+ [% ELSE %] + +
+ + + + + + + + + + + + + [% FOR circ IN ctx.circs; + attrs = {marc_xml => circ.marc_xml}; + PROCESS get_marc_attrs args=attrs; %] + + + + + + + + + [% END %] + +
+ [% l('Title') %] / + [% l('Author') %] + + [% l('Checkout Date') %] + + [% l('Due Date') %] + + [% l('Date Returned') %] + + [% l('Barcode') %] + + [% l('Call Number') %] +
+ [% attrs.title %] + [% IF attrs.author %] / + [% attrs.author %] + [% END %] + + [% date.format(ctx.parse_datetime(circ.circ.xact_start),DATE_FORMAT); %] + + [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT); %] + + [% + IF circ.circ.checkin_time; + date.format(ctx.parse_datetime(circ.circ.checkin_time),DATE_FORMAT); + ELSE; %] + * + [% END; %] + [% circ.circ.target_copy.barcode %][% circ.circ.target_copy.call_number.label %]
+
+ [% END %] +
+[% END %] diff --cc Open-ILS/src/templates/default/opac/myopac/circs.tt2 index 67f94b8747,0000000000..2275aff036 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates/default/opac/myopac/circs.tt2 @@@ -1,166 -1,0 +1,166 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; + myopac_page = "circs" %] +
+ +
+
+ +
+
+ +
+
+
+ +
+ [% l('Current Items Checked Out') %] + + [% l('Export List') %] + +
+
+ [% IF ctx.circs.size < 1 %] -
++
+ [% l('You have no items checked out.') %] +
+ [% ELSE %] + [% IF ctx.success_renewals %] +
+ [% l("Successfully renewed [_1] item(s)", ctx.success_renewals) %] +
+ [% END %] + [% IF ctx.failed_renewals %] +
+ [% l("Failed to renew [_1] item(s)", ctx.failed_renewals) %] +
+ [% END %] +
+
- ++
+ + + + + +
+ + + + + Renewing Help +
+ + + + + + + + + +
+ + + + Title + / + + Author + + + Renews
Left + + 		+ Due Date + + barcode + + call number +
+ +
+
+ + [% FOR circ IN ctx.circs; + attrs = {marc_xml => circ.marc_xml}; + PROCESS get_marc_attrs args=attrs; %] + + + + + + + + + [% IF circ.renewal_response AND + circ.renewal_response.textcode != 'SUCCESS' %] + + + + [% END; + END %] +
+ + + [% attrs.title %] + [% IF attrs.author %] / + [% attrs.author %] + [% END %] + + [% circ.circ.renewal_remaining %] + + [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT) %] + + [% circ.circ.target_copy.barcode %] + + [% circ.circ.target_copy.call_number.label %] +
[%# XXX colspan="0" does not work in IE %] + + [% circ.renewal_response.desc || circ.renewal_response.payload.fail_part || circ.renewal_response.textcode %] + +
+
+
+
+
+ [% END %] +
+
+
[% l("Other Circulations") %]
+ + + + + + + + + + + + +
[% l("Circulating Library") %][% l("Circulation Type") %][% l("Please return by ...") %]
+ + +
+
+
+[% END %] diff --cc Open-ILS/src/templates/default/opac/myopac/hold_history.tt2 index 43f32564ec,0000000000..d3453d786b mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates/default/opac/myopac/hold_history.tt2 @@@ -1,127 -1,0 +1,127 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; + myopac_page = "holds" + limit = ctx.hold_history_limit; + offset = ctx.hold_history_offset; +%] + +
+ +
+
+ +
+
+ +
+
+
+ +
+ [% l("Previously Held Items") %] + + + [%# TODO: get total to prevent paging off then end of the list.. %] + + + + Export List + +
+
+ +
+ [% IF ctx.holds.size < 1 %] -
++
+ [% l('No holds found.') %] +
+ [% ELSE %] + + + + + + + + + + + + + + + [% FOR hold IN ctx.holds; + attrs = {marc_xml => hold.marc_xml}; + PROCESS get_marc_attrs args=attrs; + ahr = hold.hold.hold %] + + + + + + + + + + + + + [% END %] + +
[% l('Title') %][% l('Author') %] [% l('Format') %][% l('Pickup Location') %] [% l('Active On') %][% l('Active') %][% l('Date Fulfilled') %][% l('Status') %]
+ + + + +
+ [% IF attrs.format_icon %] + [% attrs.format %] + [% ELSE; + attrs.format; + END %] +
+ 		+ [% ctx.get_aou(ahr.pickup_lib).name %] + + [% IF ahr.frozen == 't' AND ahr.thaw_date; + date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT); + END %] + + [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %] + + [% IF ahr.fulfillment_time; + date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT); + END %] + +
+ [% + IF hold.hold.status == 4; + l("Available"); + IF ahr.shelf_expire_time; + l('
Expires [_1]', + date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT)); + END; + ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0; + # estimated wait is delivered as seconds. + SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400); + l("Estimated wait: [quant,_1,day,days]", hwait); + ELSIF hold.hold.status == 3; + l("In Transit"); + ELSIF hold.hold.status < 3; + l("Waiting for copy"); + END; + %] +
+
+ [% END %] +
+[% END %] diff --cc Open-ILS/src/templates/default/opac/myopac/holds.tt2 index a6bb6709dc,0000000000..442a1dfbc8 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/default/opac/myopac/holds.tt2 @@@ -1,228 -1,0 +1,228 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; + myopac_page = "holds" %] +
+ +
+
+ +
+
+ +
+
+
+ +
+ + [% IF CGI.param("available"); + l("Items Ready for Pickup"); + ELSE; + l("Current Items on Hold"); + END + %] + + + Export List + +
+
+
+
+ + + + + + + +
+ + + + + Holds Help + + [% l("Show") %]     + [% IF CGI.param("available") %] + [% l('all') %] | + [% l("only available") %] + [% ELSE %] + [% l("all") %] | + [% l("only available") %] + [% END %]     + [% l("holds") %] + +
+ [% IF ctx.holds.size < 1 %] -
++
+ [% l('No holds found.') %] +
+ [% ELSE %] + + + + + + + + + + + + +
+ + + + Title + + + Author + + Format + + Pickup Location + ActivateCancel if not
filled by		Active + Status +
+
+ +
+ + + + [% FOR hold IN ctx.holds; + attrs = {marc_xml => hold.marc_xml}; + PROCESS get_marc_attrs args=attrs; + ahr = hold.hold.hold %] + + + + + + + + + + + + + [% END %] + +
+ + + + + + +
+ [% IF attrs.format_icon %] + [% attrs.format %] + [% ELSE; + attrs.format; + END %] +
+ 		+ [% ctx.get_aou(ahr.pickup_lib).name %] + + + [% IF ahr.frozen == 't' AND + ahr.thaw_date; + date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT); + END %] + + + [% IF ahr.expire_time; + date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT); + END %] + + + [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %] + +
+ [% PROCESS get_hold_status hold=hold; %] +
+ 		+ Edit +
+ [% END %] + +
+ + [% l("Are you sure you wish to cancel the selected holds?") %] + [% l("Are you sure you wish to suspend the selected holds? If an item has already been selected to fulfill the hold, it will not be suspended") %] + [% l("Are you sure you wish to activate the selected holds?") %] + [% l("Are you sure you wish to change the activate date for the selected holds?") %] + [% l("Select an automatic activation date. If no date is chosen, the holds will remain suspended until they are manually activated.") %] + + + +
[% l("Processing holds... This may take a moment.") %]
+ + + [% l("If you wish to cancel the selected hold, click OK, otherwise click Cancel.") %] + +
+
+
+ [% l("Select an automatic activation date. If no date is chosen, the holds will remain suspended until they are manually activated.") %] +
+

+ +

+

+ +

+
+[% END %] diff --cc Open-ILS/src/templates/default/opac/myopac/lists.tt2 index ba8d556360,0000000000..c15a19f63d mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates/default/opac/myopac/lists.tt2 @@@ -1,185 -1,0 +1,185 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + PROCESS "default/opac/parts/misc_util.tt2"; + WRAPPER "default/opac/parts/myopac/base.tt2"; + myopac_page = "lists" %] +
+ + +
+ + + +
+

[% l('Create new list') %]

+ + + + + + +
+ + + + + + + [% l('Sharing Help') %] + + +       + [% l('Cancel') %] +
+
+ + [% INCLUDE "default/opac/parts/anon_list.tt2" %] + [% IF ctx.bookbags.size %] +
+ [% FOR bbag IN ctx.bookbags %] +
+
+
+
+ + [% IF bbag.pub != 't' %] + + + [% ELSE %] + + + [% END %] +
+
+
+
+ + + +
+
+
+ + [% IF bbag.pub == 't' %] + [% url = 'http://' _ ctx.hostname _ '/opac/extras/feed/bookbag/html-full/' _ bbag.id %] + [% bbag.name %] + [% ELSE %] + [% bbag.name %] + [% END %] + +
+
+ [% IF bbag.pub == 't'; %] + [% l('RSS Feed') %] + [% END %] +
+
+
+
+ + + + + + + + + + + + [% UNLESS bbag.items.size %] + + [% END %] + [% FOR item IN bbag.items; + rec_id = item.target_biblio_record_entry; + attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id}; + PROCESS get_marc_attrs args=attrs %] + - - - ++ ++ ++ + + [% END %] + +
+ + + [% l('Title') %][% l('Author(s)') %] - + + + + + +
+ [% l("This list contains no items.") %] +
[% attrs.title %][% attrs.author %][% attrs.title %][% attrs.author %]
+
+

+
+ [% END %] +
+ [% END %] + +
+ [% l("This will remove the selected bookbag and all items contained within the bookbag. Are you sure you wish to continue?") %] +
+
[% l("You have not created any bookbags") %]
+
+ +
+ +[% |l %]Sharing a Bookbag means that the contents +of the Bookbag will be visible to others. +To see the public view of a shared Bookbag, +click on the Bookbag's name in the Bookbag list.[% END %] + + + [% l("Are you sure you wish to remove this bookbag item?") %] + + + [% l("Sharing this bookbag will allow the contents of the bookbag to be seen by others. Are you sure you wish to share this bookbag?") %] + + + [% l("Are you sure you wish to hide this bookbag?") %] + + + [% l("The Bookbag was successfully updated.") %] + + + [% l("Warning: Adding items to a bookbag creates a link between you and the items in the database. The contents of the bookbag are NOT publicly viewable unless the bookbag is shared. However, if you prefer not to have any link between your patron record and a particular item or items, we suggest that you do not place said items in a bookbag or that you avoid using bookbags all together. Thank you.") %] + + + [% l("Bookbags are...") %] + + + [% l("Bookbag successfully updated") %] + + +
+[% END %] diff --cc Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2 index ddb4260847,0000000000..e523ec9612 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2 @@@ -1,44 -1,0 +1,44 @@@ +[% + contains_options = [ + {value => 'contains', label => l('Contains')}, + {value => 'nocontains', label => l('Does not contain')}, + {value => 'phrase', label => l('Contains phrase')}, + {value => 'exact', label => l('Matches exactly')} + ]; + contains = CGI.param('contains'); + queries = CGI.param('query'); + bools = CGI.param('bool') || ['and' x 3]; + qtypes = CGI.param('qtype') || ['keyword' x 3]; + FOR qtype IN qtypes; + c = contains.shift; + b = bools.shift; + q = queries.shift; %] + + + + + + + + + - ++ + [% INCLUDE "default/opac/parts/qtype_selector.tt2" + query_type=qtype %] + + + + + + + +[% END %] diff --cc Open-ILS/src/templates/default/opac/parts/advanced/search.tt2 index 5762ead1c8,0000000000..a6e9ad5feb mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/advanced/search.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/advanced/search.tt2 @@@ -1,204 -1,0 +1,204 @@@ +
+ + + - + + + + + + + + + + + + +
+ + + + diff --cc Open-ILS/src/templates/default/opac/parts/anon_list.tt2 index 19a7440320,0000000000..7ffa997043 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/anon_list.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/anon_list.tt2 @@@ -1,65 -1,0 +1,65 @@@ + [% IF ctx.mylist.size %] +
+
+
+ + + + + +
+ [% l('Temporary List') %] + + +
+
+
+
+ + + + + + + + + + + [% FOR item IN ctx.mylist; + attrs = {marc_xml => ctx.mylist_marc_xml.$item}; + PROCESS get_marc_attrs args=attrs %] + - - - ++ ++ + + [% END %] + +
+ + [% l('Title') %][% l('Author(s)') %] - + + + + [% IF ctx.user AND ctx.bookbags.size %] + + [% FOR bbag IN ctx.bookbags %]] - ++ + [% END %] + + [% END %] + + +
++ + + [% attrs.title %][% attrs.author %][% attrs.title %][% attrs.author %]
+

+
+
+ [% END %] diff --cc Open-ILS/src/templates/default/opac/parts/record/cn_details.tt2 index 2865026a61,0000000000..ea48f3e565 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/record/cn_details.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/record/cn_details.tt2 @@@ -1,91 -1,0 +1,91 @@@ + + + + + + +
+
+ [% l("print these details") %] + + + + + + + + + +
+ + + + + + + +
+ + [% l("Copy Note") %] + + + [% l("Copy Category") %] + + + : +
+
+
+
+ +[% l("Yes") %] +[% l("No") %] + +
+
+
+ +
+
+ + + + + + + + + + - ++ + + + + + + +
[% l("Library") %]
[% l("Title") %]
[% l("Author") %]
[% l("Edition") %]
[% l("Publication Date") %]
[% l("Publisher") %]
[% l("Physical Description") %]
[% l("Call Number") %]
+
+
+