From: Bill Erickson Date: Mon, 29 Aug 2011 17:37:19 +0000 (-0400) Subject: Tpac: merged esi/template-toolkit-opac; conflict resolution X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=87f00eefa05b039019464aac9d0679998f36f6d4;p=contrib%2FConifer.git Tpac: merged esi/template-toolkit-opac; conflict resolution Signed-off-by: Bill Erickson --- 87f00eefa05b039019464aac9d0679998f36f6d4 diff --cc Open-ILS/src/templates/default/opac/myopac/lists.tt2 index 4cef8b092f,0000000000..0c4852fef6 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 | html %] + [% ELSE %] + [% bbag.name | html %] + [% 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 | html %][% attrs.author | html %]
+
+

+
+ [% 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/anon_list.tt2 index f1b7d0b6cb,0000000000..a4630ca1b2 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)') %] + + +
+ + [% attrs.title | html %][% attrs.author | html %]
+

+
+
+ [% END %] diff --cc Open-ILS/src/templates/default/opac/parts/place_hold.tt2 index 903cbb65a8,0000000000..f3a564cd67 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates/default/opac/parts/place_hold.tt2 @@@ -1,369 -1,0 +1,83 @@@ +[% PROCESS "default/opac/parts/misc_util.tt2"; - attrs = {marc_xml => ctx.marc_xml}; - PROCESS get_marc_attrs args=attrs; - + PROCESS "default/opac/parts/hold_error_messages.tt2"; +%] -
-
- [% IF ctx.hold_success %] -
[% l("Hold was successfully placed"); %]
- [% ELSIF ctx.hold_failed %] -
[% l("Hold was not successfully placed"); %]
- [% IF ctx.hold_local_block %] -
[% l("There is already a copy available at your local library.") %]
- [% ELSIF ctx.hold_failed_event || ctx.hold_local_alert %] -
- [% l('Problem:') %] - - [% - fail_part_key = ctx.hold_failed_event.payload.fail_part; - event_key = ctx.hold_failed_event.textcode; - - # display: - l(FAIL_PART_MSG_MAP.$fail_part_key) || - l(EVENT_MSG_MAP.$event_key) || - l(ctx.hold_failed_event.desc) || - ctx.hold_failed_event.payload.fail_part || - ctx.hold_failed_event.textcode || - (ctx.hold_local_alert ? - l("There is already a copy available at your local library.") : - l("Unknown problem")) %] - - - [% IF ctx.hold_copy_available %]

- [% l('Find a copy in the shelving location, "[_1]."', locname) | html %] -

[% END %] + - [% IF ctx.could_override || ctx.hold_local_alert %] -

- [% l("You have permission to place this hold anyway.") %] -
- [% l("Click submit below to override the system's objection and place your hold.") %] -

-
- - [% FOR k IN ctx.orig_params.keys %] - - [% END %] - -
- [% END %] -
- [% END; - ELSIF ctx.hold_local_block; - l("There is already a copy available at your local library"); - ELSE %] -
-
- - - [% - new_redirect_to = ctx.referer; - IF new_redirect_to.match('redirect_to'); - new_redirect_to = 'https://' _ ctx.hostname _ ctx.opac_root _ '/home'; - ELSE; - new_redirect_to = new_redirect_to | replace('^http:', 'https:'); - END; - %] - -

Place Hold

- [% IF ctx.is_staff %] -

- ++

[% l('Place Hold') %]

++ ++ ++ [%# ++ new_redirect_to = ctx.referer; ++ IF new_redirect_to.match('redirect_to'); ++ new_redirect_to = 'https://' _ ctx.hostname _ ctx.opac_root _ '/home'; ++ ELSE; ++ new_redirect_to = new_redirect_to | replace('^http:', 'https:'); ++ END; ++ %] ++ ++ ++ [% IF ctx.is_staff %] ++

++ ++ ++
[%# XXX multi-barcode users? %] ++ ++ -

- [% END %] -

- [% title = attrs.title | html; libname = ctx.get_aou(ctx.default_pickup_lib).name | html %] - [% | l(title, libname) %] - You would like to place a hold on [_1].
- If this is correct, confirm your pickup location and click SUBMIT. - [% END %] -

-

- [% l('Pickup location:') %] - [% PROCESS "default/opac/parts/org_selector.tt2"; - PROCESS build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id='pickup_lib' can_have_vols_only=1 %] -

-

- [% |l %]If you use the Traveling Library Center (TLC) and ABC Express - services, please select "Outreach" to have the item delivered - during your scheduled visit.[% END %] -

- -        - [% l('Cancel') %] -
-

-

- [% |l %]* If you need your item today, and it is checked in at your - library, please place your hold and then call your library to set it - aside. Placing a hold without calling the library will increase your - wait time.[% END %] -
[% l('Library phone numbers.') %] -

-

- [% |l %]* For best possible service, we recommend keeping - a printed copy of your most recent holds list.[% END %] ++ +

- [% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ++ [% END %] + - - - - - - - - -
[% l("Create / Edit a Hold") %]
[% l("Recipient") %]:
[% l("Title:") %]
[% l("Author") %]
[% l("Format") %]
[% l("Physical Description:") %]
[% l("Call Number:") %]
[% l("Copy Barcode:") %]
[% l("Hold Type:") %] - [% l("Volume Hold") %] - - [% l("Copy Hold") %] -
[% l("Contact telephone number") %]: - - - [% l("(XXX-YYY-ZZZZ)") %] - -
[% l("Enable phone notifications for this hold?") %] - -
[% l("Contact email address") %]: - - ([% l("Patron has no configured email address") %])
- ([% l("See") %] [% l("My Account") %] [% l("for setting your email address") %]) -
- - [% l("(Patron has no configured email address)") %] - -
[% l("Enable email notifications for this hold?") %] - -
[% l("Pickup location") %] - -
[% l("Expiration date") %] - -
- [% l("Suspend this hold") %] - [% l("(Help)") %] - - -
- - [% l("Automatically activate hold on:") %] - - -
- -
-
- [% l("Acceptable Alternative Formats:") %] - [% l("(Help)") %] -
-
[% l("(control-click to select multiple formats)") %]
-
- -
- - - - -
- - [% l("The phone number does not have the correct format. The expected format is XXX-YYY-ZZZZ") %] - - - [% |l %]No items were found that could fulfill the requested holds. - It's possible that choosing a different format will result in a successful hold. - It is also possible that you have exceeded the number of allowable holds. - For further information, please consult your local librarian.[% END %] - -
-
-
- Place hold on selected
- Remove selected - - ++ ++
++ [% FOR hdata IN ctx.hold_data; ++ attrs = {marc_xml => hdata.marc_xml}; ++ PROCESS get_marc_attrs args=attrs %] + - - - + ++ [% END %] +
- - - - Title ++ ++ ++
[% attrs.title_extended | html %]
+
- - - - - - - - - - - -
- Back to search results -
- - - [% l("Books") %] - [% l("Large Print Books") %] - [% l("Audiobooks") %] - [% l("Video Recordings") %] - [% l("Music") %] - [% l("Electronic Resources") %] - - - - [% |l %]If you wish to broaden the scope of your hold to include other versions of this title, - select the formats that would be acceptable. The first available copy will be sent to you.[% END %] - + - [% l("Please select a physical location where your hold can be delivered.") %] - [% l("A hold already exists on the requested item.") %] - [% l("A hold already exists on the requested item. Would you like to create the hold anyway?") %] - - - [% |l %]PATRON BARRED. Please see any notes in the "Staff Notes" section of your - "My Account" page or contact your local library.[% END %] - - - - [% |l %]This hold is no longer valid. It's likely that the target for the hold was - deleted from the system. Please cancel this hold and place a new one.[% END %] - - [% l("The patron barcode entered as the hold recipient is invalid.") %] ++

++ [% l('Pickup location:') %] ++ [% PROCESS "default/opac/parts/org_selector.tt2"; ++ PROCESS build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id='pickup_lib' can_have_vols_only=1 %] ++

++

++ [% |l %]If you use the Traveling Library Center (TLC) and ABC Express ++ services, please select "Outreach" to have the item delivered ++ during your scheduled visit.[% END %] ++

++ ++        ++ [% l('Cancel') %] ++ ++

++

++ [% |l %]* If you need your item today, and it is checked in at your ++ library, please place your hold and then call your library to set it ++ aside. Placing a hold without calling the library will increase your ++ wait time.[% END %] ++
[% l('Library phone numbers.') %] ++

++

++ [% |l %]* For best possible service, we recommend keeping ++ a printed copy of your most recent holds list.[% END %] ++

+
++ diff --cc Open-ILS/src/templates/default/opac/parts/place_hold_result.tt2 index 0000000000,0000000000..ac07c0dee5 new file mode 100644 --- /dev/null +++ b/Open-ILS/src/templates/default/opac/parts/place_hold_result.tt2 @@@ -1,0 -1,0 +1,97 @@@ ++[% PROCESS "default/opac/parts/misc_util.tt2"; ++ PROCESS "default/opac/parts/hold_error_messages.tt2"; ++ override_possible = 0; ++%] ++ ++ ++ ++
++

[% l('Place Hold') %]

++ ++
++ ++ [% FOR k IN ctx.orig_params.keys %] ++ ++ [% END %] ++ ++ ++ ++ [% FOR hdata IN ctx.hold_data; ++ attrs = {marc_xml => hdata.marc_xml}; ++ PROCESS get_marc_attrs args=attrs %] ++ ++ ++ ++ ++ [% END %] ++
++ [% ++ override = 0; ++ IF hdata.could_override || hdata.hold_local_alert; ++ override_possible = 1; ++ override = 1; ++ END; ++ %] ++ ++ ++
[% attrs.title_extended | html %]
++
++ [% IF hdata.hold_success %] ++ ++
[% l("Hold was successfully placed"); %]
++ ++ [% ELSIF hdata.hold_failed %] ++ ++
[% l("Hold was not successfully placed"); %]
++ [% IF hdata.hold_local_block %] ++
[% l("There is already a copy available at your local library.") %]
++ [% ELSIF hdata.hold_failed_event || hdata.hold_local_alert %] ++
++ [% l('Problem:') %] ++ ++ [% ++ fail_part_key = hdata.hold_failed_event.payload.fail_part; ++ event_key = hdata.hold_failed_event.textcode; ++ ++ # display: ++ l(FAIL_PART_MSG_MAP.$fail_part_key) || ++ l(EVENT_MSG_MAP.$event_key) || ++ l(hdata.hold_failed_event.desc) || ++ hdata.hold_failed_event.payload.fail_part || ++ hdata.hold_failed_event.textcode || ++ (hdata.hold_local_alert ? ++ l("There is already a copy available at your local library.") : ++ l("Unknown problem")) | html ++ %] ++ [% IF event_key == 'PERM_FAILURE' %] ++
[% l('Permission: "[_1]"', hdata.hold_failed_event.ilsperm) | html %]
++ [% END %] ++
++ [% IF hdata.hold_copy_available %] ++

[% l('Find a copy in the shelving location, "[_1]."', locname) | html %]

++ [% END %] ++
++ [% END; ++ END %] ++
++
++ [% IF override_possible %] ++
++
++
++ [% |l %]You have permission to override some of the failed holds.
Click Submit to override and place your hold on the selected items.[% END %] ++
++ ++ ++ ++ [% END %] ++ ++ [% l('Cancel') %] ++ ++
++
++ diff --cc Open-ILS/src/templates/default/opac/parts/searchbar.tt2 index 047b3f5f4f,0000000000..c39fd57b41 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" %] + diff --cc Open-ILS/src/templates/default/opac/place_hold.tt2 index 3e6d2bd92d,0000000000..0badd804f3 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/place_hold.tt2 +++ b/Open-ILS/src/templates/default/opac/place_hold.tt2 @@@ -1,16 -1,0 +1,20 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + WRAPPER "default/opac/parts/base.tt2"; + INCLUDE "default/opac/parts/topnav.tt2"; + ctx.page_title = l("Place Hold") %] +
+ [% INCLUDE "default/opac/parts/printnav.tt2" %] + [% INCLUDE "default/opac/parts/searchbar.tt2" %] +
+
+
+
- [% INCLUDE "default/opac/parts/place_hold.tt2" %] ++ [% IF ctx.hold_attempt_made %] ++ [% INCLUDE "default/opac/parts/place_hold_result.tt2" %] ++ [% ELSE %] ++ [% INCLUDE "default/opac/parts/place_hold.tt2" %] ++ [% END %] +
+
+
+[% END %] diff --cc Open-ILS/src/templates/default/opac/results.tt2 index d368a70a2e,0000000000..bfe96330f7 mode 100644,000000..100644 --- a/Open-ILS/src/templates/default/opac/results.tt2 +++ b/Open-ILS/src/templates/default/opac/results.tt2 @@@ -1,84 -1,0 +1,83 @@@ +[% PROCESS "default/opac/parts/header.tt2"; + USE POSIX; + + WRAPPER "default/opac/parts/base.tt2"; + INCLUDE "default/opac/parts/topnav.tt2"; + + IF is_advanced || is_special; + ctx.page_title = l("Search Results"); + ELSE; + ctx.page_title = l("Search Results: ") _ CGI.param('query') | html; + END; + + page = CGI.param('page'); + page = page.match('^\d+$') ? page : 0; # verify page is a sane value + + page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size); +%] +
+
+ [% INCLUDE "default/opac/parts/printnav.tt2" %] + [% INCLUDE "default/opac/parts/searchbar.tt2" took_care_of_form=1 %] +
+
+
+
+
+ [% l('Another Search') %] +
+
+ [% l('Advanced Search') %] +
+ [% IF ctx.mylist.size %] +
+ [% l('View My List') %] +
+ [% END %] +
- [% UNLESS is_advanced || is_special %] +
[% l('Sort by') %]
+ [% INCLUDE "default/opac/parts/filtersort.tt2" value=CGI.param('sort') %] +
+ + +
+ + + + - [% END %] +
+
+
+
+
+
+
+
+ [% path = "default/opac/parts/result/" _ + (ctx.records.size ? "table.tt2" : "lowhits.tt2"); + INCLUDE $path %] +
+
+
+
+[% END %]