From 234b96d0cef01abe2ede6825625c1ba864ae18bb Mon Sep 17 00:00:00 2001 From: Chris Burton Date: Fri, 24 Jul 2020 17:03:00 -0400 Subject: [PATCH] LP1778972 A slew of updates including fixes to ensure pages are valid and an entire reimagining of the My Account interface --- Open-ILS/src/templates-bootstrap/opac/advanced.tt2 | 1 + Open-ILS/src/templates-bootstrap/opac/browse.tt2 | 2 +- .../src/templates-bootstrap/opac/css/style.css.tt2 | 14 +- Open-ILS/src/templates-bootstrap/opac/home.tt2 | 6 +- .../src/templates-bootstrap/opac/mylist/clear.tt2 | 3 +- .../src/templates-bootstrap/opac/mylist/email.tt2 | 5 +- .../src/templates-bootstrap/opac/mylist/print.tt2 | 6 +- .../opac/myopac/circ_history.tt2 | 62 ++------ .../src/templates-bootstrap/opac/myopac/circs.tt2 | 53 ++----- .../opac/myopac/ebook_circs.tt2 | 16 +- .../opac/myopac/ebook_holds.tt2 | 19 +-- .../opac/myopac/ebook_holds_ready.tt2 | 19 +-- .../opac/myopac/hold_history.tt2 | 28 +--- .../src/templates-bootstrap/opac/myopac/holds.tt2 | 52 ++---- .../src/templates-bootstrap/opac/myopac/lists.tt2 | 16 +- .../src/templates-bootstrap/opac/myopac/main.tt2 | 16 +- .../opac/myopac/main_payments.tt2 | 2 +- .../opac/myopac/messages/list.tt2 | 39 +---- .../opac/myopac/messages/single_message.tt2 | 14 +- .../src/templates-bootstrap/opac/myopac/prefs.tt2 | 43 +++-- .../opac/myopac/prefs_settings.tt2 | 2 +- .../src/templates-bootstrap/opac/parts/acjs.tt2 | 76 +++++++++ .../opac/parts/advanced/expert.tt2 | 10 +- .../opac/parts/advanced/global_row.tt2 | 4 +- .../opac/parts/advanced/numeric.tt2 | 2 +- .../opac/parts/advanced/search.tt2 | 8 +- .../templates-bootstrap/opac/parts/anon_list.tt2 | 2 +- .../src/templates-bootstrap/opac/parts/base.tt2 | 14 +- .../opac/parts/bookbag_actions.tt2 | 4 +- .../templates-bootstrap/opac/parts/cart_nav.tt2 | 21 ++- .../templates-bootstrap/opac/parts/chilifresh.tt2 | 17 ++ .../templates-bootstrap/opac/parts/css/colors.tt2 | 4 +- .../opac/parts/ebook_api/avail.tt2 | 41 +++++ .../opac/parts/ebook_api/base_js.tt2 | 95 +++++++++++ .../opac/parts/ebook_api/login_js.tt2 | 41 +++++ .../src/templates-bootstrap/opac/parts/footer.tt2 | 43 ++--- Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 | 176 +++++++++++++++++++++ .../templates-bootstrap/opac/parts/login/form.tt2 | 4 +- .../opac/parts/login/login_modal.tt2 | 12 +- .../opac/parts/metarecord_hold_filters.tt2 | 4 - .../templates-bootstrap/opac/parts/misc_util.tt2 | 4 +- .../templates-bootstrap/opac/parts/myopac/base.tt2 | 99 +++++++----- .../opac/parts/myopac/main_base.tt2 | 8 +- .../opac/parts/myopac/prefs_base.tt2 | 22 +-- .../templates-bootstrap/opac/parts/place_hold.tt2 | 17 +- .../opac/parts/record/cnbrowse.tt2 | 18 +-- .../opac/parts/record/copy_counts.tt2 | 5 +- .../opac/parts/record/copy_table.tt2 | 2 +- .../opac/parts/record/extras.tt2 | 2 +- .../opac/parts/record/summary.tt2 | 54 +++---- .../opac/parts/result/facets.tt2 | 2 +- .../opac/parts/result/table.tt2 | 103 ++++++------ .../templates-bootstrap/opac/parts/searchbar.tt2 | 6 +- .../src/templates-bootstrap/opac/parts/topnav.tt2 | 9 +- .../opac/parts/topnav_links.tt2 | 38 ++--- .../opac/parts/topnav_subnav.tt2 | 5 +- Open-ILS/src/templates-bootstrap/opac/results.tt2 | 2 +- 57 files changed, 814 insertions(+), 578 deletions(-) create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/acjs.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/chilifresh.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/avail.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/base_js.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/login_js.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 diff --git a/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 b/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 index 1d6b412f3c..dcd666847c 100644 --- a/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 @@ -37,6 +37,7 @@ class="nav-link [% IF pane == 'expert' %]active[% END %]" id="expert_search">[% l('Expert Search') %] +
diff --git a/Open-ILS/src/templates-bootstrap/opac/browse.tt2 b/Open-ILS/src/templates-bootstrap/opac/browse.tt2 index 1ab9f77e57..7f079a75a3 100644 --- a/Open-ILS/src/templates-bootstrap/opac/browse.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/browse.tt2 @@ -50,7 +50,7 @@ arialabel=l('Select holding library') %] [% l('Browse for [_1] starting with [_2] in [_3]', control_qtype, control_bterm, control_locg) %] - + [% l('Catalog Home') %] [% INCLUDE "opac/parts/searchbar.tt2" is_home_page=1 %] -
-
+ [% INCLUDE "opac/parts/homesearch.tt2" %] -
-
+ [%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 index 8e2596aa3b..4acacec72f 100644 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 @@ -11,8 +11,7 @@
+ value="[% l('Confirm') %]" title="[% l('Confirm') %]" class="btn btn-confirm" />
diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 index 9eeaa27809..7f57d217f4 100644 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 @@ -11,12 +11,11 @@

[% l('Please confirm that you want to email the [_1] titles in the basket.', ctx.mylist.size) %]

- +
+ value="[% l('Confirm') %]" title="[% l('Confirm') %]" class="btn btn-confirm" />
[% ELSE %] diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 index 08722c1df1..2d280624cd 100644 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 @@ -11,12 +11,12 @@

[% l('Please confirm that you want to print the [_1] titles in the basket.', ctx.mylist.size) %]

- - + +
+ class="btn btn-confirm" />
[% ELSE %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 index dc1d90ffdf..bdf39d005c 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 @@ -9,21 +9,7 @@

[% l('History of Checked Out Items') %]

-
- -
+ [% # In the sorting case, the size is the size of ALL the circ items. In the non-sorting case, @@ -37,15 +23,12 @@ END; %]
-
- [% l('Previously Checked Out Items') %] - - limit, offset => (offset - limit)}) %]' - [% IF offset == 0 %] class='invisible' [% END %]>◄[% l('Previous') %] - [%# TODO: get total to prevent paging off then end of the list.. %] - limit, offset => (offset + limit)}) %]' - [% IF no_next %] class='invisible' [% END %] >[% l('Next') %]► - +
+
limit, offset => (offset - limit)}) %]' + [% IF offset == 0 %] class='invisible' [% ELSE %] class="btn btn-action" [% END %]>◄[% l('Previous') %]
+

