From da1a8b4192b1a918facb2ac9e44ae4e70d8ec337 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 23 Dec 2014 11:38:36 -0500 Subject: [PATCH] OPAC UI modifications as per OPAC Working Group suggestions. Signed-off-by: Terran McCanna Conflicts: Open-ILS/src/templates/opac/myopac/circs.tt2 Open-ILS/src/templates/opac/myopac/holds.tt2 Open-ILS/src/templates/opac/myopac/prefs.tt2 Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 Open-ILS/src/templates/opac/parts/advanced/search.tt2 Open-ILS/src/templates/opac/parts/footer.tt2 Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 Open-ILS/src/templates/opac/parts/place_hold.tt2 Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 Open-ILS/src/templates/opac/parts/record/extras.tt2 Open-ILS/src/templates/opac/parts/record/navigation.tt2 Open-ILS/src/templates/opac/parts/record/summary.tt2 Open-ILS/src/templates/opac/parts/result/table.tt2 Open-ILS/src/templates/opac/parts/topnav.tt2 Open-ILS/src/templates/opac/register.tt2 Open-ILS/src/templates/opac/results.tt2 --- .../src/templates/actor/user/register_table.tt2 | 5 +- Open-ILS/src/templates/opac/advanced.tt2 | 5 +- Open-ILS/src/templates/opac/browse.tt2 | 7 +- Open-ILS/src/templates/opac/css/style.css.tt2 | 166 ++++++++++++------ Open-ILS/src/templates/opac/login.tt2 | 8 +- Open-ILS/src/templates/opac/myopac/circs.tt2 | 32 ++-- Open-ILS/src/templates/opac/myopac/holds.tt2 | 193 +++++++++++++-------- Open-ILS/src/templates/opac/myopac/lists.tt2 | 144 ++++++++------- Open-ILS/src/templates/opac/myopac/prefs.tt2 | 46 ++--- .../src/templates/opac/myopac/prefs_my_lists.tt2 | 21 ++- .../src/templates/opac/myopac/prefs_notify.tt2 | 20 ++- .../src/templates/opac/myopac/prefs_settings.tt2 | 16 +- .../src/templates/opac/myopac/update_email.tt2 | 4 +- .../src/templates/opac/myopac/update_password.tt2 | 6 +- .../src/templates/opac/myopac/update_username.tt2 | 4 +- .../src/templates/opac/parts/advanced/expert.tt2 | 4 +- .../src/templates/opac/parts/advanced/numeric.tt2 | 8 +- .../src/templates/opac/parts/advanced/search.tt2 | 86 +++++---- .../templates/opac/parts/coded_value_selector.tt2 | 2 +- Open-ILS/src/templates/opac/parts/footer.tt2 | 24 +-- .../templates/opac/parts/hold_error_messages.tt2 | 34 ++-- Open-ILS/src/templates/opac/parts/hold_status.tt2 | 11 +- Open-ILS/src/templates/opac/parts/homesearch.tt2 | 21 ++- Open-ILS/src/templates/opac/parts/login/form.tt2 | 25 +-- Open-ILS/src/templates/opac/parts/login/help.tt2 | 14 +- .../templates/opac/parts/login/password_hint.tt2 | 2 +- .../src/templates/opac/parts/myopac/main_base.tt2 | 18 +- .../src/templates/opac/parts/myopac/prefs_base.tt2 | 10 +- .../templates/opac/parts/myopac/prefs_hints.tt2 | 2 + Open-ILS/src/templates/opac/parts/org_selector.tt2 | 7 +- Open-ILS/src/templates/opac/parts/place_hold.tt2 | 22 ++- .../src/templates/opac/parts/place_hold_result.tt2 | 19 +- .../src/templates/opac/parts/pref_lib_display.tt2 | 2 +- .../src/templates/opac/parts/qtype_selector.tt2 | 2 +- .../src/templates/opac/parts/record/cnbrowse.tt2 | 11 +- .../src/templates/opac/parts/record/contents.tt2 | 74 ++++---- .../templates/opac/parts/record/copy_counts.tt2 | 4 +- .../src/templates/opac/parts/record/copy_table.tt2 | 4 +- .../src/templates/opac/parts/record/extras.tt2 | 15 +- .../src/templates/opac/parts/record/navigation.tt2 | 7 +- .../src/templates/opac/parts/record/series.tt2 | 2 +- .../src/templates/opac/parts/record/subjects.tt2 | 2 +- .../src/templates/opac/parts/record/summary.tt2 | 42 ++++- .../templates/opac/parts/result/copy_counts.tt2 | 4 +- .../src/templates/opac/parts/result/facets.tt2 | 5 + .../src/templates/opac/parts/result/paginate.tt2 | 6 +- Open-ILS/src/templates/opac/parts/result/table.tt2 | 20 ++- Open-ILS/src/templates/opac/parts/searchbar.tt2 | 17 +- .../templates/opac/parts/sms_carrier_selector.tt2 | 4 +- .../templates/opac/parts/sms_number_textbox.tt2 | 4 +- Open-ILS/src/templates/opac/parts/topnav.tt2 | 9 +- Open-ILS/src/templates/opac/parts/topnav_logo.tt2 | 2 +- Open-ILS/src/templates/opac/password_reset.tt2 | 11 +- Open-ILS/src/templates/opac/password_reset_msg.tt2 | 5 +- Open-ILS/src/templates/opac/register.tt2 | 16 +- Open-ILS/src/templates/opac/results.tt2 | 16 +- Open-ILS/web/images/home-largehelp.png | Bin 0 -> 12100 bytes Open-ILS/web/images/login-person.png | Bin 0 -> 1121 bytes Open-ILS/web/images/logout-x.png | Bin 0 -> 1319 bytes Open-ILS/web/images/navbar-about.png | Bin 0 -> 2228 bytes Open-ILS/web/images/navbar-card.png | Bin 0 -> 3998 bytes Open-ILS/web/images/navbar-findalibrary.png | Bin 0 -> 1511 bytes Open-ILS/web/images/navbar-galileo.png | Bin 0 -> 2612 bytes Open-ILS/web/images/navbar-help.png | Bin 0 -> 1373 bytes Open-ILS/web/images/navbar-home.png | Bin 0 -> 1317 bytes Open-ILS/web/images/navbar-kids.png | Bin 0 -> 4487 bytes Open-ILS/web/images/pines-map.gif | Bin 0 -> 94923 bytes Open-ILS/web/js/dojo/openils/actor/nls/register.js | 4 +- Open-ILS/web/js/ui/default/actor/user/register.js | 31 +++- 69 files changed, 801 insertions(+), 504 deletions(-) create mode 100644 Open-ILS/web/images/home-largehelp.png create mode 100644 Open-ILS/web/images/login-person.png create mode 100644 Open-ILS/web/images/logout-x.png create mode 100644 Open-ILS/web/images/navbar-about.png create mode 100644 Open-ILS/web/images/navbar-card.png create mode 100644 Open-ILS/web/images/navbar-findalibrary.png create mode 100644 Open-ILS/web/images/navbar-galileo.png create mode 100644 Open-ILS/web/images/navbar-help.png create mode 100644 Open-ILS/web/images/navbar-home.png create mode 100644 Open-ILS/web/images/navbar-kids.png create mode 100644 Open-ILS/web/images/pines-map.gif diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2 index d3f19a05b1..ba670c2983 100644 --- a/Open-ILS/src/templates/actor/user/register_table.tt2 +++ b/Open-ILS/src/templates/actor/user/register_table.tt2 @@ -34,7 +34,10 @@ - + + diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2 index 8efb9f2eed..e0d3b5cc83 100644 --- a/Open-ILS/src/templates/opac/advanced.tt2 +++ b/Open-ILS/src/templates/opac/advanced.tt2 @@ -10,10 +10,9 @@

[% l('Advanced Search') %]

@@ -27,7 +26,7 @@ id="num_search">[% l('Numeric Search') %] [% l('Expert Search') %] + id="expert_search">[% l('MARC Record Search') %]
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2 index c6a4dc8e6c..2ae04304a3 100644 --- a/Open-ILS/src/templates/opac/browse.tt2 +++ b/Open-ILS/src/templates/opac/browse.tt2 @@ -7,7 +7,7 @@ INCLUDE "opac/parts/topnav.tt2"; ctx.page_title = l("Browse the Catalog"); - blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 10; + blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 20; depart_list = ['blimit', 'bterm', 'bpivot']; ctx.metalinks.push(''); @@ -29,6 +29,11 @@