From 6bd2b23edb7704c9ae0476eeb2f0b75bd6c70cc9 Mon Sep 17 00:00:00 2001 From: Chris Burton Date: Mon, 7 Sep 2020 21:47:53 -0400 Subject: [PATCH] LP1778972_OPAC_Redesign Numerous Updates Based on Feedback for usabilty and wider acceptance Signed-off-by: Galen Charlton --- Open-ILS/src/templates-bootstrap/opac/ReadMe.txt | 20 + Open-ILS/src/templates-bootstrap/opac/advanced.tt2 | 10 - Open-ILS/src/templates-bootstrap/opac/browse.tt2 | 6 +- .../opac/css/mediaQuery.css.tt2 | 749 +++++++++++++++++++++ .../src/templates-bootstrap/opac/css/style.css.tt2 | 110 ++- .../src/templates-bootstrap/opac/i18n_strings.tt2 | 23 + Open-ILS/src/templates-bootstrap/opac/mylist.tt2 | 1 + .../src/templates-bootstrap/opac/mylist/clear.tt2 | 22 +- .../src/templates-bootstrap/opac/mylist/email.tt2 | 45 +- .../src/templates-bootstrap/opac/mylist/print.tt2 | 45 +- .../templates-bootstrap/opac/myopac/charges.tt2 | 46 +- .../opac/myopac/circ_history.tt2 | 11 +- .../src/templates-bootstrap/opac/myopac/circs.tt2 | 14 +- .../opac/myopac/ebook_place_hold.tt2 | 7 +- .../opac/myopac/hold_history.tt2 | 23 +- .../src/templates-bootstrap/opac/myopac/holds.tt2 | 32 +- .../templates-bootstrap/opac/myopac/holds/edit.tt2 | 81 +-- .../opac/myopac/list/update.tt2 | 55 +- .../src/templates-bootstrap/opac/myopac/lists.tt2 | 31 +- .../src/templates-bootstrap/opac/myopac/main.tt2 | 61 +- .../opac/myopac/main_payments.tt2 | 11 +- .../opac/myopac/messages/list.tt2 | 54 +- .../opac/myopac/messages/single_message.tt2 | 44 +- .../src/templates-bootstrap/opac/myopac/prefs.tt2 | 27 +- .../opac/myopac/prefs_my_lists.tt2 | 7 +- .../opac/myopac/prefs_notify.tt2 | 4 +- .../opac/myopac/prefs_settings.tt2 | 6 +- .../opac/myopac/update_email.tt2 | 2 +- .../opac/myopac/update_password.tt2 | 2 +- .../opac/myopac/update_username.tt2 | 2 +- .../opac/parts/advanced/expert.tt2 | 26 +- .../opac/parts/advanced/global_row.tt2 | 10 +- .../opac/parts/advanced/numeric.tt2 | 20 +- .../opac/parts/advanced/search.tt2 | 228 +++---- .../templates-bootstrap/opac/parts/anon_list.tt2 | 9 +- .../src/templates-bootstrap/opac/parts/base.tt2 | 19 +- .../templates-bootstrap/opac/parts/cart_nav.tt2 | 14 +- .../opac/parts/check_value_selector.tt2 | 64 ++ .../templates-bootstrap/opac/parts/css/colors.tt2 | 16 +- .../src/templates-bootstrap/opac/parts/footer.tt2 | 8 +- Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 | 23 +- .../opac/parts/library/core_info.tt2 | 22 +- .../opac/parts/library/hours.tt2 | 4 +- .../opac/parts/locale_picker.tt2 | 2 +- .../templates-bootstrap/opac/parts/login/form.tt2 | 38 +- .../opac/parts/login/login_modal.tt2 | 14 +- .../templates-bootstrap/opac/parts/misc_util.tt2 | 27 +- .../templates-bootstrap/opac/parts/myopac/base.tt2 | 87 +-- .../templates-bootstrap/opac/parts/place_hold.tt2 | 2 +- .../opac/parts/place_hold_result.tt2 | 4 +- .../opac/parts/qtype_selector.tt2 | 3 +- .../opac/parts/record/cnbrowse.tt2 | 15 +- .../opac/parts/record/extras.tt2 | 2 +- .../opac/parts/record/navigation.tt2 | 4 +- .../opac/parts/record/summary.tt2 | 8 +- .../opac/parts/result/lowhits.tt2 | 5 +- .../opac/parts/result/table.tt2 | 53 +- .../opac/parts/staff_saved_searches.tt2 | 4 +- .../opac/parts/topnav_links.tt2 | 21 +- Open-ILS/src/templates-bootstrap/opac/register.tt2 | 31 +- Open-ILS/src/templates-bootstrap/opac/results.tt2 | 4 +- Open-ILS/web/js/ui/default/opac/copyloc.js | 42 ++ Open-ILS/web/js/ui/default/opac/simple.js | 26 +- 63 files changed, 1683 insertions(+), 723 deletions(-) create mode 100644 Open-ILS/src/templates-bootstrap/opac/ReadMe.txt create mode 100644 Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/i18n_strings.tt2 create mode 100644 Open-ILS/src/templates-bootstrap/opac/parts/check_value_selector.tt2 diff --git a/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt b/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt new file mode 100644 index 0000000000..5fd954adf0 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/ReadMe.txt @@ -0,0 +1,20 @@ +/////////////////////DATEPICKER/////////////////////////////////////////// +
+ +
+ +
+
+ +/////////////////////TOOLTIPS/////////////////////////////////////////// + + + + + + + diff --git a/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 b/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 index 1ca21f6f59..30d27ab1ea 100755 --- a/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 @@ -10,16 +10,6 @@ [% l('Advanced Search') %]
- [% IF pane == 'advanced' %] -

Advanced Search

-

Refine your search by filling out one or more fields to search by below.

- [% ELSIF pane == 'numeric' %] -

Numeric Search

-

Search by a field and numeric identifier.

- [% ELSIF pane == 'expert' %] -

Expert Search

-

Search the MARC record.