[% l('Previously Checked Out Items') %]

+
limit, offset => (offset + limit)}) %]' + [% IF no_next %] class='invisible' [% ELSE %] class="btn btn-action" [% END %] >[% l('Next') %]►
@@ -53,30 +36,9 @@
[% l('There are no items in your circulation history.') %]
[% ELSE %] -
- - - - - - - -
- - - -
+ + +
@@ -162,8 +124,8 @@ diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 index 760674b303..b8f66c6e95 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 @@ -6,21 +6,7 @@ %]

[% l('Current Items Checked Out') %]

-
- -
+
[% l('Current Items Checked Out') %] @@ -43,23 +29,7 @@
- - - - - - - +
+ circ.circ.target_copy.call_number.record.id, {}, 1) %]"> + [%- circ.ATTRS.title.substr(0,circ.ATTRS.nonfiling_characters) | html %] [%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %]
- - - - @@ -185,20 +154,20 @@ due_date = ctx.parse_datetime(circ.circ.due_date, circ.circ.circ_lib); due_class = (date.now > date.format(due_date, '%s')) ? 'error' : ''; %] - - - [% IF ctx.get_org_setting(ctx.user.home_ou, 'opac.show_owning_lib_column'); %] - + diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index 960d67c3af..139e17a86a 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -10,24 +10,7 @@ %]

[% l('My Holds') %]

-
- -
+
@@ -39,26 +22,15 @@ %]
+
- - - - - - + + + +
@@ -114,6 +86,7 @@
+ @@ -173,8 +146,7 @@ ahr = hold.hold.hold; cnt = cnt + 1; %] - + @@ -267,9 +238,8 @@ [% END %]
+ + Title [% IF circ.circ.target_copy.call_number.id == -1 %] [% circ.circ.target_copy.dummy_title | html %] [% ELSIF circ.ATTRS.title %] + circ.circ.target_copy.call_number.record.id, {}, 1) %]"> [%- circ.ATTRS.title.substr(0,circ.ATTRS.nonfiling_characters) | html %] [%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %] [% END %] + [% IF circ.circ.target_copy.call_number.id == -1 %] Author [% circ.circ.target_copy.dummy_author | html %] @@ -177,7 +146,7 @@ [% END %] + Renewals Remaining [% circ.circ.renewal_remaining %] + Due Date [% date.format(due_date, DATE_FORMAT) %] + Barcode [% circ.circ.target_copy.barcode | html %] + Call Number [% circ.circ.target_copy.call_number.label | html %] + [%- fleshed_ou = circ.circ.target_copy.call_number.owning_lib; INCLUDE "opac/parts/library_name_link_from_ou.tt2"; %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 index eb40563a80..ab32cdaccc 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 @@ -7,21 +7,7 @@

[% l('E-Items Currently Checked Out') %]

-
- -
+
[% l('E-Items Currently Checked Out') %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 index 737475c940..c03c05ff6e 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 @@ -11,24 +11,7 @@

[% l('My E-Item Holds') %]

-
- -
+
[% l('E-Items on Hold') %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 index 83fd8b91d7..93edc9da2b 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 @@ -10,24 +10,7 @@ %]

[% l('E-Items Ready for Checkout') %]

-
- -
+
[% l('E-Items Ready for Checkout') %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 index 1ee35895ac..6208a3b05e 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 @@ -9,28 +9,7 @@ %]

[% l('Holds History') %]

-
- - -
- -
- +
@@ -81,7 +60,7 @@ PROCESS get_marc_attrs args=attrs; ahr = hold.hold.hold %] -
Title @@ -111,8 +90,7 @@ Hold Status -
- [% PROCESS get_hold_status hold=hold; %] +
[% PROCESS get_hold_status hold=hold; %]
[% l('Cancel if not filled by') %] [% l('Status') %] [% l('Notes') %]
Hold Number [% cnt; %] @@ -190,8 +162,7 @@ END; %] + hold.hold.bre_id, {}, 1) %]"> [%- title.substr(0,hold.ATTRS.nonfiling_characters) | html %] [%- title.substr(hold.ATTRS.nonfiling_characters) | html %] @@ -241,7 +212,7 @@ Status -
+
[% PROCESS get_hold_status hold=hold; %]
-
[% END %]
-
+
[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 index e9e2738ac2..49ea2ecdab 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 @@ -16,7 +16,7 @@
-

[% l('Create New List') %]

+

[% l('Create New List') %]

@@ -152,7 +150,7 @@ [% FOR bbag IN ctx.bookbags %]
@@ -78,12 +78,10 @@    
- [%- setting = 'opac.default_search_location'; -%] - + - + [%- lib_select_id = "expert_search_library"; -%] - - diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 index 2846ef7f85..ad37a884b9 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 @@ -52,13 +52,13 @@
+ type='text' size='18' name='query' value="[% q | html %]" [% IF loop.index == 0 %] autofocus [% END %] />
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 index 3fe91fe0a5..83b8ed65b1 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 @@ -31,7 +31,7 @@ %]
- diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 index a1d161c21f..99e8e350ef 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 @@ -8,7 +8,7 @@
[% l('Search Input') %]
-
+
+
[% baseurl = ctx.opac_root _ '/myopac/lists'; IF bbag.id != CGI.param("bbid"); @@ -271,14 +269,14 @@ [% IF bbag.items.size %]
-
[% END %] @@ -290,7 +288,7 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - + + [% END %] + + +
Edit List Description
Edit List Description
@@ -339,7 +337,7 @@ [% END %] [% END %] - +
@@ -513,6 +511,6 @@ [% END %] [% END %][% END %] - + [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 index 99ed0ea7fa..77a040ce94 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 @@ -72,9 +72,10 @@ [% END %] [% c = 0; %] [% FOR f IN ctx.fines.grocery %] - + [% c = c + 1; %] [% IF myopac_cc_allowed %] - - -
- + [% money(f.xact.balance_owed) %] + @@ -157,7 +158,7 @@
@@ -168,9 +169,10 @@ Amount Owed - + [% money(f.xact.balance_owed) %] + @@ -215,9 +217,6 @@ [% IF myopac_cc_allowed %] [% END %] -[% END %] - - \ No newline at end of file + +[% END %] + + diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 index f865e3b10e..72c82fffe4 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 @@ -28,7 +28,7 @@ [% IF ctx.payments.size %] + class='table table-hover miniTable paymentTable'> diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 index 9b0dbd8b98..5adcdf036b 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 @@ -1,6 +1,6 @@
- [% l("Messages") %]
+ [% l("Messages") %] limit, offset => (offset - limit)} ) %]' [% IF offset <= 0 %] class='invisible' [% END %]>◄[% l('Previous') %] @@ -51,39 +51,17 @@
-
- - - - - - - -
+ + + [% IF count < 1 %]
[% l('No messages found.') %]
[% ELSE %]
[% l('Payment Date') %] [% l('Payment For') %]
+ class="table table-hover miniTable messagesTable pref_table"> - @@ -95,9 +73,8 @@ [% FOR message IN ctx.patron_messages; %] - - + - + - + - + - + diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 index 849f836b63..8e3208ba1a 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 @@ -5,13 +5,12 @@

[% l('Account Preferences') %]