- [% END %]
  • diff --git a/Open-ILS/src/templates-bootstrap/opac/browse.tt2 b/Open-ILS/src/templates-bootstrap/opac/browse.tt2 index 4ffbd1617e..dfc3ea929f 100755 --- 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) %] - +
    [% IF ctx.back_pivot %] - ← [%l ('Back') %] + ← [%l ('Back') %] [% END %] [% IF ctx.pager_shortcuts; current_qtype = CGI.param('qtype') || 'title' %] @@ -77,7 +77,7 @@ class="hidden" style="width: 16px; height: 16px;" alt="[% l('Search in progress icon') %]" /> [% IF ctx.forward_pivot %] - [%l ('Next') %] → + [%l ('Next') %] → [% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 new file mode 100644 index 0000000000..e7fc9092ef --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 @@ -0,0 +1,749 @@ +/* +Mini Table Styling +*/ +@media +only screen and (max-width: 650px) { + .miniTable{ + width: 100% !important; + } + + /* Force table to not be like tables anymore */ + .miniTable table, .miniTable thead, .miniTable tbody, .miniTable th, .miniTable td, .miniTable tr + { + display: block; + } + + .miniTable th{ + display:none; + } + + /* Hide table headers (but not display: none;, for accessibility) */ + .miniTable thead tr{ + position: absolute; + top: -9999px; + left: -9999px; + } + + .miniTable tr + { + border: 1px solid #ccc; + margin: 10px 0px; + } + + + .miniTable td + { + border: none; + border-bottom: 1px solid #eee; + position: relative; + padding-left: 50%; + min-height:45px; + text-align: right; + } + + .miniTable td:before + { + left: 6px; + width: 45%; + padding-right: 10px; + white-space: nowrap; + position: absolute; + } + .copyTable tr:nth-of-type(1):before { content: "Copy #1"; display: block; text-align:center; } + .copyTable tr:nth-of-type(2):before { content: "Copy #2"; display: block; text-align:center;} + .copyTable tr:nth-of-type(3):before { content: "Copy #3"; display: block; text-align:center;} + .copyTable tr:nth-of-type(4):before { content: "Copy #4"; display: block; text-align:center;} + .copyTable tr:nth-of-type(5):before { content: "Copy #5"; display: block; text-align:center;} + .copyTable tr:nth-of-type(6):before { content: "Copy #6"; display: block; text-align:center;} + .copyTable tr:nth-of-type(7):before { content: "Copy #7"; display: block; text-align:center;} + .copyTable tr:nth-of-type(8):before { content: "Copy #8"; display: block; text-align:center;} + .copyTable tr:nth-of-type(9):before { content: "Copy #9"; display: block; text-align:center;} + .copyTable tr:nth-of-type(10):before { content: "Copy #10"; display: block; text-align:center;} + + .copyTable td:nth-of-type(1):before { content: "Library"; display: flex; } + .copyTable td:nth-of-type(2):before { content: "Call Number"; display: flex; } + .copyTable td:nth-of-type(3):before { content: "Barcode"; display: flex;} + .copyTable td:nth-of-type(4):before { content: "Shelving Location"; display: flex;} + .copyTable td:nth-of-type(5):before { content: "Status"; display: flex;} + .copyTable td:nth-of-type(6):before { content: "Due Date"; display: flex;} + + .holdingsTable tr:nth-of-type(1):before { content: "Copy #1"; display: block; text-align:center; } + .holdingsTable tr:nth-of-type(2):before { content: "Copy #2"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(3):before { content: "Copy #3"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(4):before { content: "Copy #4"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(5):before { content: "Copy #5"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(6):before { content: "Copy #6"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(7):before { content: "Copy #7"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(8):before { content: "Copy #8"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(9):before { content: "Copy #9"; display: block; text-align:center;} + .holdingsTable tr:nth-of-type(10):before { content: "Copy #10"; display: block; text-align:center;} + + + .holdingsTable td:nth-of-type(1):before { content: "Library"; display: flex; } + .holdingsTable td:nth-of-type(2):before { content: "Shelving location"; display: flex; } + .holdingsTable td:nth-of-type(3):before { content: "Call number"; display: flex;} + .holdingsTable td:nth-of-type(4):before { content: "Status"; display: flex;} + + .chargesTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .chargesTable td:nth-of-type(2):before { content: "Owed"; display: flex; } + .chargesTable td:nth-of-type(3):before { content: "Billing Type"; display: flex;} + .chargesTable td:nth-of-type(4):before { content: "Note"; display: flex;} + .chargesTable td:nth-of-type(5):before { content: "Date"; display: flex;} + + .chargesMainTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .chargesMainTable td:nth-of-type(2):before { content: "Owed"; display: flex; } + .chargesMainTable td:nth-of-type(3):before { content: "Billing Type"; display: flex;} + .chargesMainTable td:nth-of-type(4):before { content: "Title"; display: flex;} + .chargesMainTable td:nth-of-type(5):before { content: "Checkout"; display: flex;} + .chargesMainTable td:nth-of-type(6):before { content: "Due"; display: flex;} + .chargesMainTable td:nth-of-type(7):before { content: "Returned/Renewed"; display: flex;} + + .activeHoldstable td:nth-of-type(1):before { content: "Select"; display: flex; } + .activeHoldstable td:nth-of-type(2):before { content: "Title"; display: flex; } + .activeHoldstable td:nth-of-type(3):before { content: "Author"; display: flex;} + .activeHoldstable td:nth-of-type(4):before { content: "Format"; display: flex;} + .activeHoldstable td:nth-of-type(5):before { content: "Pickup Location"; display: flex;} + .activeHoldstable td:nth-of-type(6):before { content: "Cancel If Not Filled By"; display: flex;} + .activeHoldstable td:nth-of-type(7):before { content: "Status"; display: flex;} + .activeHoldstable td:nth-of-type(8):before { content: "Notes"; display: flex;} + + .holdHistoryTable td:nth-of-type(1):before { content: "Title"; display: flex; } + .holdHistoryTable td:nth-of-type(2):before { content: "Author"; display: flex; } + .holdHistoryTable td:nth-of-type(3):before { content: "Format"; display: flex; } + .holdHistoryTable td:nth-of-type(4):before { content: "Pickup Location"; display: flex; } + .holdHistoryTable td:nth-of-type(5):before { content: "Status"; display: flex; } + + .paymentTable td:nth-of-type(1):before { content: "Payment Date"; display: flex; } + .paymentTable td:nth-of-type(2):before { content: "Payment For"; display: flex; } + .paymentTable td:nth-of-type(3):before { content: "Amount"; display: flex; } + .paymentTable td:nth-of-type(4):before { content: "Receipt"; display: flex; } + + .messagesTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .messagesTable td:nth-of-type(2):before { content: "Date"; display: flex; } + .messagesTable td:nth-of-type(3):before { content: "Library"; display: flex; } + .messagesTable td:nth-of-type(4):before { content: "Subject"; display: flex; } + .messagesTable td:nth-of-type(5):before { content: ""; display: flex; } + + .circTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .circTable td:nth-of-type(2):before { content: "Title"; display: flex; } + .circTable td:nth-of-type(3):before { content: "Author"; display: flex; } + .circTable td:nth-of-type(4):before { content: "Renewals Left"; display: flex; } + .circTable td:nth-of-type(5):before { content: "Due Date"; display: flex; } + .circTable td:nth-of-type(6):before { content: "Barcode"; display: flex; } + .circTable td:nth-of-type(7):before { content: "Call Number"; display: flex; } + + .circHistTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .circHistTable td:nth-of-type(2):before { content: "Title"; display: flex; } + .circHistTable td:nth-of-type(3):before { content: "Author"; display: flex; } + .circHistTable td:nth-of-type(4):before { content: "Checkout Date"; display: flex; } + .circHistTable td:nth-of-type(5):before { content: "Due Date"; display: flex; } + .circHistTable td:nth-of-type(6):before { content: "Date Returned"; display: flex; } + .circHistTable td:nth-of-type(7):before { content: "Barcode"; display: flex; } + .circHistTable td:nth-of-type(8):before { content: "Call Number"; display: flex; } + + .bookbagTable td:nth-of-type(1):before { content: ""; display: flex; } + .bookbagTable td:nth-of-type(2):before { content: "Title"; display: flex; } + .bookbagTable td:nth-of-type(3):before { content: "Author(s)"; display: flex; } + .bookbagTable td:nth-of-type(4):before { content: "Local Call number"; display: flex; } + .bookbagTable td:nth-of-type(5):before { content: "Publication Date"; display: flex; } + .bookbagTable td:nth-of-type(6):before { content: "Format"; display: flex; } + .bookbagTable td:nth-of-type(7):before { content: "Notes"; display: flex; } + + .eholdsTable td:nth-of-type(1):before { content: "Title"; display: flex; } + .eholdsTable td:nth-of-type(2):before { content: "Author"; display: flex; } + .eholdsTable td:nth-of-type(3):before { content: "Expire Date"; display: flex; } + .eholdsTable td:nth-of-type(4):before { content: "Status"; display: flex; } + .eholdsTable td:nth-of-type(5):before { content: "Actions"; display: flex; } + + .eholdsreadyTable td:nth-of-type(1):before { content: "Title"; display: flex; } + .eholdsreadyTable td:nth-of-type(2):before { content: "Author"; display: flex; } + .eholdsreadyTable td:nth-of-type(3):before { content: "Expire Date"; display: flex; } + .eholdsreadyTable td:nth-of-type(4):before { content: "Actions"; display: flex; } + + .echeckoutTable td:nth-of-type(1):before { content: "Title"; display: flex; } + .echeckoutTable td:nth-of-type(2):before { content: "Author"; display: flex; } + .echeckoutTable td:nth-of-type(3):before { content: "Due Date"; display: flex; } + .echeckoutTable td:nth-of-type(4):before { content: "Actions"; display: flex; } + + .ecircsTable td:nth-of-type(1):before { content: "Title"; display: flex; } + .ecircsTable td:nth-of-type(2):before { content: "Author"; display: flex; } + .ecircsTable td:nth-of-type(3):before { content: "Due Date"; display: flex; } + .ecircsTable td:nth-of-type(4):before { content: "Actions"; display: flex; } + + .bucketTable td:nth-of-type(2):before { content: "Title"; display: flex; text-align:left; } + .bucketTable td:nth-of-type(3):before { content: "Author"; display: flex; text-align:left; } + .bucketTable td:nth-of-type(4):before { content: "Call Number"; display: flex; text-align:left; } + + /*Media Style Additions*/ + .fullRow{ + padding: 5px !important; + text-align: center !important; + width: 100%; + } + + .paginateText{ + display:none; + } + + .modal-dialog { + max-width: 600px !important; + } + +}/*Micro Tables End*/ + +@media only screen and (max-width: 600px) { + input, select { + font-size: [% css_fonts.size_big %]; + } + span .nav_arrow_fix { + display: none; + } + #header { + padding: 0px; + margin: 0px; + } + #homesearch_main_logo img { + width:75%; + } + #format_selector { + display:none; + } + #your-acct-login { + padding: 0px; + padding-top: 5px; + } + #your-acct-login a { + margin: 0px; + padding: 5px; + } + #topnav_logo { + margin: 0; + } + #topnav_logo img { + width: 200px; + } + + #gold-links-holder { + display: none; + } + #simple-detail-view-links { + display: none; + } + #acct_tabs a, #acct_fines_tabs a { + [% IF rtl == 't' -%] + border-radius: 6px 0px 0px 6px; + margin: 0px 0px 0px 5px; + [% ELSE -%] + border-radius: 6px 6px 0px 0px; + margin: 0px 5px 0px 0px; + [% END -%] + padding: 2px 4px 3px 4px; + font-size: [% css_fonts.size_base %]; + } + .bookbag-controls-title-block { + [% IF rtl == 't' -%] + clear:right; + [% ELSE -%] + clear:left; + [% END -%] + width:90%; + } + .bookbag-controls-button-block { + [% IF rtl == 't' -%] + clear:right; + [% ELSE -%] + clear:left; + [% END -%] + width;90%; + } + .bookbag-specific { + [% IF rtl == 't' -%] + margin-right: 0px; + [% ELSE -%] + margin-left: 0px; + [% END -%] + } + .bookbag-specific div.sort { + [% IF rtl == 't' -%] + float: right; + text-align: right; + [% ELSE -%] + float: left; + text-align: left; + [% END -%] + width: 95%; + margin: 5px 0px 5px 0px; + border: 1px solid [% css_colors.accent_light %]; + padding:5px; + } + .bookbag-specific div.meta { + [% IF rtl == 't' -%] + float: right; + margin-right:0px; + text-align: right; + [% ELSE -%] + float: left; + margin-left:0px; + text-align: left; + [% END -%] + width: 95%; + margin-bottom:5px; + padding:5px; + } + #bbag-edit-name { + [% IF rtl == 't' -%] + float: right; + [% ELSE -%] + float: left; + [% END -%] + width: 220px; + } + #bbag-edit-description { + width: 220px; + margin-top:5px; + } + .bbag-content { + padding:5px; + border:1px solid [% css_colors.accent_light %]; + } + .bbag-action { + [% IF rtl == 't' -%] + margin-right:0px; + [% ELSE -%] + margin-left:0px; + [% END -%] + margin-bottom:5px; + } + .bbag-action-field { + width:230px; + } + .bookbag-specific div.sort select { + width:180px; + } + .bookbag-specific tr { + display: block; + border-bottom: 1px solid [% css_colors.border_standard %]; + } + .bookbag-specific td.list_checkbox { + [% IF rtl == 't' -%] + padding-right: 0px !important; + [% ELSE -%] + padding-left: 0px !important; + [% END -%] + } + .bookbag-specific td.list_entry { + display: inline-block; + min-width: 5em; + [% IF rtl == 't' -%] + padding-right: 40% !important; + [% ELSE -%] + padding-left: 40% !important; + [% END -%] + } + .bookbag-specific td.list_entry:before { + content: attr(data-label); + position: absolute; + [% IF rtl == 't' -%] + right: 10px; + [% ELSE -%] + left: 10px; + [% END -%] + } + .bbag-navigate-list { + display: none; + } + .bbag-navigate-list-pages { + [% IF rtl == 't' -%] + text-align:left; + float:left; + [% ELSE -%] + text-align:right; + float:right; + [% END -%] + } + #dash_wrapper div { + background-color: transparent; + padding: 0px; + } + #dash_wrapper { + position: static; + top: auto; + } + #dash_wrapper .opac-button { + top: 0px; + } + .small_view_only, #filter_hits { + display: inline !important; + } + #dash_identity a { + [% IF rtl == 't' -%] + float:right; + [% ELSE -%] + float:left; + [% END -%] + } + + #holds_box form blockquote { + [% IF rtl == 't' -%] + margin-right: 10px; + margin-left: 2px; + [% ELSE -%] + margin-left: 10px; + margin-right: 2px; + [% END -%] + } + #holds_box form blockquote select { + width: 100%; + } + #myopac_sum_fines_placehold { + display:none; + } + #myopac_sum_fines { + display: none; + } + #list_description, #list_create_name { + width: 170px; + } + .results_header_lbl { + display: none; + } + .results_header_nav1 span.h1 { + display: none; + } + .preflib { + display: none; + } + .start_end_links_span { + display: block; + } + .invisible { + display: none; + } + .result_table_pic_header { + [% IF rtl == 't' -%] + padding-right: 0px !important; + padding-left: 5px; + [% ELSE -%] + padding-left: 0px !important; + padding-right: 5px; + [% END -%] + width: 0px !important; + margin: 0px; + } + .result_table_pic { + width: 55px; + padding: 0px; + margin: 0px; + } + tr[name=results_isbn_tr], tr[name=results_phys_desc_tr], tr[name=results_pub_tr] strong, .result_count { + display: none; + } + tr.result_table_title_cell[name=bib_cn_list] .result_holdings_table th:nth-child(4), + tr.result_table_title_cell[name=bib_cn_list] .result_holdings_table td:nth-child(4) { + display:none; + } + #results_header_bar { + background-color: inherit; + } + .results_header_btns a { + margin: 0.3em; + } + .adv_filter_results_hide { + display: none; + } + .adv_filter_results_show { + display: block; + } + .adv_filter_results_block_label { + display: block; + } + .adv_filter_results_group_wrapper { + display: block; + } + #main-content { + margin: 0 1px; + } + #rdetails_status thead { + display: none; + } + #rdetails_status tr { + display: block; + margin-top: 3px; + } + #rdetails_status td { + display: block; + padding: 1px; + } + .copy_details_row { + background-color: [% css_colors.accent_lightest %]; + } + .copy_details_offers_row { + background-color: [% css_colors.accent_lightest %]; + } + select#pickup_lib.search-wrapper-locg { + width: 100%; + } + #search-wrapper #search-box { + width: 85%; + padding-top: 5px; + } + #main-content-home { + padding: 0px; + margin: 0px; + } + /* Make use of full width in mobile mode */ + .facet_box_wrapper .box_wrapper .box, + .facet_template .facet, + .facet_box_temp { + width: inherit; + } + .facet_template .count { + [% IF rtl == 't' -%] + padding-right: 1em; + [% ELSE -%] + padding-left: 1em; + [% END -%] + } + #facet_sidebar { + margin-top: 0.5em; + } + #adv_search_parent { + font-size: [% css_fonts.size_smaller %]; + } + #adv_search_filters { + position: relative; + width: 300px; + } + #format_actions { + [% IF rtl == 't' -%] + float: right; + [% ELSE -%] + float: left; + [% END -%] + } + .rdetail_aux_utils { + padding: 0px; + border: none; + } + .result_metadata { + width: inherit; + } + div#rdetail_actions_div { + float: none; + } + h2.rdetail_uris { + clear: both; + } + #metarecord_population { + overflow: hidden; + width: 100%; + } + .metarecord_population_span_link { + } + .metarecord_population_item_lang { + float: none; + } + .search_catalog_lbl { + [% IF rtl == 't' -%] + margin-right: 0; + [% ELSE -%] + margin-left: 0; + [% END -%] + white-space: nowrap; + } + .adv_search_catalog_lbl { + margin-top: 0; + white-space: nowrap; + } + .browse_the_catalog_lbl { + white-space: nowrap; + } + .mobile_hide { + display: none; + } + #dash_user { + display: block; + padding: 0.5em; + font-size: 18px; + text-align: center; + } + .dash_divider { + display: none; + } + .dash_account_buttons { + display: block; + } + .searchbar { line-height: 1.5em; } + #browse-controls { line-height: 1.5em; } + #search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label { + display: block; + } + .bookshelf td { + display: block; + width: 100%; + } + .bookshelf table thead tr { + display: block; + } + #lowhits_help { width: inherit; } + #adv_search_tabs a{ + font-size: [% css_fonts.size_small %]; + margin: 2px 2px 0px 2px; + padding: 2px 2px 5px 2px; + [% IF rtl == 't' -%] + border-radius: 7px 0px 0px 7px; + [% ELSE -%] + border-radius: 7px 7px 0px 0px; + [% END -%] + } + #adv_global_tbody td { + border-bottom: thin solid [% css_colors.accent_light %]; + } + #adv_global_addrow td { + border-bottom: none; + } + /* Force table to not be like tables anymore */ + table#acct_checked_main_header thead tr th, table#acct_holds_main_header thead tr th, table#acct_checked_hist_header thead tr th, table#acct_holds_hist_header thead tr th, table#ebook_circs_main_table thead tr th, table#ebook_holds_main_table thead tr th { + display: none; + } + table#acct_checked_main_header tbody tr td, table#acct_holds_main_header tbody tr td, table#acct_checked_hist_header tbody tr td, table#acct_holds_hist_header tbody tr td, table#ebook_circs_main_table tbody tr td, table#ebook_holds_main_table tbody tr td { + display: block; + } + + /* Hide table headers (but not display: none;, for accessibility) */ + /* thead tr { + position: absolute; + top: -9999px; + [% IF rtl == 't' -%] + right: -9999px; + [% ELSE -%] + left: -9999px; + [% END -%] + }*/ + + table#acct_checked_main_header, table#acct_holds_main_header, table#acct_checked_hist_header, table#acct_holds_hist_header, table#ebook_circs_main_table, table#ebook_holds_main_table { + width: 90%; + } + + table#acct_checked_main_header tr, table#acct_holds_main_header tr, table#acct_checked_hist_header tr { border: 1px solid #ddd; } + + /* Holds history gets large white border to mimic header cell on other + account screens that provide visual cue for next title. We should do + the same for ebook tables too since we have no actions on those + tables. If actions get added, we should move those tables out of + here. */ + + table#ebook_circs_main_table tr, table#ebook_holds_main_table tr { border-top: 25px solid #fff; } + table#acct_holds_hist_header tr{ border-top: 2px solid #bbb; } + + table#acct_checked_main_header td, table#acct_holds_main_header td, table#acct_checked_hist_header td, table#acct_holds_hist_header td, table#ebook_circs_main_table td, table#ebook_holds_main_table td { + /* Behave like a "row" */ + border: none; + border-bottom: 1px solid #eee; + position: relative; + [% IF rtl == 't' -%] + padding-right: 40%; + [% ELSE -%] + padding-left: 40%; + [% END -%] + } + + table#acct_checked_main_header td:before, table#acct_holds_main_header td:before, table#acct_checked_hist_header td:before, table#acct_holds_hist_header td:before, table#ebook_circs_main_table td:before, table#ebook_holds_main_table td:before { + /* Now like a table header */ + position: absolute; + /* Top/left values mimic padding */ + top: 2px; + width: 40%; + [% IF rtl == 't' -%] + right: 2px; + padding-left: 10px; + [% ELSE -%] + left: 2px; + padding-right: 10px; + [% END -%] + white-space: nowrap; + } + + table#acct_checked_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;} + table#acct_checked_main_header td:nth-of-type(2):before { content: "[% l('Title') %]";} + table#acct_checked_main_header td:nth-of-type(3):before { content: "[% l('Author') %]"; } + table#acct_checked_main_header td:nth-of-type(4):before { content: "[% l('Renewals Left') %]"; } + table#acct_checked_main_header td:nth-of-type(5):before { content: "[% l('Due Date') %]"; } + table#acct_checked_main_header td:nth-of-type(6):before { content: "[% l('Barcode') %]"; } + table#acct_checked_main_header td:nth-of-type(7):before { content: "[% l('Call number') %]"; } + + table#acct_checked_hist_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;} + table#acct_checked_hist_header td:nth-of-type(2):before { content: "[% l('Title') %]";} + table#acct_checked_hist_header td:nth-of-type(3):before { content: "[% l('Author') %]"; } + table#acct_checked_hist_header td:nth-of-type(4):before { content: "[% l('Checkout Date') %]"; } + table#acct_checked_hist_header td:nth-of-type(5):before { content: "[% l('Due Date') %]"; } + table#acct_checked_hist_header td:nth-of-type(6):before { content: "[% l('Date Returned') %]"; } + table#acct_checked_hist_header td:nth-of-type(7):before { content: "[% l('Barcode') %]"; } + table#acct_checked_hist_header td:nth-of-type(8):before { content: "[% l('Call number') %]"; } + + table#acct_holds_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;} + table#acct_holds_main_header td:nth-of-type(2):before { content: "[% l('Title') %]";} + table#acct_holds_main_header td:nth-of-type(3):before { content: "[% l('Author') %]"; } + table#acct_holds_main_header td:nth-of-type(4):before { content: "[% l('Format') %]"; } + table#acct_holds_main_header td:nth-of-type(5):before { content: "[% l('Pickup Location') %]"; } + table#acct_holds_main_header td:nth-of-type(6):before { content: "[% l('Cancel on') %]"; } + table#acct_holds_main_header td:nth-of-type(7):before { content: "[% l('Status') %]"; } + table#acct_holds_main_header td.hold_notes:before { content: "[% l('Notes') %]"; } + + table#acct_holds_hist_header td:nth-of-type(1):before { content: "[% l('Title') %]";} + table#acct_holds_hist_header td:nth-of-type(2):before { content: "[% l('Author') %]"; } + table#acct_holds_hist_header td:nth-of-type(3):before { content: "[% l('Format') %]"; } + table#acct_holds_hist_header td:nth-of-type(4):before { content: "[% l('Pickup Location') %]"; } + table#acct_holds_hist_header td:nth-of-type(8):before { content: "[% l('Status') %]"; } + + table#ebook_circs_main_table td:nth-of-type(1):before { content: "[% l('Title') %]"; } + table#ebook_circs_main_table td:nth-of-type(2):before { content: "[% l('Author') %]"; } + table#ebook_circs_main_table td:nth-of-type(3):before { content: "[% l('Due Date') %]"; } + table#ebook_circs_main_table td:nth-of-type(4):before { content: "[% l('Actions') %]"; } + + table#ebook_holds_main_table td:nth-of-type(1):before { content: "[% l('Title') %]"; } + table#ebook_holds_main_table td:nth-of-type(2):before { content: "[% l('Author') %]"; } + table#ebook_holds_main_table td:nth-of-type(3):before { content: "[% l('Due Date') %]"; } + table#ebook_holds_main_table td:nth-of-type(4):before { content: "[% l('Actions') %]"; } + + + + /*Want to see these in mobile ONLY */ + .mobile_view{ + display:block; + } + + .mobile_search_lbl_clr{ + color:[% css_colors.mobile_header_text %]; + } +} + +@media only screen and (min-width: 992px) { + .nav-fr{ + float: right; + } + .nav-fl{ + float: left; + } + #nav-divide{ + display:none !important; + } +} +@media only screen and (max-width: 800px) { + .facet_sidebar_hidden, .result_block_hidden { + display: none; + } + .facet_sidebar_visible, .result_block_visible { + display: inline ! important; + } + #acct_select, #acct_prefs_select { + display: inline-block; + } + #acct_tabs, #acct_prefs_tabs { + display:none; + } + .radio-parts-selection { width: 90%; } + #list_description, #list_create_name { + width: 300px; + } +} diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index cf21aa6f58..4dd519b74d 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -4,6 +4,23 @@ rtl = ctx.get_i18n_l(ctx.eg_locale).rtl; %] +.adv_filters{ + + -moz-column-count: 4; + -moz-column-gap: 20px; + -webkit-column-count: 4; + -webkit-column-gap: 20px; + column-count: 4; + column-gap: 20px; + list-style: none; +} +.fas, .far{ + margin: 5px 0px; +} +.top-divide{ + border-top: 1px solid rgba(0,0,0,.1); +} + /* Mini Table Styling */ @@ -192,6 +209,13 @@ only screen and (max-width: 650px) { } }/*Micro Tables End*/ + .my_nav .active{background-color:#afffbf;}.my_nav a{text-align:left !important; min-width:17em;border-radius: 0px;}.sumNum{ + font-weight:700; +} + +.coverImage{position: relative;} +.carousel .glide__arrow{background: unset;} + /* Novelist Styling */ @@ -312,10 +336,25 @@ Novelist Styling background-color:#e8e8e8; } -.red{ - color:red; +.danger, .validate{ + color: [% css_colors.text_alert %] !important; +} + +.danger{ + font-weight: 600; + font-style: italic; } +.success{ + color: green !important; +} +.dropdown-menu{ + border: 1px solid black; + box-shadow: 2px 2px #00000054; +} +.dropdown-item.active, .dropdown-item:active{ + color : #000 !important; +} .login:focus{ outline:none; } @@ -417,18 +456,12 @@ a { height:18px; } */ -h1 { - margin:0; - margin-bottom: 5px; - font-size: [% css_fonts.size_biggest %]; - font-weight:normal; -} -h2 { - font-size: [% css_fonts.size_bigger %]; - font-weight:bold; +#adv_numeric_block{ + max-width: 600px; } + h2.graphic880 { font-size: [% css_fonts.size_bigger %]; font-weight:normal; @@ -472,15 +505,7 @@ div.select-box-wrapper { display:inline-block; } -#dashboard, #dashboard_e { - margin-top: 1em; - height: 2em; -} -#dashboard span.dash-align a, #dashboard_e span.dash-align a { - font-weight: bold; - text-decoration: none; -} #dash_user { font-weight: bold; @@ -751,14 +776,6 @@ for now until a better color is picked - if needed. margin-top: 5px; } -#adv_search_submit { - [% IF rtl == 't' -%] - margin-right: 10px; - [%- ELSE %] - margin-left: 10px; - [%- END %] - position: relative; -} .checkbox_col { width: 1%; @@ -2005,9 +2022,30 @@ div#facet_sidebar { .facet_template .count { text-align: right; - color: [% css_colors.accent_mediumdark %]; + color: [% css_colors.accent_dark %]; } +.page-item.active .page-link { + background-color: #00593d; + border-color: #00593d; +} +.page-link +{ + color: #00593d; +} + +.filter-header{ + background-color: [% css_colors.bg_filter %]; + color: [% css_colors.text_filter %]; +} + +.filter-header:hover{ + background-color: [% css_colors.bg_filter_hover %]; +} + +.extra_header{ + background-color: [% css_colors.bg_extras %]; +} .facet_template_selected { background-color: [% css_colors.accent_lighter2 %]; border: 1px solid [% css_colors.accent_medium %]; @@ -2178,7 +2216,6 @@ a.dash-link:hover { text-decoration: underline !important; } padding-left: 2em; [% END -%] } -.expert-search-row { padding-top: 10px; } #adv_expert_row label { font-weight: bold; } .bookshelf tr.browse_border td { @@ -3189,9 +3226,7 @@ a.preflib_change { float:left; [% END -%] } - #dashboard, #dashboard_e { - display: none; - } + #holds_box form blockquote { [% IF rtl == 't' -%] margin-right: 10px; @@ -3754,10 +3789,10 @@ label[for*=expert_] display: inline-block; } .carousel .glide__arrow--right { - right: -5em; + right: -8em; } .carousel .glide__arrow--left { - left: -5em; + left: -8em; } .search-filter{ @@ -3815,3 +3850,10 @@ label[for*=expert_] transform: translateY(-50%); } +.sumNum{ + margin-right:5px; +} + +.my_nav .dropdown-toggle::after{ + margin: 5px 0px !important; +} \ No newline at end of file diff --git a/Open-ILS/src/templates-bootstrap/opac/i18n_strings.tt2 b/Open-ILS/src/templates-bootstrap/opac/i18n_strings.tt2 new file mode 100644 index 0000000000..1617e29684 --- /dev/null +++ b/Open-ILS/src/templates-bootstrap/opac/i18n_strings.tt2 @@ -0,0 +1,23 @@ + + diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist.tt2 index 7cdb4a355e..a03c7cb933 100755 --- a/Open-ILS/src/templates-bootstrap/opac/mylist.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist.tt2 @@ -18,4 +18,5 @@ [% END %]
+ [%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 index 259ae2b975..793581c3a5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 @@ -5,15 +5,15 @@ ctx.page_title = l("Confirm Clearing of Basket") %] [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-

[% l('Confirm Clearing of Basket') %]

-

[% l('Please confirm that you want to remove all [_1] titles from the basket.', ctx.mylist.size) %] -

- - - -
-
+
+
+

[% l('Confirm Clearing of Basket') %]

+

[% l('Please confirm that you want to remove all [_1] titles from the basket.', ctx.mylist.size) %] +

+ + + +
+
[%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 index a0eeb27a1d..ab47de1531 100755 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 @@ -4,28 +4,27 @@ INCLUDE "opac/parts/topnav.tt2"; ctx.page_title = l("Confirm Basket Email") %] - [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
- [% IF ctx.mylist.size %] -

[% l('Confirm Basket Email') %]

-

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

- -
- - -
-
- - -
- [% ELSE %] -
[% l("The basket is empty."); %]
- - [% END %] +[% INCLUDE "opac/parts/searchbar.tt2" %] +
+ [% IF ctx.mylist.size %] +

[% l('Confirm Basket Email') %]

+

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

+ +
+ +
+
+ + +
+ [% ELSE %] +
[% l("The basket is empty."); %]
+ + [% END %] +
[%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 index 84b1106e85..0958dff20f 100755 --- a/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 @@ -5,28 +5,25 @@ ctx.page_title = l("Confirm Basket Printing") %] [% INCLUDE "opac/parts/searchbar.tt2" %] -
- - [% IF ctx.mylist.size %] -

[% l('Confirm Basket Printing') %]

-

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

- -
- - -
-
- - -
- [% ELSE %] -

[% l("The basket is empty."); %]

- - [% END %] - -
+
+ [% IF ctx.mylist.size %] +

[% l('Confirm Basket Printing') %]

+

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

+ +
+ + +
+
+ + +
+ [% ELSE %] +

[% l("The basket is empty."); %]

+ + [% END %] +
[%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index b2b3751a69..52b3b5a28e 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -1,6 +1,6 @@ [% PROCESS "opac/parts/header.tt2"; PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/prefs_base.tt2"; + WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "charges"; myopac_main_page = "main"; parent = "charges"; @@ -15,7 +15,6 @@ [% IF ctx.fines.circulation.size > 0 %]
-
@@ -27,6 +26,8 @@
+ + @@ -34,7 +35,7 @@ [% IF myopac_cc_allowed %] - 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 6c67dc5417..d1293bd807 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 @@ -1,24 +1,38 @@

[% l("Messages") %]

- - - [% IF offset != 0 %] limit, offset => (offset - limit)} ) %]'>◄[% l('Previous') %][% END %] + + + + + +
[% IF ctx.message_update_action.defined %] [% IF ctx.message_update_changed > 0 %] @@ -50,25 +64,31 @@
- - - + + +
[% IF count < 1 %]
[% l('No messages found.') %]
[% ELSE %] +
+ + +
+ @@ -113,7 +114,7 @@ - [% l('(fines accruing)') %] + [% l('(fines accruing)') %] [% END %] @@ -132,18 +133,26 @@

[% l("Charges On Your Account") %]

- + + [% IF myopac_cc_allowed %] +
+ + +
+ [% END %] [% IF myopac_cc_allowed %] - [% END %] @@ -160,17 +169,17 @@ [% c = c + 1; %] [% IF myopac_cc_allowed %] [% END %] -
+ - + aria-label="[% l('Check/Uncheck All') %]" /> + [% l("Owed") %] [% l("Billing Type") %] - Billing Number [% c %] - + + + Amount Owed [% money(f.xact.balance_owed) %] - + @@ -210,17 +219,20 @@ [% IF myopac_cc_allowed %] [% END %] - [% END %] 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 c9b664b263..d685903847 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 @@ -32,7 +32,7 @@
[% IF offset != 0 %] limit, offset => (offset - limit)}) %]' class="btn btn-action mr-3" >◄[% l('Previous') %][% END %] -
@@ -40,11 +40,18 @@ class="btn btn-action" >[% l('Next') %]►[% END %]
+
+ + + + + +
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 index 5c97d7bae4..4a9e18908a 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 @@ -27,19 +27,23 @@
- +
+
+ + +
- + [% sort_head("sort_title", l("Title")) %] [% sort_head("author", l("Author")) %]
- @@ -115,7 +119,7 @@ diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_place_hold.tt2 index cefea21a36..2de2d41461 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_place_hold.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_place_hold.tt2 @@ -5,12 +5,9 @@ WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "ebook_place_hold"; %] -