-
+
+
Message Number [% count; %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 index f79f0093e8..71c1d86c89 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 @@ -1,6 +1,6 @@
- [% l("Message") %]
+ [% l("Message") %]
@@ -26,23 +26,19 @@ class='light_border table'>
[% l("Date") %][% l("Date") %] [% date.format(ctx.parse_datetime(ctx.patron_messages.0.create_date), DATE_FORMAT); %]
[% l("Library") %][% l("Library") %] [% ctx.patron_messages.0.library | html %]
[% l("Subject") %][% l("Subject") %] [% ctx.patron_messages.0.title | html %]
[% l("Message") %][% l("Message") %] [% ctx.patron_messages.0.message | html %]
+
- [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %] - + + [% ELSE %] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] [% END %] @@ -149,7 +147,7 @@
[% l("Name") %][% l( + [% l( HUMAN_NAME_FORMAT, ctx.user.prefix, ctx.user.first_given_name, @@ -24,8 +23,7 @@
[% l("Preferred Name") %][% l("Preferred Name") %] [% l( HUMAN_NAME_FORMAT, @@ -132,7 +130,7 @@ [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] -

-
+

@@ -176,15 +174,16 @@ cur_id = addr.id; pending_addr = pending.$cur_id; %] -
- +
+
- + +
[% IF pending_addr OR edit_addr_id == cur_id; update_addr = pending_addr || addr %] - + [% IF pending_addr %] @@ -226,12 +225,9 @@
-
- [% ELSE %] -
+ [% ELSE %] +
+ @@ -247,12 +243,15 @@ [% END %]
[% l("Address Type") %][% addr.address_type | html %]
[% l('Edit Address') %]
- - [% END %] + +
+
[% END %] - - - + [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 index 853c65fdac..f7ca182c9e 100644 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 @@ -53,7 +53,7 @@
[%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/acjs.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/acjs.tt2 new file mode 100644 index 0000000000..fa76861e65 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/acjs.tt2 @@ -0,0 +1,76 @@ + + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 index bb88c53916..0b6583c6e2 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 @@ -11,7 +11,7 @@
[% l('X') %] @@ -40,11 +40,11 @@
[% l("Add Search Row") %][% l("Add Search Row") %]
+
+
[% l('X') %]
[% INCLUDE "opac/parts/advanced/global_row.tt2" %] @@ -44,7 +44,7 @@
[% FOR adv_chunk IN search.adv_config; NEXT IF adv_chunk.adv_hide || (adv_chunk.adv_special && adv_chunk.adv_special != 'copy_location'); %]
- -
+ diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 index 27172ae8f0..f906563371 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 @@ -28,7 +28,7 @@ [% IF ctx.user AND ctx.bookbags.size %] - [% FOR bbag IN ctx.bookbags %]] + [% FOR bbag IN ctx.bookbags %] [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 index e74310343b..e96402d3fd 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 @@ -13,12 +13,13 @@ - - + + [% IF ctx.get_i18n_l(ctx.eg_locale).rtl == 't' %] - + [% END %] [% IF ctx.get_org_setting(ctx.search_ou, 'opac.patron.custom_css') %] @@ -41,7 +42,7 @@ [%- ctx.metalinks.push(''); %] [% FOREACH meta IN ctx.metalinks; meta _ "\n"; END; -%] [% IF want_dojo %] - [% END %] @@ -54,10 +55,11 @@

[% l('Catalog') %]

[%#Each content page needs (at minimum) an

describing the content%] -
+ [% content %] -
+ [% IF ctx.page != "login" ;%] [% INCLUDE 'opac/parts/login/login_modal.tt2' %] + [% END;%]

[% l('Additional Resources') %]

[% INCLUDE 'opac/parts/footer.tt2' %] [% INCLUDE 'opac/parts/js.tt2' %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 index b14f7ee842..94f557f8e8 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 @@ -37,12 +37,12 @@ }, stop_parms)); %] - +
[% l('Temporary List') %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 index 32a1d625a0..10e2bba88f 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 @@ -1,4 +1,4 @@ -
- diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/chilifresh.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/chilifresh.tt2 new file mode 100644 index 0000000000..aa2e0d145e --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/chilifresh.tt2 @@ -0,0 +1,17 @@ +[%- IF ENV.OILS_CHILIFRESH_URL AND ENV.OILS_CHILIFRESH_ACCOUNT + AND (ctx.page == 'rresult' OR ctx.page == 'record'); + chili_url = ENV.OILS_CHILIFRESH_URL; + IF CGI.https AND ENV.OILS_CHILIFRESH_HTTPS_URL; + chili_url = ENV.OILS_CHILIFRESH_HTTPS_URL; + END; +%] + + + + + + + +[%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 index 60425095b8..2b5e3dd581 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 @@ -83,8 +83,8 @@ #Action buttons such as Place Hold and Add to List seen in record and results. Make all 4 the same color for no hover effect action_button = "#f8f9fa", action_button_hover = "#e2e6ea", - action_button_border = "#f8f9fa", - action_button_border_hover = "#dae0e5", + action_button_border = "#007a54", + action_button_border_hover = "#00593d", action_button_text = "#00593d", #Many action buttons use link coloring on the anchor tags. This setting will change the color to match your color schema if necessary #action_button_text_anchors = "", diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/avail.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/avail.tt2 new file mode 100644 index 0000000000..9df0465cc4 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/avail.tt2 @@ -0,0 +1,41 @@ +[%- +# Display holdings/availability info from ebook API +# +# We require the following info: +# - rec_id: internal ID for this record (rec.id in search results, ctx.bre_id in record summary) +# - ebook_id: external ID for title (ISBN for OneClickdigital, unique identifier for OverDrive) +# - vendor (oneclickdigital, overdrive) + +IF args.ebook; + + IF ctx.page == 'rresult'; + ebook.rec_id = rec.id; + ELSE; + ebook.rec_id = ctx.bre_id; + END; + + ebook.ebook_id = args.ebook.ebook_id; + ebook.vendor = args.ebook.vendor; + +# This div is hidden by default. The JS layer will unhide it, use the ebook_id +# to retrieve holdings/availability info via the appropriate vendor API, and +# overwrite the div's contents with that information. +-%] + + + + + + + + + + + + + + + +[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/base_js.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/base_js.tt2 new file mode 100644 index 0000000000..4cd2f6e3d4 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/base_js.tt2 @@ -0,0 +1,95 @@ +[% +# HTML display chunks +progress_icon = '' _ l(' +%] + + + + + +[%- IF ctx.user %] + + +[%- END %] + +[%- IF (ctx.page == 'rresult' OR ctx.page == 'record') %] + +[%- END %] + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/login_js.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/login_js.tt2 new file mode 100644 index 0000000000..7bb12bd724 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/ebook_api/login_js.tt2 @@ -0,0 +1,41 @@ + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 index 75c20f0d21..66b6645a67 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 @@ -8,32 +8,23 @@
-
- - - - - - - -
- - - -
- - +
+ +
+ + + [% IF ctx.timing %]
[% FOR event IN ctx.timing %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 new file mode 100644 index 0000000000..a25dd534c4 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 @@ -0,0 +1,176 @@ + + +[% INCLUDE "opac/i18n_strings.tt2" %] + +[% IF ctx.want_jquery || ctx.readonly %] + +[% END; # ctx.want_jquery %] + +[% IF ctx.readonly %] + +[% END %] + + + + +[%- IF ctx.use_stripe %] + +[% END -%] + +[%- IF ctx.is_staff %] + + [% IF ctx.page == 'record' %] + [% IF ctx.search_result_index >= 0 %] + + [% END %] + [% IF ctx.mfhd_summaries.size %] + + [% END %] + [% END %] +[%- END %] + +[%- IF ENV.OILS_NOVELIST_URL AND ctx.page == 'record'; + url = ENV.OILS_NOVELIST_URL; + IF CGI.https; url = url.replace('^http:', 'https:'); END; %] + +[%- END %] +[%- IF ctx.page == 'record' AND ctx.google_books_preview %] + +[%- END %] + + + + + +[% IF ctx.page == 'place_hold' %] + +[% END %] + +[%- IF want_dojo; -%] + + + + +[%- # So the following works in Mozilla and Chrome, but not in IE8. + # Seems like it /should/ work anywhere, though, and obviate the + # next three script tags: %] + + + + + + +[% IF use_autosuggest.enabled == "t" AND basic_search != "f"; %] + +[% END; # use_autosuggest %] + +[% INCLUDE "opac/parts/acjs.tt2" IF ctx.page == 'record' %] +[% IF ctx.page == 'advanced' %] + +[% END %] + +[% IF ebook_api.enabled == 'true' %] + [% INCLUDE "opac/parts/ebook_api/base_js.tt2" %] + [% INCLUDE "opac/parts/ebook_api/login_js.tt2" IF (ctx.page == 'login') %] +[% END %] + + + + + +[%- END; # want_dojo -%] + +[%- IF ctx.max_cart_size; %] + +[%- END; %] + + + + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 index 999c69b47a..90164b620a 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 @@ -1,7 +1,7 @@
-

[% l('Log in to Your Account') %]

+

[% l('Log in to Your Account') %]

[% INCLUDE "opac/parts/login/help.tt2" %]
[% IF ctx.login_failed_event %] @@ -40,7 +40,7 @@

- +
[% diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 index e8090bbc61..e59ad6cf21 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 @@ -25,16 +25,17 @@
[% END %] -
+

[% l('Request A Card') %]
- +
[% l('Use the full number.') %]
[% l('Example: 280800001234567') %]
+
[% ctx.page %]

@@ -44,7 +45,7 @@ [% l('Forgot Your Password?') %] [% END %]
- +
[% INCLUDE "opac/parts/login/password_hint.tt2" %]
@@ -75,11 +76,12 @@
- + +
- +
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 index b8b87723ca..2ff614e046 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 @@ -3,10 +3,6 @@ Draws the format multi-select and the language multi-select for limiting the set of desired records for a given metarecord. %] - - [% BLOCK metarecord_hold_filters_selector; # in edit mode, pull the target from the existing hold target_id = hold_data.hold.hold.target || hold_data.target.id; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 index 1a9e68341e..4ec2f5a423 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 @@ -825,7 +825,7 @@ END; IF carousels.size > 0; %] - +
[% FOREACH carousel IN carousels; IF carousel.bibs.size > 0; @@ -838,7 +838,7 @@ [% FOREACH bib IN carousel.bibs; %]
  • - [% l('Book cover') %] + [% l('Book cover') %]
    [% bib.title | html %]
    • diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 index d457ef3901..4d9627ff39 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 @@ -1,62 +1,89 @@ [% WRAPPER "opac/parts/base.tt2" %] -[% myopac_pages = [ - {url => "main", name => l("Account Summary")}, - {url => "messages", name => l("Messages")}, - {url => "circs", name => l("Items Checked Out")}, - {url => "holds", name => l("Holds")}, - {url => "prefs", name => l("Account Preferences")}, - {url => "lists", name => l("My Lists")} +[%myopac_pages = [ + {children => 0, parent => "parent",url => "main", name => l("Account Summary")}, + {children => 0, parent => "parent", url => "messages", name => l("Messages")}, + + {children => 3, parent => "parent",url => "circs", name => l("[_1] Items Checked Out", ctx.user_stats.checkouts.total_out)}, + {children => 0, parent => "circs", url => "circs", name => l("Current Items Checked Out")}, + {children => 0, parent => "circs", url => "ebook_circs", name => l("E-Items Currently Checked Out")}, + {children => 0, parent => "circs", url => "circ_history", name => l("Check Out History")}, + + {children => 4, parent => "parent",url => "holds", name => l("[_1] Holds", ctx.user_stats.holds.total)}, + {children => 0, parent => "holds", url => "holds", name => l("Items on Hold")}, + {children => 0, parent => "holds", url => "ebook_holds", name => l("E-Items on Hold")}, + {children => 0, parent => "holds", url => "ebook_holds_ready", name => l("E-Items Ready for Checkout")}, + {children => 0, parent => "holds", url => "hold_history", name => l("Holds History")}, + + {children => 4, parent => "parent", url => "prefs", name => l("Account Preferences")}, + {children => 0, parent => "prefs", url => "prefs", name => l("Personal Information")}, + {children => 0, parent => "prefs", url => "prefs_notify", name => l("Notifications")}, + {children => 0, parent => "prefs", url => "prefs_settings", name => l("Search & History")}, + {children => 0, parent => "prefs", url => "prefs_my_lists", name => l("List Prefs")}, + + + {children => 0, parent => "parent", url => "lists", name => l("My Lists")} ]; IF (ctx.show_reservations_tab == 'true'); myopac_pages.push({url => "reservations", name => l("Reservations")}); END; skin_root = "../" %] +

    [% l('My Account') %]

    [% INCLUDE "opac/parts/topnav.tt2" %]
    [% INCLUDE "opac/parts/searchbar.tt2" %]
    +
    - -
    -
    -
      +
      +
      +
      +
      [%- FOREACH page IN myopac_pages; IF page.url == myopac_page; - cls_which = "active"; + active = "active"; ctx.page_title = l("My Account - [_1]", page.name); ELSE; - cls_which = ""; - END -%]
    • - [% page.name; %]
      • + active = ""; + END -%] + [% IF page.parent == "parent" && page.children > 0; %] +
      + + +
      + [%- FOREACH child IN myopac_pages; -%] + [% IF child.parent == page.url; + IF child.url == myopac_page; + cactive = "active"; + ctx.page_title = l("My Account - [_1]", child.name); + ELSE; + cactive = ""; + END + %] + [% child.name; %] + [% END %] + [% END %] +
      + [% ELSIF page.parent == "parent"; %] + + [% page.name; %] + + [% END %] [% END %] - -
    - -
    -
    - -
    -
    +
    -
    +
    [% content %]
    +
    diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 index 97eb895e3d..59ef60979f 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 @@ -17,7 +17,7 @@
    - - - @@ -56,7 +56,7 @@ - diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 index 0ca9b643a3..20f326e4b2 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 @@ -1,28 +1,9 @@ [% PROCESS "opac/parts/header.tt2"; WRAPPER "opac/parts/myopac/base.tt2"; %] - [% acct_prefs_pages = [ - {url => "prefs", name => l("Personal Information")}, - {url => "prefs_notify", name => l("Notification Preferences")}, - {url => "prefs_settings", name => l("Search and History Preferences")}, - {url => "prefs_my_lists", name => l("My Lists Preferences")} - ]; - skin_root = "../" -%]
    -
    -
      - [%- FOREACH page IN acct_prefs_pages;-%] -
    • - [% page.name; %] -
      • - [% END %] -
    -
    - -

    - +
    [% l('Account Information and Preferences') %] @@ -48,7 +29,6 @@
    -
    [% content; %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 index 5db220ee84..24084274be 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 @@ -132,7 +132,7 @@ function maybeToggleNumCopies(obj) { [% END %] [% END %] -
    [% l("Account Expiration Date - ") %] + [% l("Account Expiration Date - ") %] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] @@ -31,7 +31,7 @@
    [% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %] @@ -44,7 +44,7 @@
    [% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]
    [% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]
    +
    [% END %] - +
    [% IF !this_hold_disallowed %] @@ -197,9 +197,9 @@ function maybeToggleNumCopies(obj) { [% IF !loop.last AND ctx.hold_data.size > 1 %]
    [% END %] - + [% IF some_holds_allowed %] @@ -211,7 +211,7 @@ function maybeToggleNumCopies(obj) { value=ctx.default_pickup_lib id=org_select_id can_have_vols_only=1 hold_pickup_lib=1 %]

    -

    + [% l('Notify when hold is ready for pickup?') %]

    [% l('Yes, by Email') %]
    [% IF !ctx.user.email and !ctx.is_staff; l('No configured Email address. See "My Account" for setting your Email address.'); - ELSE; l('Email Address:') %] [% ctx.user.email %][% END %] + ELSE; l('Email Address:') %] [% ctx.user.email %][% END %]
    [%- IF allow_phone_notifications == 'true' %] [% l('Enter date in MM/DD/YYYY format') %]
    -

    + [% IF CGI.param('from_basket') %] -
    [% l('Clear basket after holds are requested?') %]
    +
    [% l('Clear basket after holds are requested?') %]
    [% END %] [% IF NOT metarecords.disabled AND ctx.hold_data.size == 1 %] [% IF CGI.param('hold_type') == 'T' AND hdata.record.metarecord AND !hdata.part_required %] @@ -286,8 +286,7 @@ function maybeToggleNumCopies(obj) { END %]
    + value="[% l('Submit') %]" title="[% l('Submit') %]" class="btn btn-confirm" /> [% END # some_holds_allowed %]
    diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 index 2423aafbec..e589634eb0 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 @@ -3,19 +3,19 @@ cnoffset = cnoffset.match('^-?\d+$') ? cnoffset : 0; # verify cnoffset is a sane value %] -
    +

    [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]


    - +
    - + [% END -%] - [% IF loop.index % 3 == 2; tr_open = 0 %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 index 32360a7a3f..15b8a70bc5 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 @@ -1,5 +1,6 @@ - +

    [% l('Available copies') %]

    +
      [%- depths = ctx.copy_summary.size; depth = 0; @@ -49,4 +50,4 @@ [%- END %] [%- END %]
    - +
    diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 index 0dd373480f..38f1295d7b 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 @@ -30,7 +30,7 @@ IF has_copies or ctx.foreign_copies; depth = CGI.param('copy_depth').defined ? CGI.param('copy_depth') : CGI.param('depth').defined ? CGI.param('depth') : ctx.copy_summary.last.depth; total_copies = ctx.copy_summary.$depth.count; %] -
    [% l("<< Previous Page") %] [% l("Shelf Browser") %][% l("Shelf Browser") %] [% l("Next Page >>") %] @@ -31,27 +31,27 @@ IF loop.index % 3 == 0; tr_open = 1 %]
    +
    [% rec_attrs = {marc_xml => cn.record.marc}; PROCESS get_marc_attrs args=rec_attrs; %] -
    [% cn.label | html %]
    +
    [% cn.label | html %]
    - [% rec_attrs.title | html %]
    [% IF rec_attrs.author %]
    - [% rec_attrs.author | html %]
    [% END %] -
    [% cn.owning_lib.name | html %]
    +
    [% cn.owning_lib.name | html %]
    +
    [% IF serial_holdings -%] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 index a56864dfa9..bebc86526e 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 @@ -81,7 +81,7 @@ arrow = arrow_right; END; %] - +
    [% arrow %] [% extra.label | html %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 index 44ec36a857..45a43dc96b 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 @@ -348,18 +348,18 @@ ctx.metalinks.push(' && (ctx.holds_block.enabled != 'true' || !attrs.org_copy_counts.$search_ou.available) ) %] - +
    [%- END -%] [%- IF ebook_api.enabled == 'true' && args.ebook %] - - + [%- END -%] @@ -388,14 +388,14 @@ ctx.metalinks.push(' delhref = mkurl(ctx.opac_root _ '/mylist/delete', {record => ctx.bre_id}, stop_parms); label = (operation == "add") ? l("Add to Basket") : l("Remove from Basket"); %] - [% l("Add to basket") %] - @@ -404,7 +404,7 @@ ctx.metalinks.push(' [% IF ctx.mylist.size %] - - [% END %] -
    - [% IF !ctx.is_staff %] - [% IF ctx.user; - INCLUDE "opac/parts/bookbag_actions.tt2"; - END; - %] - [% END %]
    + [% END %] + + [% IF !ctx.is_staff %] + [% IF ctx.user; %] + [% INCLUDE "opac/parts/bookbag_actions.tt2"; %] + [% END; %] + [% END %] +
    [% l('Print / Email Actions Image') %] @@ -436,17 +435,17 @@ ctx.metalinks.push(' [%- INCLUDE 'opac/parts/record/refworks.tt2' %] [%- END %] [% IF !ctx.is_staff %] - +
    [% END %] [% IF !search.no_highlight %] - + [% END %] [%- IF ctx.is_staff %] - + [%- END %] @@ -477,7 +476,7 @@ ctx.metalinks.push('
    - +

    [% l('Holds') %]

    [% @@ -495,7 +494,7 @@ ctx.metalinks.push(' ctx.record_hold_count, ctx.copy_summary.$count_entry.count) %]

    -     +
    [%- @@ -577,5 +576,4 @@ ctx.metalinks.push('
    [%- INCLUDE "opac/parts/record/extras.tt2" %] -
    \ No newline at end of file diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 index d57426ab86..5e39a1e8c7 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 @@ -54,7 +54,7 @@ FOR facet IN sorted_facets; fid = facet.cmf.id; long_key = fclass _ fname %] -
    +
    [% facet.cmf.label %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 index 2f33490162..fd8d7b1579 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 @@ -24,7 +24,7 @@
    [% IF !ctx.is_meta %] @@ -83,18 +83,17 @@ END; -%]
    - + @@ -201,7 +200,7 @@ [% UNLESS rec.mmr_id %] [% IF attrs.publisher %] - + [% ELSIF attrs.producer %] - + [% ELSIF attrs.distributor %] - + [% ELSIF attrs.manufacturer %] - + [% END %] [% IF attrs.isbns.size > 0 %] - + [% END %] [%- IF attrs.issns.size > 0 %] - + @@ -250,7 +249,7 @@ NEXT IF issn == ''; res_urls = ResolverResolver.resolve_issn(issn, openurl.baseurl); FOREACH res IN res_urls; %] - + + [% END %] [% IF attrs.phys_desc %] - + [% END %] [% FOR uri IN args.uris %] - + @@ -298,8 +297,8 @@ END; END; %] - - +
    +
    -
    [% IF !ctx.is_meta; %] - - [% IF !ctx.is_meta; %] + + - + class="result_record_selector" value="[% rec.bre_id %]" /> [% END %]
    @@ -104,24 +103,34 @@
    [% l('Book cover') %]
    -
    +
    -
    +
    [% IF rec.mmr_id %] [% ELSE %] [% END %] - [% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title | html; END %] - + + [%- IF attrs.format_label; %] + [% FOR format IN attrs.all_formats %] + [% format.label | html %] + [% format.label | html %] + [% END %] + [%- END %] + + [%- UNLESS show_detail_view; IF attrs.pubdate; @@ -132,7 +141,7 @@ l(" ([_1])", copyright_clean); END; END -%] - + [% IF rec.mr_constituent_count.defined && rec.mr_constituent_count > 1 %] ([% rec.mr_constituent_count %]) [% END %] @@ -147,7 +156,7 @@ [% alt.value | html %]
    [%- END; END; -%] - +
    [% l('Call number:') %] [% args.holdings.0.label | html %]
    [% l('Publisher:') %] [% attrs.pubplace | html; %] [% attrs.publisher | html; %] [% attrs.pubdate | html; %] [%- FOR entry IN attrs.graphic_pubinfos; @@ -216,29 +215,29 @@
    [% l('Producer:') %] [% attrs.prodplace | html; %] [% attrs.producer | html; %] [% attrs.proddate | html; %]
    [% l('Distributor:') %] [% attrs.distplace | html; %] [% attrs.distributor | html; %] [% attrs.distdate | html; %]
    [% l('Manufacturer:') %] [% attrs.manplace | html; %] [% attrs.manufacturer | html; %] [% attrs.mandate | html; %]
    [% l('ISBN:') %] [% attrs.isbns.0 | html %]
    [% l('ISSN:') %]
    [% res.public_name | html %] [% res.target_coverage | html %] @@ -262,7 +261,7 @@ [% END %] [% IF attrs.edition %] -
    [% l('Edition:') %] [% attrs.edition | html %] [%- FOR entry IN attrs.graphic_editions; @@ -278,13 +277,13 @@
    [% l('Phys. Desc.:') %] [% args.phys_desc | html %]
    [% l('Electronic resource') %] [% uri.link | html %][% ' - ' _ uri.note | html IF uri.note %]
    +
    @@ -355,7 +354,7 @@ -
    +
    [%- search_ou = ctx.search_ou; @@ -375,19 +374,19 @@ - +
    [%- END -%] [%- IF ebook_api.enabled == 'true' && args.ebook %] - -
    +
    [% l('Place Hold on E-Item') %] - +
    [%- END -%] @@ -416,7 +415,7 @@ delhref = mkurl(ctx.opac_root _ '/mylist/delete', {record => rec.id, anchor => 'record_' _ rec.id}, 1); %] - +
    [% IF ctx.user; INCLUDE "opac/parts/bookbag_actions.tt2"; END; @@ -443,7 +442,7 @@ [% IF ENV.OILS_CONTENT_CAFE_USER %] [% ident = attrs.isbn_clean || attrs.upc %] - +
    [% END %] + - [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index 081e2a1291..5c108e8f1f 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -57,7 +57,7 @@ END; store_args='{"org_unit_getter": function() { return [% ctx.search_ou %]; }}' [%- END # opac_visible -%] [%- ELSE -%] - [% IF basic_search != "f" AND is_home_page%] autofocus [% END %] x-webkit-speech + [% IF basic_search != "f" AND is_home_page%] autofocus [% END %] [%- END # autosuggest enabled %] /> @@ -115,12 +115,12 @@ END; onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"; $("search-submit-go-depth").className="hidden";}, 2000)' title="[% ctx.depth_sel_tooltip | html %]">[% ctx.depth_sel_button_label | html %] [%- END %] - + - + diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 index 9edbf3ff8b..4a667d0cad 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 @@ -10,9 +10,8 @@
    [% INCLUDE "opac/parts/topnav_links.tt2" %] - +
    [% END %] - -[% IF ctx.is_staff %] -[% INCLUDE "opac/parts/topnav_subnav.tt2" %] -[% END %] \ No newline at end of file +
    + [% INCLUDE "opac/parts/topnav_subnav.tt2" %] +
    diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 index b282005f91..86be756f63 100644 --- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 @@ -9,7 +9,6 @@
    - - - -
    - [% IF ctx.user %]
    @@ -121,12 +118,11 @@
    - [% END %] -
    - - - - [% INCLUDE "opac/parts/topnav_subnav.tt2" %] + [% END %] + + + +