[% l('Place Hold on E-Item') %]

-
-
- [% l('Place Hold on E-Item') %] -
+
+

[% l('Place Hold on E-Item') %]

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 379fffb2b9..a75427aa68 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 @@ -14,24 +14,33 @@
- - [% IF offset != 0 %] limit,offset => (offset - limit)}) %]'>◄[% l('Previous') %][% END %] + [% l('Export List') %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index 43feb0d0a2..8d7cd5c7c9 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -20,12 +20,11 @@
- [% IF offset != 0 %] limit,offset => (offset - limit)}) %]' - >◄[% l('Previous') %] [% END %] +
- - - + + +

[% IF CGI.param("available") -%] [% l('Show all holds') %] | @@ -41,29 +40,38 @@

-
+
+ [% IF offset != 0 %] limit,offset => (offset - limit)}) %]' + >◄[% l('Previous') %] [% END %] + [% IF offset > 0 || count > limit; curpage = 0; WHILE curpage * limit < count; IF curpage * limit == offset; %] - [% curpage + 1 %] + [% curpage + 1 %] + [%- ELSE %] - limit, offset => (curpage * limit)}) %]' class="np_nav_link classic_link btn btn-outline-primary">[% curpage + 1 %] + limit, offset => (curpage * limit)}) %]' class="np_nav_link classic_link btn btn-action">[% curpage + 1 %] [%- END; curpage = curpage + 1; END; END %] [% IF ctx.hold_suspend_post_capture; l('One or more holds could not be suspended because the item is at (or en route to) the pickup library.'); END; %] + [% IF count > limit + offset %] limit, offset => (offset + limit)}) %]' + >[% l('Next') %]►[% END %] +
-
- [% IF count > limit + offset %] limit, offset => (offset + limit)}) %]' - >[% l('Next') %]►[% END %] -
+
[% IF ctx.holds.size && ctx.holds.size < 1 %]
[% l('No holds found.') %]
[% ELSE %] +
+ + + +
+ - + [% sort_head("sort_title", l("Title")) %] [% sort_head("author", l("Author")) %] [% sort_head("renews", l("Renewals Left")) %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 index 6fa97c95ab..a3fd196dc1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 @@ -22,45 +22,43 @@

[% l('Edit Hold') %]

[% l('List all holds') %] +
- [% IF hold; - title = attrs.title; + [% IF hold; title = attrs.title; IF ahr.hold_type == 'P'; title = l('[_1] ([_2])', title, hold.hold.part.label); END - %]
+ %] +

[% title | html %]

[% attrs.author | html %]

- [% IF attrs.format_icon %]

- [% l('Format:') %] + [% IF attrs.format_icon %] + [% l('Format:') %] [% attrs.format_label | html %] -

[% END %]
-

- [% l('Status') %]: [% hold.human_status %] -

- -
- - - - - [% IF hold.hold.status < 3 OR hold.hold.status == 7 %] + +
+ [% IF hold.hold.status < 3 OR hold.hold.status == 7 %] [%# The following actions cannot be performed on holds that have already been captured... %] -
- - - - - - - - - - - + [% END %] - - - - -
- + [% END %] + + +
+
+ [% l('Status') %]: [% hold.human_status %] +
+
+ [% l('Pickup library') %] -
+ [% INCLUDE build_org_selector name='pickup_lib' value=ahr.pickup_lib can_have_vols_only=1 hold_pickup_lib=1 %] -
+ [% l('Cancel unless filled by') %] - +
@@ -68,13 +66,9 @@
-
+ [% l('Active?') %] - + -
+ [% l('If suspended, activate on') %] - +
@@ -97,23 +87,22 @@
-
+ +
+ [% IF hold.metarecord_filters.formats.size OR (hold.metarecord_filters.langs.size.defined && hold.metarecord_filters.langs.size > 1); PROCESS metarecord_hold_filters_selector hold_data=hold; END %] -
- [% l('Go Back') %] - -
+
+
+ [% l('Go Back') %] + +
+ [% ELSE; l('Hold not found'); diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/list/update.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/list/update.tt2 index 2275df6592..f12dade63d 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/list/update.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/list/update.tt2 @@ -8,37 +8,30 @@ [% IF ctx.bucket_action_failed %]
- -
- [% l("Problem with list management:") %] -
- -
-
    - [% IF ctx.bucket_action == 'create' %] - [% IF ctx.bucket_failure_noname %] -
  • [% l('A list name is required') %]
    • - [% END %] - [% END %] -
-
- -
- [% url = ctx.referer; - # The return link should return the user to the page where the edit - # failure occurred. - # mkurl() does not support 'page' params w/ existing CGI params. - # build the URL manually. - IF ctx.where_from; - from = ctx.where_from | uri; - IF url.match('\?'); - url = url _ ';where_from=' _ from; - ELSE; - url = url _ '?where_from=' _ from; - END; - END; %] - [% l('Return') %] -
+

[% l("Problem with list management:") %]

+
+ [% IF ctx.bucket_action == 'create' %] + [% IF ctx.bucket_failure_noname %] +

[% l('A list name is required') %]

+ [% END %] + [% END %] +
+
+ [% url = ctx.referer; + # The return link should return the user to the page where the edit + # failure occurred. + # mkurl() does not support 'page' params w/ existing CGI params. + # build the URL manually. + IF ctx.where_from; + from = ctx.where_from | uri; + IF url.match('\?'); + url = url _ ';where_from=' _ from; + ELSE; + url = url _ '?where_from=' _ from; + END; + END; %] + [% l('Return') %] +
[% 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 e445964715..4cb82285b0 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 @@ -82,7 +82,7 @@
- [% IF CGI.param('from_basket'); %] + [% IF CGI.param('from_basket'); %]

[% l("... from basket") %]

[% INCLUDE "opac/parts/anon_list.tt2" %] [% ELSE %] @@ -171,7 +171,7 @@ [% IF ctx.where_from %] [% END %] - + [% END %] @@ -267,22 +267,24 @@
[% IF bbag.items.size %]
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - - [% IF CGI.param('list_none_selected') %] - [% l('No items were selected') %] - [% END %] + + + +
[% END %]
+
+ + + + + +
@@ -455,5 +457,6 @@ [% 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 f58163a447..fb5afdc535 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 @@ -13,60 +13,61 @@

[% l('My Account Summary') %]

-
- - - - - - - - - - - - - - - - -
[% l("Account Expiration Date - ") %] - +
+
+ + [% l("Account Expiration Date - ") %] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] - [% IF ctx.expired_card %] +
+
+ [% IF ctx.expired_card %] [% l("
Your library card has expired.
Please contact a librarian to resolve this issue.", fmt_expire_date) %] [% END %] -
+
+ [% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %] -
+
+ [% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %] -
+
+ [% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %] -
+
+ +
+ [% content %] 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 84111975d9..421f390125 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 @@ -13,7 +13,7 @@
[% IF offset != 0 %] ◄[% l('Previous') %] + >◄[% l('Previous') %] [% END %]
@@ -23,9 +23,10 @@
[% IF ctx.payments.size > limit %] [% l('Next') %] ► + >[% l('Next') %] ► + [% END %] - +
@@ -55,11 +56,11 @@ Receipt Options:
- +
- +
- + - + @@ -77,7 +97,7 @@ [% END %] 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 d94e8238c5..2d749734a3 100755 --- 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,7 +1,5 @@
- -

[% l("Messages") %]

- +

[% l("Messages") %]

@@ -24,27 +22,23 @@ - -
- + - [% l('Date') %] [% l('Library') %] [% l('Subject') %]
Message Number [% count; %] + [% html_text_attr('aria-label', l('Select message [_1]', message.title)) %]/> Date of Message @@ -93,7 +113,7 @@ Message Options - Read + Read
- - - - - - - - - - - - - - - - - - -
[% l("Date") %][% date.format(ctx.parse_datetime(ctx.patron_messages.0.create_date), DATE_FORMAT); %]
[% l("Library") %][% ctx.patron_messages.0.library | html %]
[% l("Subject") %][% ctx.patron_messages.0.title | html %]
[% l("Message") %][% ctx.patron_messages.0.message | html %]
+
+
+ [% l("Date") %] + [% date.format(ctx.parse_datetime(ctx.patron_messages.0.create_date), DATE_FORMAT); %] +
+
+ [% l("Library") %] + [% ctx.patron_messages.0.library | html %] +
+
+ [% l("Subject") %] + [% ctx.patron_messages.0.title | html %] +
+
+ [% l("Message") %] + [% ctx.patron_messages.0.message | html %] +
+
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 index d69b2c87ad..00cb39ad5b 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 @@ -1,5 +1,5 @@ [% PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/myopac/prefs_base.tt2"; + WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "prefs"; parent="prefs"; prefs_page = 'prefs' %] @@ -117,8 +117,24 @@ [% l("Home Library") %] - [% ctx.user.home_ou.name | html %] - + + [% ctx.get_aou(ctx.user.home_ou.parent_ou).name %]
+ [% ctx.user.home_ou.name | html %]
+ [% ctx.user.home_ou.billing_address.street1 %]
+ [% IF ctx.user.home_ou.billing_address.street2; ctx.user.home_ou.billing_address.street2 _ "
"; END %] + [% ctx.user.home_ou.billing_address.city %], [% ctx.user.home_ou.billing_address.state %] + [% ctx.user.home_ou.billing_address.post_code %]
+
+ + [% IF ctx.user.home_ou.phone; ctx.user.home_ou.phone _ "
"; END %] + + [% IF ctx.user.home_ou.email; ctx.user.home_ou.email _ "
"; END %] + [% lib_url = ctx.get_org_setting(ctx.user.home_ou.id, 'lib.info_url'); + IF lib_url; + ''; lib_url; ''; + END; + %] + [% l("Account Creation Date") %] @@ -129,8 +145,7 @@ [% l("Account Expiration Date") %] [%- 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) %] - + [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] [% ELSE %] [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %] [% END %] @@ -214,7 +229,7 @@ [% END %] - diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 index 1a1287b17d..3042aa8027 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 @@ -1,5 +1,5 @@ [% PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/myopac/prefs_base.tt2"; + WRAPPER "opac/parts/myopac/base.tt2"; myopac_page = "prefs_my_lists"; parent="prefs"; prefs_page = 'prefs_my_lists' %] @@ -22,7 +22,7 @@ [%- setting = 'opac.lists_per_page' -%] - + [% UNLESS ctx.user_setting_map.$setting; @@ -67,7 +67,7 @@ [%- setting = 'opac.default_pickup_location'; -%] - + [%- thang = ctx.user.home_ou.id; IF ctx.user_setting_map.$setting; diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 index 75244f0559..ce898cfa46 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 @@ -31,7 +31,7 @@ [% l('Current Password') %] [% l('New Email') %] - +
[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 index 8343dfe224..dcd8f4cac4 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 @@ -34,7 +34,7 @@ [% l('New Password') %] [% l('New Password Again') %] - +
[% END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 index d39203c7b7..5d40fb65dd 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 @@ -32,7 +32,7 @@ [% l('Current Username') %][% ctx.user.usrname | html %] [% l('Current Password') %] [% l('New Username') %] - + 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 e3811cb3db..68ca9f9ef4 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 @@ -1,5 +1,6 @@
-
[% l("Expert Search") %]
+

Expert Search

+

Search the MARC record.

@@ -8,14 +9,7 @@
-
- - - - -
+
@@ -34,17 +28,23 @@
+
+ +
- [% l("Add Search Row") %] + [% l("Add Search Row") %] - [%- lib_select_id = "expert_search_library"; -%] - + [%- lib_select_id = "adv_org_selector"; -%] +