From 8115cbb851bb6f3997c2c72444b619e77daa69d9 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Mon, 29 Jun 2020 17:41:45 -0700 Subject: [PATCH] LP#1778972: (follow-up) use OILSWebTemplatePath to enable/disable the bootstrap OPAC This commit also renames the directory that contains the bootstrap-based OPAC. With the OILSWebTemplatePath, several redundant files also can be safely removed. Adds a release notes entry describing how to enable this OPAC in eg_vhosts.conf. Signed-off-by: Jane Sandberg Signed-off-by: Ruth Frasur Signed-off-by: Galen Charlton --- Open-ILS/examples/apache_24/eg_vhost.conf.in | 1 + .../opac}/advanced.tt2 | 0 .../opac}/browse.tt2 | 0 .../opac}/cnbrowse.tt2 | 0 .../opac}/css/style.css.tt2 | 2 +- .../opac}/home.tt2 | 0 .../opac}/mylist.tt2 | 0 .../opac}/mylist/clear.tt2 | 0 .../opac}/mylist/email.tt2 | 0 .../opac}/mylist/print.tt2 | 0 .../opac}/myopac/circ_history.tt2 | 0 .../opac}/myopac/circs.tt2 | 0 .../opac}/myopac/ebook_checkout.tt2 | 0 .../opac}/myopac/ebook_circs.tt2 | 0 .../opac}/myopac/ebook_holds.tt2 | 0 .../opac}/myopac/ebook_holds_ready.tt2 | 0 .../opac}/myopac/hold_history.tt2 | 0 .../opac}/myopac/holds.tt2 | 0 .../opac}/myopac/holds/edit.tt2 | 0 .../opac}/myopac/lists.tt2 | 0 .../opac}/myopac/main.tt2 | 0 .../opac}/myopac/main_pay.tt2 | 0 .../opac}/myopac/main_payment_form.tt2 | 0 .../opac}/myopac/main_payments.tt2 | 0 .../opac}/myopac/messages/list.tt2 | 0 .../opac}/myopac/messages/single_message.tt2 | 0 .../opac}/myopac/prefs.tt2 | 0 .../opac}/myopac/prefs_my_lists.tt2 | 0 .../opac}/myopac/prefs_notify.tt2 | 0 .../opac}/myopac/prefs_settings.tt2 | 0 .../opac}/myopac/update_email.tt2 | 0 .../opac}/myopac/update_password.tt2 | 0 .../opac}/myopac/update_username.tt2 | 0 .../opac}/parts/advanced/expert.tt2 | 0 .../opac}/parts/advanced/global_row.tt2 | 0 .../opac}/parts/advanced/numeric.tt2 | 0 .../opac}/parts/advanced/search.tt2 | 0 .../opac}/parts/anon_list.tt2 | 0 .../opac}/parts/base.tt2 | 0 .../opac}/parts/bookbag_actions.tt2 | 0 .../opac}/parts/cart_nav.tt2 | 0 .../opac}/parts/coded_value_selector.tt2 | 0 .../opac}/parts/config-fresh.tt2 | 0 .../opac}/parts/config.tt2 | 0 .../opac}/parts/css/colors.tt2 | 0 .../opac}/parts/css/fonts.tt2 | 0 .../opac}/parts/footer.tt2 | 0 .../opac}/parts/header.tt2 | 0 .../opac}/parts/hold_status.tt2 | 0 .../opac}/parts/homesearch.tt2 | 0 .../opac}/parts/library_name_link.tt2 | 0 .../opac}/parts/locale_picker.tt2 | 0 .../opac}/parts/location_name_link.tt2 | 0 .../opac}/parts/login/form.tt2 | 0 .../opac}/parts/login/help.tt2 | 0 .../opac}/parts/login/login_modal.tt2 | 0 .../opac}/parts/login/password_hint.tt2 | 0 .../opac}/parts/login/username_hint.tt2 | 0 .../opac}/parts/metarecord_hold_filters.tt2 | 0 .../opac}/parts/misc_util.tt2 | 0 .../opac}/parts/myopac/base.tt2 | 0 .../opac}/parts/myopac/main_base.tt2 | 0 .../opac}/parts/myopac/prefs_base.tt2 | 0 .../opac}/parts/org_selector.tt2 | 0 .../opac}/parts/place_hold.tt2 | 0 .../opac}/parts/place_hold_result.tt2 | 0 .../opac}/parts/pref_locale_picker.tt2 | 0 .../opac}/parts/qtype_selector.tt2 | 0 .../opac}/parts/record/addedcontent.tt2 | 0 .../opac}/parts/record/awards.tt2 | 0 .../opac}/parts/record/body.tt2 | 0 .../opac}/parts/record/cnbrowse.tt2 | 0 .../opac}/parts/record/copy_counts.tt2 | 0 .../opac}/parts/record/copy_table.tt2 | 0 .../opac}/parts/record/extras.tt2 | 0 .../opac}/parts/record/navigation.tt2 | 0 .../opac}/parts/record/series.tt2 | 0 .../opac}/parts/record/summary.tt2 | 0 .../opac}/parts/result/adv_filter.tt2 | 0 .../opac}/parts/result/facets-hz.tt2 | 0 .../opac}/parts/result/facets.tt2 | 0 .../opac}/parts/result/lowhits.tt2 | 0 .../opac}/parts/result/paginate.tt2 | 0 .../opac}/parts/result/table.tt2 | 0 .../opac}/parts/searchbar.tt2 | 0 .../opac}/parts/sms_carrier_selector.tt2 | 0 .../opac}/parts/staff_saved_searches.tt2 | 0 .../opac}/parts/topnav.tt2 | 0 .../opac}/parts/topnav_links.tt2 | 0 .../opac}/parts/topnav_logo.tt2 | 0 .../opac}/parts/topnav_subnav.tt2 | 0 .../opac}/password_reset.tt2 | 0 .../opac}/record.tt2 | 0 .../opac}/record/print.tt2 | 0 .../opac}/register.tt2 | 0 .../opac}/results.tt2 | 0 .../src/templates/opac-new/i18n_strings.tt2 | 24 -- Open-ILS/src/templates/opac-new/library.tt2 | 12 - Open-ILS/src/templates/opac-new/login.tt2 | 17 -- .../opac-new/myopac/circ_history/export.tt2 | 38 --- .../opac-new/myopac/ebook_place_hold.tt2 | 36 --- .../templates/opac-new/myopac/list/print.tt2 | 1 - .../templates/opac-new/myopac/list/update.tt2 | 44 --- .../opac-new/myopac/main_pay_init.tt2 | 15 - .../templates/opac-new/myopac/messages.tt2 | 16 - .../opac-new/myopac/receipt_email.tt2 | 21 -- .../opac-new/myopac/receipt_print.tt2 | 26 -- .../opac-new/myopac/reservations.tt2 | 39 --- .../opac-new/myopac/update_password_msg.tt2 | 3 - .../src/templates/opac-new/parts/acjs.tt2 | 76 ----- .../src/templates/opac-new/parts/cart.tt2 | 30 -- .../templates/opac-new/parts/chilifresh.tt2 | 17 -- .../opac-new/parts/ebook_api/avail.tt2 | 41 --- .../opac-new/parts/ebook_api/base_js.tt2 | 95 ------ .../opac-new/parts/ebook_api/login_js.tt2 | 41 --- .../opac-new/parts/filter_group_selector.tt2 | 28 -- .../templates/opac-new/parts/filtersort.tt2 | 29 -- .../opac-new/parts/goog_analytics.tt2 | 18 -- .../opac-new/parts/hold_error_messages.tt2 | 40 --- Open-ILS/src/templates/opac-new/parts/js.tt2 | 176 ----------- .../opac-new/parts/library/core_info.tt2 | 56 ---- .../opac-new/parts/library/hours.tt2 | 103 ------- .../parts/library_name_link_from_ou.tt2 | 22 -- .../opac-new/parts/multi_hold_select.tt2 | 15 - .../parts/myopac/column_sort_support.tt2 | 36 --- .../parts/myopac/main_refund_policy.tt2 | 18 -- .../opac-new/parts/myopac/prefs_hints.tt2 | 5 - .../opac-new/parts/pref_lib_display.tt2 | 7 - .../opac-new/parts/preserve_params.tt2 | 9 - .../opac-new/parts/record/authors.tt2 | 196 ------------- .../opac-new/parts/record/contents.tt2 | 217 -------------- .../opac-new/parts/record/issues-db.tt2 | 199 ------------- .../opac-new/parts/record/issues-mfhd.tt2 | 43 --- .../opac-new/parts/record/issues.tt2 | 8 - .../opac-new/parts/record/refworks.tt2 | 20 -- .../opac-new/parts/record/subjects.tt2 | 144 --------- .../opac-new/parts/record/summaryplus.tt2 | 20 -- .../src/templates/opac-new/parts/relators.tt2 | 276 ------------------ .../opac-new/parts/result/copy_counts.tt2 | 41 --- .../parts/result/lowhits_purchase.tt2 | 6 - .../opac-new/parts/sms_number_textbox.tt2 | 5 - .../src/templates/opac-new/parts/stripe.tt2 | 35 --- .../src/templates/opac-new/parts/tips.tt2 | 11 - .../templates/opac-new/password_reset_msg.tt2 | 3 - .../src/templates/opac-new/place_hold.tt2 | 21 -- .../src/templates/opac-new/record/email.tt2 | 32 -- Open-ILS/src/templates/opac-new/sms_cn.tt2 | 52 ---- Open-ILS/src/templates/opac-new/temp_warn.tt2 | 27 -- .../OPAC/bootstrap-opac.adoc | 28 ++ 149 files changed, 30 insertions(+), 2511 deletions(-) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/advanced.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/browse.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/cnbrowse.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/css/style.css.tt2 (99%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/home.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/mylist.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/mylist/clear.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/mylist/email.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/mylist/print.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/circ_history.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/circs.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/ebook_checkout.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/ebook_circs.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/ebook_holds.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/ebook_holds_ready.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/hold_history.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/holds.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/holds/edit.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/lists.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/main.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/main_pay.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/main_payment_form.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/main_payments.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/messages/list.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/messages/single_message.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/prefs.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/prefs_my_lists.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/prefs_notify.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/prefs_settings.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/update_email.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/update_password.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/myopac/update_username.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/advanced/expert.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/advanced/global_row.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/advanced/numeric.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/advanced/search.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/anon_list.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/base.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/bookbag_actions.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/cart_nav.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/coded_value_selector.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/config-fresh.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/config.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/css/colors.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/css/fonts.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/footer.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/header.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/hold_status.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/homesearch.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/library_name_link.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/locale_picker.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/location_name_link.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/login/form.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/login/help.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/login/login_modal.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/login/password_hint.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/login/username_hint.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/metarecord_hold_filters.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/misc_util.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/myopac/base.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/myopac/main_base.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/myopac/prefs_base.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/org_selector.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/place_hold.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/place_hold_result.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/pref_locale_picker.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/qtype_selector.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/addedcontent.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/awards.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/body.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/cnbrowse.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/copy_counts.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/copy_table.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/extras.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/navigation.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/series.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/record/summary.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/adv_filter.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/facets-hz.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/facets.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/lowhits.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/paginate.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/result/table.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/searchbar.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/sms_carrier_selector.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/staff_saved_searches.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/topnav.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/topnav_links.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/topnav_logo.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/parts/topnav_subnav.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/password_reset.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/record.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/record/print.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/register.tt2 (100%) rename Open-ILS/src/{templates/opac-new => templates-bootstrap/opac}/results.tt2 (100%) delete mode 100644 Open-ILS/src/templates/opac-new/i18n_strings.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/library.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/login.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/circ_history/export.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/ebook_place_hold.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/list/print.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/list/update.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/main_pay_init.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/messages.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/receipt_email.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/receipt_print.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/reservations.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/myopac/update_password_msg.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/acjs.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/cart.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/chilifresh.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/ebook_api/avail.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/ebook_api/base_js.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/ebook_api/login_js.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/filter_group_selector.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/filtersort.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/goog_analytics.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/hold_error_messages.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/js.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/library/core_info.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/library/hours.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/library_name_link_from_ou.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/multi_hold_select.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/myopac/column_sort_support.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/myopac/main_refund_policy.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/myopac/prefs_hints.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/pref_lib_display.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/preserve_params.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/authors.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/contents.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/issues-db.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/issues-mfhd.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/issues.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/refworks.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/subjects.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/record/summaryplus.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/relators.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/result/copy_counts.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/result/lowhits_purchase.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/sms_number_textbox.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/stripe.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/parts/tips.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/password_reset_msg.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/place_hold.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/record/email.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/sms_cn.tt2 delete mode 100644 Open-ILS/src/templates/opac-new/temp_warn.tt2 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/bootstrap-opac.adoc diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in index 01a0529c1d..427b830a9b 100644 --- a/Open-ILS/examples/apache_24/eg_vhost.conf.in +++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in @@ -671,6 +671,7 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT] # Templates will be loaded from the following paths in reverse order. PerlAddVar OILSWebTemplatePath "@localstatedir@/templates" + #PerlAddVar OILSWebTemplatePath "@localstatedir@/templates-bootstrap" #Uncomment this line to use the new bootstrap OPAC #PerlAddVar OILSWebTemplatePath "@localstatedir@/templates_localskin" #------------------------------------------------- diff --git a/Open-ILS/src/templates/opac-new/advanced.tt2 b/Open-ILS/src/templates-bootstrap/opac/advanced.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/advanced.tt2 rename to Open-ILS/src/templates-bootstrap/opac/advanced.tt2 diff --git a/Open-ILS/src/templates/opac-new/browse.tt2 b/Open-ILS/src/templates-bootstrap/opac/browse.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/browse.tt2 rename to Open-ILS/src/templates-bootstrap/opac/browse.tt2 diff --git a/Open-ILS/src/templates/opac-new/cnbrowse.tt2 b/Open-ILS/src/templates-bootstrap/opac/cnbrowse.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/cnbrowse.tt2 rename to Open-ILS/src/templates-bootstrap/opac/cnbrowse.tt2 diff --git a/Open-ILS/src/templates/opac-new/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 similarity index 99% rename from Open-ILS/src/templates/opac-new/css/style.css.tt2 rename to Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index 46e2ecca12..3f7291ff38 100644 --- a/Open-ILS/src/templates/opac-new/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -3789,4 +3789,4 @@ label[for*=expert_] background-size: contain; /* Resize the background image to cover the entire container */ background-image: url("https://evergreen-ils.org/wp-content/uploads/2018/09/Evergreen-Final-Logo.png"); -} \ No newline at end of file +} diff --git a/Open-ILS/src/templates/opac-new/home.tt2 b/Open-ILS/src/templates-bootstrap/opac/home.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/home.tt2 rename to Open-ILS/src/templates-bootstrap/opac/home.tt2 diff --git a/Open-ILS/src/templates/opac-new/mylist.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/mylist.tt2 rename to Open-ILS/src/templates-bootstrap/opac/mylist.tt2 diff --git a/Open-ILS/src/templates/opac-new/mylist/clear.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/mylist/clear.tt2 rename to Open-ILS/src/templates-bootstrap/opac/mylist/clear.tt2 diff --git a/Open-ILS/src/templates/opac-new/mylist/email.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/mylist/email.tt2 rename to Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 diff --git a/Open-ILS/src/templates/opac-new/mylist/print.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/mylist/print.tt2 rename to Open-ILS/src/templates-bootstrap/opac/mylist/print.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/circ_history.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/circs.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/ebook_checkout.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_checkout.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/ebook_checkout.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/ebook_checkout.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/ebook_circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/ebook_circs.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/ebook_holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/ebook_holds.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/ebook_holds_ready.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/ebook_holds_ready.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/ebook_holds_ready.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/hold_history.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/holds.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/holds/edit.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/holds/edit.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/lists.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/main.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/main_pay.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_pay.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/main_pay.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/main_pay.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/main_payment_form.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payment_form.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/main_payment_form.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/main_payment_form.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/main_payments.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/main_payments.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/messages/list.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/messages/list.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/messages/single_message.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/messages/single_message.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/messages/single_message.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/prefs.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/prefs_my_lists.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/prefs_notify.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/prefs_notify.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/prefs_settings.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/update_email.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/update_email.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/update_email.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/update_password.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/update_password.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/update_password.tt2 diff --git a/Open-ILS/src/templates/opac-new/myopac/update_username.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/myopac/update_username.tt2 rename to Open-ILS/src/templates-bootstrap/opac/myopac/update_username.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/advanced/expert.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/advanced/expert.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/advanced/global_row.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/advanced/global_row.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/advanced/global_row.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/advanced/numeric.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/advanced/numeric.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/advanced/search.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/anon_list.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/anon_list.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/base.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/base.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/bookbag_actions.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/bookbag_actions.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/bookbag_actions.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/cart_nav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/cart_nav.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/coded_value_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/coded_value_selector.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/coded_value_selector.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/coded_value_selector.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/config-fresh.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config-fresh.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/config-fresh.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/config-fresh.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/config.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/config.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/css/colors.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/css/colors.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/css/fonts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/css/fonts.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/css/fonts.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/css/fonts.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/footer.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/footer.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/header.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/header.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/hold_status.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/hold_status.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/homesearch.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/homesearch.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/library_name_link.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/library_name_link.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/library_name_link.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/library_name_link.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/locale_picker.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/location_name_link.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/location_name_link.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/location_name_link.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/location_name_link.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/login/form.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/login/help.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/help.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/login/help.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/login/help.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/login/login_modal.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/login/password_hint.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/login/password_hint.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/login/username_hint.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/login/username_hint.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/metarecord_hold_filters.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/metarecord_hold_filters.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/misc_util.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/misc_util.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/myopac/base.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/main_base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/myopac/main_base.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/myopac/main_base.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/myopac/prefs_base.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/myopac/prefs_base.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/org_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/org_selector.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/org_selector.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/place_hold.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/place_hold_result.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/place_hold_result.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/place_hold_result.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/pref_locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/pref_locale_picker.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/qtype_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/qtype_selector.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/qtype_selector.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/addedcontent.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/addedcontent.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/addedcontent.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/awards.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/awards.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/awards.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/body.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/body.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/body.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/body.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/cnbrowse.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/copy_counts.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/copy_table.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/extras.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/extras.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/extras.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/navigation.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/navigation.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/series.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/series.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/record/summary.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/adv_filter.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/adv_filter.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/facets-hz.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/facets-hz.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/facets-hz.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/facets.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/facets.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/lowhits.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/lowhits.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/lowhits.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/paginate.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/paginate.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/result/table.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/searchbar.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/sms_carrier_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/sms_carrier_selector.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/staff_saved_searches.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/staff_saved_searches.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/staff_saved_searches.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/staff_saved_searches.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/topnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/topnav.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/topnav.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/topnav_links.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/topnav_logo.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_logo.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/topnav_logo.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/topnav_logo.tt2 diff --git a/Open-ILS/src/templates/opac-new/parts/topnav_subnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/parts/topnav_subnav.tt2 rename to Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2 diff --git a/Open-ILS/src/templates/opac-new/password_reset.tt2 b/Open-ILS/src/templates-bootstrap/opac/password_reset.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/password_reset.tt2 rename to Open-ILS/src/templates-bootstrap/opac/password_reset.tt2 diff --git a/Open-ILS/src/templates/opac-new/record.tt2 b/Open-ILS/src/templates-bootstrap/opac/record.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/record.tt2 rename to Open-ILS/src/templates-bootstrap/opac/record.tt2 diff --git a/Open-ILS/src/templates/opac-new/record/print.tt2 b/Open-ILS/src/templates-bootstrap/opac/record/print.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/record/print.tt2 rename to Open-ILS/src/templates-bootstrap/opac/record/print.tt2 diff --git a/Open-ILS/src/templates/opac-new/register.tt2 b/Open-ILS/src/templates-bootstrap/opac/register.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/register.tt2 rename to Open-ILS/src/templates-bootstrap/opac/register.tt2 diff --git a/Open-ILS/src/templates/opac-new/results.tt2 b/Open-ILS/src/templates-bootstrap/opac/results.tt2 similarity index 100% rename from Open-ILS/src/templates/opac-new/results.tt2 rename to Open-ILS/src/templates-bootstrap/opac/results.tt2 diff --git a/Open-ILS/src/templates/opac-new/i18n_strings.tt2 b/Open-ILS/src/templates/opac-new/i18n_strings.tt2 deleted file mode 100644 index 7d3b831d64..0000000000 --- a/Open-ILS/src/templates/opac-new/i18n_strings.tt2 +++ /dev/null @@ -1,24 +0,0 @@ - - diff --git a/Open-ILS/src/templates/opac-new/library.tt2 b/Open-ILS/src/templates/opac-new/library.tt2 deleted file mode 100644 index 702f30e9e5..0000000000 --- a/Open-ILS/src/templates/opac-new/library.tt2 +++ /dev/null @@ -1,12 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - ctx.page_title = l("Library details: [_1]", ctx.library.name); - canon = ctx.proto _ '://' _ ctx.hostname _ mkurl('', {}, 1); - ctx.metalinks.push(''); - ctx.metalinks.push(''); - ctx.metalinks.push(''); --%] - [%- INCLUDE "opac/parts/searchbar.tt2" %] - [%- INCLUDE "opac/parts/library/core_info.tt2"; %] -[%- END; %] diff --git a/Open-ILS/src/templates/opac-new/login.tt2 b/Open-ILS/src/templates/opac-new/login.tt2 deleted file mode 100644 index 0e82edf974..0000000000 --- a/Open-ILS/src/templates/opac-new/login.tt2 +++ /dev/null @@ -1,17 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - basic_search = "f"; - ctx.page_title = l("Account Login") %] -

[% l('Account Login') %]

-
- [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-
-

[% l('Account Login Form') %]

- [% INCLUDE "opac/parts/login/form.tt2" %] -
-
-
-[%- END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/circ_history/export.tt2 b/Open-ILS/src/templates/opac-new/myopac/circ_history/export.tt2 deleted file mode 100644 index 55059cde42..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/circ_history/export.tt2 +++ /dev/null @@ -1,38 +0,0 @@ -[%- PROCESS "opac/parts/misc_util.tt2"; - USE CSVFilter 'csv'; - USE date; - SET DATE_FORMAT = l('%m/%d/%Y'); -%] -[%- l('Title') | csv -%] -[%- l('Author') | csv -%] -[%- l('Checkout Date') | csv -%] -[%- l('Due Date') | csv -%] -[%- l('Date Returned') | csv -%] -[%- l('Barcode') | csv -%] -[%- l('Call Number') | csv -%] -[%- l('Format') | csv 'last' %] -[% FOREACH circ IN ctx.csv.circs; - attrs = { marc_xml => circ.marc_xml }; - PROCESS get_marc_attrs args=attrs; - formats = []; - FOR format IN attrs.all_formats; - formats.push(format.label); - END; --%] -[%- IF circ.circ.target_copy.call_number.id == -1 -%] - [%- circ.circ.target_copy.dummy_title | csv -%] - [%- circ.circ.target_copy.dummy_author | csv -%] -[%- ELSIF attrs.title -%] - [%- attrs.title | csv -%] - [%- attrs.author | csv -%] -[%- END -%] -[%- date.format(ctx.parse_datetime(circ.circ.xact_start), DATE_FORMAT) | csv-%] -[%- date.format(ctx.parse_datetime(circ.circ.due_date), DATE_FORMAT) | csv -%] -[%- IF circ.circ.checkin_time; - date.format(ctx.parse_datetime(circ.circ.checkin_time), DATE_FORMAT) | csv; - ELSE; -%] -, -[%- END -%] -[%- circ.circ.target_copy.barcode | csv -%] -[%- circ.circ.target_copy.call_number.label | csv -%] -[%- formats.join('+') | csv 'last' %] -[% END -%] diff --git a/Open-ILS/src/templates/opac-new/myopac/ebook_place_hold.tt2 b/Open-ILS/src/templates/opac-new/myopac/ebook_place_hold.tt2 deleted file mode 100644 index cefea21a36..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/ebook_place_hold.tt2 +++ /dev/null @@ -1,36 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - PROCESS "opac/parts/hold_status.tt2"; - PROCESS "opac/parts/myopac/column_sort_support.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "ebook_place_hold"; -%] -

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

-
- -
- [% l('Place Hold on E-Item') %] -
-
- - -
[% l(
- -
-[% END %] - diff --git a/Open-ILS/src/templates/opac-new/myopac/list/print.tt2 b/Open-ILS/src/templates/opac-new/myopac/list/print.tt2 deleted file mode 100644 index fa3988f7f0..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/list/print.tt2 +++ /dev/null @@ -1 +0,0 @@ -[%- ctx.csv.template_output.data -%] diff --git a/Open-ILS/src/templates/opac-new/myopac/list/update.tt2 b/Open-ILS/src/templates/opac-new/myopac/list/update.tt2 deleted file mode 100644 index 2275df6592..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/list/update.tt2 +++ /dev/null @@ -1,44 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "lists/update" -%] - - - -[% 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') %] -
-
-[% END %] -[% END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/main_pay_init.tt2 b/Open-ILS/src/templates/opac-new/myopac/main_pay_init.tt2 deleted file mode 100644 index 835571070f..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/main_pay_init.tt2 +++ /dev/null @@ -1,15 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "main"; - myopac_main_page = "pay" %] -
- -
- [% l('Processing...') %]

- [% l('Processing your payment may take some time.') %]
- [% l("Please do not Refresh or use your browser's Back button or your credit card may be charged more than once.") %]
-
- -
-[% END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/messages.tt2 b/Open-ILS/src/templates/opac-new/myopac/messages.tt2 deleted file mode 100644 index 1cecd7041f..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/messages.tt2 +++ /dev/null @@ -1,16 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "messages"; - limit = (ctx.patron_messages_limit.defined) ? ctx.patron_messages_limit : 20; - offset = (ctx.patron_messages_offset.defined) ? ctx.patron_messages_offset : 0; - count = (ctx.patron_messages_count.defined) ? ctx.patron_messages_count : 0; - display_single = (ctx.display_single_message.defined) ? ctx.display_single_message : 0; -%] -

[% l('My Messages') %]

-[% IF display_single; - PROCESS "opac/myopac/messages/single_message.tt2"; -ELSE; - PROCESS "opac/myopac/messages/list.tt2"; -END %] -[% END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/receipt_email.tt2 b/Open-ILS/src/templates/opac-new/myopac/receipt_email.tt2 deleted file mode 100644 index 15b744f8cf..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/receipt_email.tt2 +++ /dev/null @@ -1,21 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "prefs" %] - [% IF ctx.email_receipt_result; # result should be undef on success %] -
- [% l('Error preparing receipt:') %] - - [% ctx.email_receipt_result.desc | html %] - -
- [% ELSE %] -
- [% l('Your receipt will be emailed to [_1]', ctx.user.email) | html %] -
- [% END %] -

- [ [% - l("Back to Payments History") %] ] -

-[% END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/receipt_print.tt2 b/Open-ILS/src/templates/opac-new/myopac/receipt_print.tt2 deleted file mode 100644 index 64237e2cd4..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/receipt_print.tt2 +++ /dev/null @@ -1,26 +0,0 @@ -[%# sic! no wrapper %] - - - - [% l('Receipt') %] - - - [% IF ctx.printable_receipt.template_output %] - - [% ctx.printable_receipt.template_output.data %] - - [% ELSE %] -
- [% l( - 'Error preparing receipt: [_1]', - (ctx.printable_receipt.textcode ? ctx.printable_receipt.textcode _ ' / ' _ ctx.printable_receipt.desc : 0) || - ctx.printable_receipt.error_output.data || - l('No receipt data returned from server') - ) | html %] -
- [% END %] -
-

[ [% - l("Back to Payments History") %] ]

- - diff --git a/Open-ILS/src/templates/opac-new/myopac/reservations.tt2 b/Open-ILS/src/templates/opac-new/myopac/reservations.tt2 deleted file mode 100644 index ff995fccbe..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/reservations.tt2 +++ /dev/null @@ -1,39 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "reservations"; -%] -

[% l('Reservations') %]

-[% IF ctx.reservations.size %] - - - - - - - - - [% FOREACH r IN ctx.reservations %] - - - - - - - - [% END %] -
[% l('Resource type') %][% l('Start time') %][% l('End time') %][% l('Pickup location') %][% l('Status') %]
[% r.resource_type_name %][% date.format(ctx.parse_datetime(r.start_time, r.pickup_lib), DATE_FORMAT _ ' %I:%M %p') %][% date.format(ctx.parse_datetime(r.end_time, r.pickup_lib), DATE_FORMAT _ ' %I:%M %p') %][% r.pickup_name %] - [% IF r.cancel_time %] - [% l('Canceled') %] - [% ELSIF r.pickup_time %] - [% l('Checked Out') %] - [% ELSIF r.capture_time %] - [% l('Ready for Pickup') %] - [% ELSE %] - [% l('Reserved') %] - [% END %] -
-[% ELSE %] - [% l('You have no current reservations') %] -[% END %] -[% END %] diff --git a/Open-ILS/src/templates/opac-new/myopac/update_password_msg.tt2 b/Open-ILS/src/templates/opac-new/myopac/update_password_msg.tt2 deleted file mode 100644 index 23d5914d3b..0000000000 --- a/Open-ILS/src/templates/opac-new/myopac/update_password_msg.tt2 +++ /dev/null @@ -1,3 +0,0 @@ -
-[% l('Note: The password must be at least 7 characters in length, contain at least one letter (a-z/A-Z), and contain at least one number.'); %] -
\ No newline at end of file diff --git a/Open-ILS/src/templates/opac-new/parts/acjs.tt2 b/Open-ILS/src/templates/opac-new/parts/acjs.tt2 deleted file mode 100644 index 9d4eaa2fc3..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/acjs.tt2 +++ /dev/null @@ -1,76 +0,0 @@ - - diff --git a/Open-ILS/src/templates/opac-new/parts/cart.tt2 b/Open-ILS/src/templates/opac-new/parts/cart.tt2 deleted file mode 100644 index 84514133f5..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/cart.tt2 +++ /dev/null @@ -1,30 +0,0 @@ -
-
- - -
- -
diff --git a/Open-ILS/src/templates/opac-new/parts/chilifresh.tt2 b/Open-ILS/src/templates/opac-new/parts/chilifresh.tt2 deleted file mode 100644 index 937e20f3f7..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/chilifresh.tt2 +++ /dev/null @@ -1,17 +0,0 @@ -[%- 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/opac-new/parts/ebook_api/avail.tt2 b/Open-ILS/src/templates/opac-new/parts/ebook_api/avail.tt2 deleted file mode 100644 index 9df0465cc4..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/ebook_api/avail.tt2 +++ /dev/null @@ -1,41 +0,0 @@ -[%- -# 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/opac-new/parts/ebook_api/base_js.tt2 b/Open-ILS/src/templates/opac-new/parts/ebook_api/base_js.tt2 deleted file mode 100644 index 668b5fab3e..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/ebook_api/base_js.tt2 +++ /dev/null @@ -1,95 +0,0 @@ -[% -# 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/opac-new/parts/ebook_api/login_js.tt2 b/Open-ILS/src/templates/opac-new/parts/ebook_api/login_js.tt2 deleted file mode 100644 index 23ed256086..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/ebook_api/login_js.tt2 +++ /dev/null @@ -1,41 +0,0 @@ - diff --git a/Open-ILS/src/templates/opac-new/parts/filter_group_selector.tt2 b/Open-ILS/src/templates/opac-new/parts/filter_group_selector.tt2 deleted file mode 100644 index e03033ef7a..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/filter_group_selector.tt2 +++ /dev/null @@ -1,28 +0,0 @@ -[%- - # If caller passes a list of possible filter_groups - # search all until we find some values - IF !filter_group.size; filter_group = [filter_group]; END; - group = ''; - FOR code IN filter_group; - group = ctx.search_filter_groups.$code; - LAST IF group AND group.entries.size; - END; - name = name || "fg:" _ group.code; - id = id || group.code _ "_selector"; - class = class || ''; - values = values || CGI.param(name); - IF size AND size < 1; size = group.entries.size; END; --%] - - - diff --git a/Open-ILS/src/templates/opac-new/parts/filtersort.tt2 b/Open-ILS/src/templates/opac-new/parts/filtersort.tt2 deleted file mode 100644 index 29903524f8..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/filtersort.tt2 +++ /dev/null @@ -1,29 +0,0 @@ - diff --git a/Open-ILS/src/templates/opac-new/parts/goog_analytics.tt2 b/Open-ILS/src/templates/opac-new/parts/goog_analytics.tt2 deleted file mode 100644 index 5070537eef..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/goog_analytics.tt2 +++ /dev/null @@ -1,18 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - IF google_analytics.enabled == 'true' %] - - - -[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/hold_error_messages.tt2 b/Open-ILS/src/templates/opac-new/parts/hold_error_messages.tt2 deleted file mode 100644 index 407ea52daf..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/hold_error_messages.tt2 +++ /dev/null @@ -1,40 +0,0 @@ -[% - # XXX It might be cleaner to move this into its own file or something. - # - # The following hash should have fail_parts as keys and user/patron-friendly - # strings as values. If the system returns an event with a fail_part when - # you attempt to place a hold and the fail part matches something in this - # hash, this is the message that will be displayed to the user. Wait until - # these are used to pass them through l() for i18n. - - FAIL_PART_MSG_MAP = { - "actor.usr.barred" => l("The patron is barred"), - "asset.copy.circulate" => l("The item does not circulate"), - "asset.copy_location.circulate" => l("Items from this shelving location do not circulate"), - "asset.copy.status" => l("The item cannot circulate at this time"), - "circ.holds.target_skip_me" => l("The item's circulation library does not fulfill holds"), - "config.circ_matrix_circ_mod_test" => l("The patron has too many items of this type checked out"), - "config.circ_matrix_test.circulate" => l("Circulation rules reject this item as non-circulatable"), - "config.hold_matrix_test.holdable" => l("Hold rules reject this item as unholdable"), - "config.hold_matrix_test.max_holds" => l("The patron has reached the maximum number of holds"), - "config.rule_age_hold_protect.prox" => l("The item is too new to transit this far"), - "item.holdable" => l("The item is not holdable"), - "location.holdable" => l("The item's location is not holdable"), - "status.holdable" => l("The item is not in a holdable status"), - "no_item" => l("The system could not find this item"), - "no_ultimate_items" => l("The system could not find any items to match this hold request"), - "no_matchpoint" => l("System rules do not define how to handle this item"), - "no_user" => l("The system could not find this patron"), - "transit_range" => l("The item cannot transit this far") - }; - - - # This works like the above has, but instead of fail_parts for keys, use - # the textcode of the event. This will only be consulted for events - # that do not have a fail_part matching something in the above hash. - # Wait until these are used to pass them through l() for i18n. - - EVENT_MSG_MAP = { - "PATRON_EXCEEDS_FINES" => l("Patron has reached the maximum fine amount") - }; -%] diff --git a/Open-ILS/src/templates/opac-new/parts/js.tt2 b/Open-ILS/src/templates/opac-new/parts/js.tt2 deleted file mode 100644 index 28b043d4ef..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/js.tt2 +++ /dev/null @@ -1,176 +0,0 @@ - - -[% 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/opac-new/parts/library/core_info.tt2 b/Open-ILS/src/templates/opac-new/parts/library/core_info.tt2 deleted file mode 100644 index cdaf0473e4..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/library/core_info.tt2 +++ /dev/null @@ -1,56 +0,0 @@ -[%- - opac_root = ctx.opac_root; - IF ctx.kpac_root; - opac_root = ctx.kpac_root; - END; --%] -
-
-

[% ctx.library.name | html %]

- - [%- - lib_url = ctx.get_org_setting(ctx.library.id, 'lib.info_url'); - IF lib_url; - ''; - END; - -%] - - [%- IF ctx.hours; %] - [%- INCLUDE "opac/parts/library/hours.tt2"; %] - [% END; -%] - - [%- IF (ctx.library.email OR ctx.library.phone); %] -

[% l('Contact information') %]

- [%- IF ctx.library.email; %] -
[% l('Email address: ') %][% ctx.library.email | html %]
- [%- END; %] - [%- IF ctx.library.phone; %] -
[% l('Telephone: ') %][% ctx.library.phone | html %]
- [% END; %] - [% END; %] - - [%- IF ctx.library.mailing_address; %] -
-
-

[% l('Mailing address') %]

- [% ctx.mailing_address.street1 | html %] - [%- IF ctx.mailing_address.street2; "
"; ctx.mailing_address.street2 | html; END; %] -
- [% ctx.mailing_address.city | html %]
- [% ctx.mailing_address.state | html %]
- [% ctx.mailing_address.country | html %]
- [% ctx.mailing_address.post_code | html %]
-
-
- [%- END; %] - - [%- IF ctx.library.parent_ou; %] -

[% l('Branch relationship') %]

-
[% l('Parent library: ') %] - [% ctx.parent.name | html %] -
- [% END; -%] - -
-
-
diff --git a/Open-ILS/src/templates/opac-new/parts/library/hours.tt2 b/Open-ILS/src/templates/opac-new/parts/library/hours.tt2 deleted file mode 100644 index d0bf5b9bd0..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/library/hours.tt2 +++ /dev/null @@ -1,103 +0,0 @@ -[% - UNLESS TIME_FORMAT; - TIME_FORMAT = '%l:%M %p'; - END; - - time_format = TIME_FORMAT; - - USE date (format = time_format); - today = date.format(format = '%Y-%m-%d '); - # We need to add "today" to the opening/closing hours for Date input --%] -

[% l('Opening hours') %]

- -[%- - open = today _ ctx.hours.dow_0_open; - close = today _ ctx.hours.dow_0_close; - IF open == close; -%] -
[% l('Monday: closed') %]
-[%- ELSE %] -
[% - l('Monday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_1_open; - close = today _ ctx.hours.dow_1_close; - IF open == close; -%] -
[% l('Tuesday: closed') %]
-[%- ELSE %] -
[% - l('Tuesday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_2_open; - close = today _ ctx.hours.dow_2_close; - IF open == close; -%] -
[% l('Wednesday: closed') %]
-[%- ELSE %] -
[% - l('Wednesday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_3_open; - close = today _ ctx.hours.dow_3_close; - IF open == close; -%] -
[% l('Thursday: closed') %]
-[%- ELSE %] -
[% - l('Thursday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_4_open; - close = today _ ctx.hours.dow_4_close; - IF open == close; -%] -
[% l('Friday: closed') %]
-[%- ELSE %] -
[% - l('Friday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_5_open; - close = today _ ctx.hours.dow_5_close; - IF open == close; -%] -
[% l('Saturday: closed') %]
-[%- ELSE %] -
[% - l('Saturday: [_1] - [_2]', '', - '') -%] -
-[%- END %] - -[%- - open = today _ ctx.hours.dow_6_open; - close = today _ ctx.hours.dow_6_close; - IF open == close; -%] -
[% l('Sunday: closed') %]
-[%- ELSE %] -
[% - l('Sunday: [_1] - [_2]', '', - '') -%] -
-[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/library_name_link_from_ou.tt2 b/Open-ILS/src/templates/opac-new/parts/library_name_link_from_ou.tt2 deleted file mode 100644 index 54e085b535..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/library_name_link_from_ou.tt2 +++ /dev/null @@ -1,22 +0,0 @@ -[%- - opac_root = ctx.opac_root; - IF ctx.kpac_root; - opac_root = ctx.kpac_root; - END; - - # Requires a "fleshed_ou" (aou) object defined. - # Allow fleshed circ_libs - org_id = fleshed_ou.id; - org_name = fleshed_ou.name; - org_sname = fleshed_ou.shortname; - - lib_url = ctx.get_org_setting(org_id, 'lib.info_url'); - prefer_external_url = ctx.get_org_setting(org_id, 'lib.prefer_external_url'); - UNLESS lib_url && prefer_external_url; - lib_url = mkurl(opac_root _ '/library/' _ org_sname, {}, 1); - END; - IF lib_url; ''; END; - ''; org_name | html; ''; - IF lib_url; ''; END; --%] - diff --git a/Open-ILS/src/templates/opac-new/parts/multi_hold_select.tt2 b/Open-ILS/src/templates/opac-new/parts/multi_hold_select.tt2 deleted file mode 100644 index 020245b9b3..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/multi_hold_select.tt2 +++ /dev/null @@ -1,15 +0,0 @@ -[% # Check if we need to do anything. - hold_type = CGI.param('hold_type'); - max_holds = ctx.get_org_setting(ctx.default_pickup_lib, 'circ.holds.max_duplicate_holds'); - can_dup = ctx.has_perm('CREATE_DUPLICATE_HOLDS', ctx.default_pickup_lib); - IF ctx.hold_data.size == 1 && (hold_type == 'M' || hold_type == 'T') && max_holds && max_holds > 1 && can_dup; -%] -

- - -

-[% END %] diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/column_sort_support.tt2 b/Open-ILS/src/templates/opac-new/parts/myopac/column_sort_support.tt2 deleted file mode 100644 index 6d5ba47ce7..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/myopac/column_sort_support.tt2 +++ /dev/null @@ -1,36 +0,0 @@ -[%# Produce a URL for a given field that cycles for sorting from - "nothing" to "ascending" to "descending" then back to "nothing". -%] -[% MACRO sort_url(field) - IF (CGI.param('sort') == field); - SWITCH CGI.param('sort_type'); - CASE "asc"; - mkurl('',{sort=>field, sort_type=>'desc'},1); - CASE "desc"; - mkurl('',{sort=>field, sort_type=>'asc'}, 1); - END; - ELSE; - mkurl('',{sort=>field, sort_type=>'asc'}, 1); - END; -%] -[%# SET click_sort = l("click to sort") %] -[%# SET click_sort = "title=\"$click_sort\"" %] - -[%# Produce arrows to indicate the sorting status of the column %] -[% MACRO sort_indicator(field) - IF (CGI.param('sort') == field); - SWITCH CGI.param('sort_type'); - CASE "asc"; -" ▲"; - CASE "desc"; -" ▼"; - END; - END; -%] - -[%# Column headers for sortable columns %] -[% MACRO sort_head(field, field_label) - BLOCK %] -[% l(field_label) %][%- sort_indicator(field) %] -[% END -%] diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/main_refund_policy.tt2 b/Open-ILS/src/templates/opac-new/parts/myopac/main_refund_policy.tt2 deleted file mode 100644 index d0207224ac..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/myopac/main_refund_policy.tt2 +++ /dev/null @@ -1,18 +0,0 @@ - - -
- [% l('Important! You must have a printed receipt ' _ - 'to be eligible for a refund on lost items ' _ - '(regulations allow for no exceptions).') - %] -
- - [% l('To ensure your necessary receipt information ' _ - 'is not lost, enter your email address above ' _ - 'and a receipt will be emailed to you. Otherwise, ' _ - 'make certain you have a printed receipt in hand ' _ - 'before closing the payment receipt screen.') - %] - - - diff --git a/Open-ILS/src/templates/opac-new/parts/myopac/prefs_hints.tt2 b/Open-ILS/src/templates/opac-new/parts/myopac/prefs_hints.tt2 deleted file mode 100644 index dc90c92895..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/myopac/prefs_hints.tt2 +++ /dev/null @@ -1,5 +0,0 @@ -

- [% l('Ensure your account has a valid email address so that we can notify ' _ - 'you about available holds, items that are about to be overdue, and ' _ - 'overdue items!') %] -

diff --git a/Open-ILS/src/templates/opac-new/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac-new/parts/pref_lib_display.tt2 deleted file mode 100644 index 9fe7d9cecf..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/pref_lib_display.tt2 +++ /dev/null @@ -1,7 +0,0 @@ -[%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %] -[% - l('Preferred library: [_1]', '' _ ctx.get_aou(ctx.pref_ou).name _ ''); - IF NOT ctx.is_staff %][% l('?') %][% END; %] - -[%- END; %] diff --git a/Open-ILS/src/templates/opac-new/parts/preserve_params.tt2 b/Open-ILS/src/templates/opac-new/parts/preserve_params.tt2 deleted file mode 100644 index 3517f58e31..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/preserve_params.tt2 +++ /dev/null @@ -1,9 +0,0 @@ -[%- -UNLESS params; - params = ['locg', 'loc', 'query', 'qtype', 'sort']; -END; -FOR param IN params; - IF CGI.param(param); %] - - [%- END; -END; %] diff --git a/Open-ILS/src/templates/opac-new/parts/record/authors.tt2 b/Open-ILS/src/templates/opac-new/parts/record/authors.tt2 deleted file mode 100644 index 25dac9a5cc..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/authors.tt2 +++ /dev/null @@ -1,196 +0,0 @@ -[%- - -PROCESS "opac/parts/relators.tt2"; - -author_cnt = 0; -authors = [ - { - type => 'author', - label => l('Author'), - xpath => '//*[@tag="100"]|//*[@tag="110"]|//*[@tag="111"]' - }, { - type => 'added', - label => l('Added Author'), - xpath => '//*[@tag="700"]|//*[@tag="710"]|//*[@tag="711"]' - }, { - type => 'cast', - label => l('Cast'), - xpath => '//*[@tag="511"][@ind1="1"]' - }, { - type => 'notes', - label => l('Author Notes: '), - xpath => '' # Comes from added content... - } -]; - -BLOCK find_hl_value; - outlist = []; - norm_needle = PROCESS normalize_string(unnorm_string=needle); - FOREACH hl IN attrs.display_field_list; - norm_value = PROCESS normalize_string(unnorm_string=hl.value); - outlist.push(hl.$f) IF norm_value == norm_needle; - END; - - outlist.0; -END; - -BLOCK normalize_string; - unnorm_string.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+',' ').replace('^\s+','').replace('\s+$',''); -END; - -BLOCK normalize_qterm; - PROCESS normalize_string(unnorm_string=subfield.textContent); -END; - -BLOCK normalize_authors; - link_term = link_term _ ' ' _ sf; - sf_raw = PROCESS normalize_qterm; - qterm = qterm _ ' ' _ sf_raw; - indexed_term = 1; -END; - -BLOCK build_author_links; - FOR node IN ctx.marc_xml.findnodes(xpath); - author_cnt = author_cnt + 1; - contrib_ref = '#schemacontrib' _ author_cnt; - iprop = ''; # schema.org item type / property - link_term = ''; # Linked term (e.g. Personal name + Fuller form of name) - supp_term = ''; # Supplementary terms - qterm = ''; # Search query - tlabels = []; - birthdate = ''; - deathdate = ''; - graphics = []; - tag = node.getAttribute('tag'); - FOR subfield IN node.childNodes; - indexed_term = ''; - NEXT UNLESS subfield.nodeName == "subfield"; - code = subfield.getAttribute('code'); - IF code == '4'; - relcode = subfield.textContent.substr(0,3); - tlabels.push( relators.$relcode || label ); - END; - IF code == 'e'; - tlabels.push( subfield.textContent() ); - indexed_term = 1; - END; - IF code == '6'; - target_field = tag; - linked_fields = [subfield.textContent()]; - get_linked_880s; - END; - NEXT UNLESS code.match('[a-z]'); - sf = subfield.textContent | html; - - # Only Persons have birth/death dates in schema.org - # Match personal/corporate/conference MODS subfields - IF tag.substr(1,2) == '00'; - IF code.match('[abcqu]'); - PROCESS normalize_authors; - END; - IF code.match('d'); - IF subfield.textContent.match('^\s*\d{4}'); - birthdate = subfield.textContent.replace('^\s*(\d{4}).*$', '$1'); - END; - IF subfield.textContent.match('-\d{4}.*$'); - deathdate = subfield.textContent.replace('^\s*.{4}\-(\d{4}).*$', '$1'); - END; - indexed_term = 1; - sf_raw = PROCESS normalize_qterm; - qterm = qterm _ ' ' _ sf_raw; - END; - ELSIF tag.substr(1,2) == '10'; - IF code.match('[abcdn]'); - PROCESS normalize_authors; - END; - ELSIF code.match('[acdeq]'); - PROCESS normalize_authors; - END; - UNLESS indexed_term; - supp_term = supp_term _ ' ' _ sf; - END; - END; - url = mkurl(ctx.opac_root _ '/results', {query => qterm.replace('^\s*(.*?)\s*$', '$1'), qtype => 'author'}, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms)); - tlabel = tlabels.join(', '); - tlabels = []; - author_type = (tlabel || label) | html; - - # schema.org changes - IF type == 'author'; - IF tag.substr(1,2) == '10' && args.schema.itemtype && args.schema.itemtype.match('MusicAlbum'); - iprop = ' typeof="MusicGroup" property="byArtist"'; - ELSIF tag.substr(1,2) == '00'; - iprop = ' typeof="Person" property="author"'; - ELSE; - iprop = ' typeof="Organization" property="author"'; - END; - ELSIF type == 'added'; - IF tag.substr(1,2) == '00'; - iprop = ' typeof="Person" property="contributor'; - ELSE; - iprop = ' typeof="Organization" property="contributor'; - END; - IF relcode; - iprop = iprop _ ' http://id.loc.gov/vocabulary/relators/' _ relcode; - END; - iprop = iprop _ '"'; - END; - - link_term = link_term.replace('^\s+', ''); - match_term = link_term _ ' ' _ birthdate _ ' ' _ deathdate; - matching_author_hl = PROCESS find_hl_value needle=match_term f=attrs.hl_field; - - authtml = ' '; - IF iprop; authtml = authtml _ ''; END; - IF matching_author_hl; - authtml = authtml _ matching_author_hl; - ELSE; - authtml = authtml _ link_term; - END; - IF iprop; authtml = authtml _ ''; END; - IF birthdate AND !matching_author_hl; - authtml = authtml _ ' ' _ birthdate _ '-'; - END; - IF deathdate AND !matching_author_hl; - authtml = authtml _ '' _ deathdate _ ''; - END; - authtml = authtml _ ''; # End search link - - # Display supplemental terms (mostly about the author's work) - IF supp_term; - authtml = authtml _ ' ' _ supp_term; - END; - - # Display linked 880 fields - FOREACH link880 IN graphics; - diratt = ''; - IF link880.dir; - diratt = ' dir="' _ link880.dir _ '"'; - END; - authtml = authtml _ ' '; - link880.value | html; - authtml = authtml _ ''; - END; - authtml = authtml _ ' (' _ author_type _ '). '; - authtml = authtml _ ''; # End author span - authlist.push(authtml); - END; -END; -%] - -
-[%- FOREACH author IN authors; - NEXT UNLESS author.xpath; - authlist = []; - PROCESS build_author_links( - xpath=author.xpath, label=author.label, type=author.type - ); - IF authlist.size; - FOREACH authtml IN authlist; - authtml; - END; - END; -END %] -
- - diff --git a/Open-ILS/src/templates/opac-new/parts/record/contents.tt2 b/Open-ILS/src/templates/opac-new/parts/record/contents.tt2 deleted file mode 100644 index db80b475c2..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/contents.tt2 +++ /dev/null @@ -1,217 +0,0 @@ -[%- -contents = [ - { - display_field => 'general_note', - label => l('General Note: '), - xpath => '//*[@tag="500"]' - }, { - label => l('With Note: '), - xpath => '//*[@tag="501"]' - }, { - display_field => 'thesis', - label => l('Dissertation Note: '), - xpath => '//*[@tag="502"]' - }, { - display_field => 'bibliography', - label => l('Bibliography, etc. Note: '), - xpath => '//*[@tag="504"]' - }, { - display_field => 'toc', - label => l('Formatted Contents Note: '), - xpath => '//*[@tag="505"]' - }, { - label => l('Restrictions on Access Note: '), - xpath => '//*[@tag="506"]' - }, { - label => l('Scale Note for Graphic Material: '), - xpath => '//*[@tag="507"]' - }, { - display_field => 'production_credits', - label => l('Creation/Production Credits Note: '), - xpath => '//*[@tag="508"]' - }, { - label => l('Citation/References Note: '), - xpath => '//*[@tag="510"]' - }, { - display_field => 'performers', - label => l('Participant or Performer Note: '), - xpath => '//*[@tag="511"]' - }, { - label => l('Type of Report and Period Covered Note: '), - xpath => '//*[@tag="513"]' - }, { - label => l('Data Quality Note: '), - xpath => '//*[@tag="514"]' - }, { - label => l('Numbering Peculiarities Note: '), - xpath => '//*[@tag="515"]' - }, { - label => l('Type of Computer File or Data Note: '), - xpath => '//*[@tag="516"]' - }, { - label => l('Date/Time and Place of an Event Note: '), - xpath => '//*[@tag="518"]' - }, { - display_field => 'abstract', - label => l('Summary, etc.: '), - xpath => '//*[@tag="520"]' - }, { - label => l('Target Audience Note: '), - xpath => '//*[@tag="521"]' - }, { - label => l('Geographic Coverage Note: '), - xpath => '//*[@tag="522"]' - }, { - label => l('Preferred Citation of Described Materials Note: '), - xpath => '//*[@tag="524"]' - }, { - label => l('Supplement Note: '), - xpath => '//*[@tag="525"]' - }, { - label => l('Study Program Information Note: '), - xpath => '//*[@tag="526"]' - }, { - label => l('Additional Physical Form available Note: '), - xpath => '//*[@tag="530"]' - }, { - label => l('Reproduction Note: '), - xpath => '//*[@tag="533"]' - }, { - label => l('Original Version Note: '), - xpath => '//*[@tag="534"]' - }, { - label => l('Location of Originals/Duplicates Note: '), - xpath => '//*[@tag="535"]' - }, { - label => l('Funding Information Note: '), - xpath => '//*[@tag="536"]' - }, { - label => l('System Details Note: '), - xpath => '//*[@tag="538"]' - }, { - label => l('Terms Governing Use and Reproduction Note: '), - xpath => '//*[@tag="540"]' - }, { - label => l('Immediate Source of Acquisition Note: '), - xpath => '//*[@tag="541"]' - }, { - label => l('Information Relating to Copyright Status: '), - xpath => '//*[@tag="542"]' - }, { - label => l('Location of Other Archival Materials Note: '), - xpath => '//*[@tag="544"]' - }, { - label => l('Biographical or Historical Data: '), - xpath => '//*[@tag="545"]' - }, { - label => l('Language Note: '), - xpath => '//*[@tag="546"]' - }, { - label => l('Former Title Complexity Note: '), - xpath => '//*[@tag="547"]' - }, { - label => l('Issuing Body Note: '), - xpath => '//*[@tag="550"]' - }, { - label => l('Entity and Attribute Information Note: '), - xpath => '//*[@tag="552"]' - }, { - label => l('Cumulative Index/Finding Aids Note: '), - xpath => '//*[@tag="555"]' - }, { - label => l('Information About Documentation Note: '), - xpath => '//*[@tag="556"]' - }, { - label => l('Ownership and Custodial History: '), - xpath => '//*[@tag="561"]' - }, { - label => l('Copy and Version Identification Note: '), - xpath => '//*[@tag="562"]' - }, { - label => l('Binding Information: '), - xpath => '//*[@tag="563"]' - }, { - label => l('Case File Characteristics Note: '), - xpath => '//*[@tag="565"]' - }, { - label => l('Methodology Note: '), - xpath => '//*[@tag="567"]' - }, { - label => l('Linking Entry Complexity Note: '), - xpath => '//*[@tag="580"]' - }, { - label => l('Publications About Described Materials Note: '), - xpath => '//*[@tag="581"]' - }, { - label => l('Action Note: '), - xpath => '//*[@tag="583"]' - }, { - label => l('Accumulation and Frequency of Use Note: '), - xpath => '//*[@tag="584"]' - }, { - label => l('Exhibitions Note: '), - xpath => '//*[@tag="585"]' - }, { - label => l('Awards Note: '), - xpath => '//*[@tag="586"]' - }, { - label => l('Source of Description Note: '), - xpath => '//*[@tag="588"]' - } -]; - -BLOCK render_contents; - xpath = xpath || '//*[starts-with(@tag,"5")]'; - FOR node IN ctx.marc_xml.findnodes(xpath); - all_content = []; - graphics = []; - FOR subfield IN node.childNodes; - NEXT UNLESS subfield.nodeName == "subfield"; - code = subfield.getAttribute('code'); - IF code == '6'; - linked_fields = [subfield.textContent()]; - target_field = node.getAttribute('tag'); - get_linked_880s; - END; - NEXT UNLESS code.match('[a-z]'); - all_content.push(subfield.textContent); - END; - total_contents = all_content.join(" ").replace('\s+$', ''); - %] [% "
"; total_contents | html ; "
"; - FOREACH link880 IN graphics; - '
'; - link880.value | html; - '
'; - END; - END; -END; - -BLOCK render_all_contents; - FOREACH cont IN contents; - content = ''; - df = cont.display_field; - IF df AND attrs.hl.$df.size; - content = '' _ attrs.hl.$df.join('
'); - ELSE; - content = PROCESS render_contents(xpath=cont.xpath); - END; - IF content.match('\S'); --%] - - [% cont.label %] - [% content %] - - [%- END; %] - [%- END; %] -[%- END %] - -[%- content_html = PROCESS render_all_contents; - IF content_html.length > 0; -%] -

[% l('Content descriptions') %]

- - -[%- content_html %] - -
-[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/record/issues-db.tt2 b/Open-ILS/src/templates/opac-new/parts/record/issues-db.tt2 deleted file mode 100644 index 2864161ddf..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/issues-db.tt2 +++ /dev/null @@ -1,199 +0,0 @@ -[%- -expand_path = CGI.param('sepath') || []; -expand_path = expand_path.list; # sic - -seoffset_list = CGI.param('seoffset') || []; -seoffset_list = seoffset_list.list; # sic - -IF expand_path.size == 0 AND seoffset_list.size == 0; - seoffset_list = [0,0]; # compensate for $auto_expand_first; see ML -END; - -selimit = CGI.param('selimit') || 10; -ght_sepath = []; -ght_depth = 0; - -VIEW grouped_holding_tree; - BLOCK list; - level_description = item.shift; - level_description.caption = - level_description.caption.replace('[\(\)]', ''); - - '
'; - prev_seoffset_list = seoffset_list.slice(0, ght_depth); - next_seoffset_list = seoffset_list.slice(0, ght_depth); - - prev_seoffset_list.$ght_depth = prev_seoffset_list.$ght_depth - selimit; - IF prev_seoffset_list.$ght_depth < 0; - prev_seoffset_list.$ght_depth = 0; - END; - - has_more = 0; - at_deepest_level = 0; - - next_seoffset_list.$ght_depth = next_seoffset_list.$ght_depth + selimit; - IF item.0.units; - INCLUDE "opac/parts/record/copy_table.tt2" serial_holdings=item; - "
"; - - at_deepest_level = 1; - IF NOT item.last.label; - has_more = 1; - END; - ELSE; - FOREACH node IN item; - IF NOT node.label; - has_more = 1; - LAST; - END; - - IF node.value; - ght_sepath.push(node.value); - new_seoffsets = seoffset_list.slice(0, ght_depth); - new_seoffsets.push(0); - - expand_link = mkurl( - '', {'sepath' => ght_sepath, 'seoffset' => new_seoffsets}, - 0, 'issues' - ); - - collapse_sepath = ght_sepath.slice(0, -2); - IF collapse_sepath.size == 0; - collapse_clear_params = ['sepath']; - ELSE; - collapse_clear_params = 0; - END; - - collapse_link = mkurl( - '', { - 'sepath' => collapse_sepath, - 'seoffset' => new_seoffsets.slice(0, -2) - }, collapse_clear_params, 'issues' - ); - - "
"; - IF node.children.size; - # TODO: make images or figure out a CSS trick or - # something. I doubt we can count on all OPAC clients - # having adequate fonts to cover these Unicode glyphs. - "▼ "; node.label; "
"; - - IF node.children.size; - ght_depth = ght_depth + 1; - view.print(node.children); - ght_depth = ght_depth - 1; - END; - - waste = ght_sepath.pop; - ELSE; - "
"; node.label; "
"; - at_deepest_level = 1; - END; - END; - END; - - to_clear = 0; - new_sepath_end = ght_depth - 1; - IF new_sepath_end < 0; - to_clear = ['sepath']; - new_sepath = []; - ELSE; - new_sepath = expand_path.slice(0, ght_depth - 1); - END; - - # So the "holdings" level of the tree is sorted ascending, while all - # the higher levels are sorted descending. This seems weird until you - # look at it. I dunno. I think it feels right. It could be changed I - # guess. Anyway, this means we have to be careful about which - # paging link we label "earlier" and which one we label "later." - - next_link = ''; prev_link = ''; - IF has_more; - next_link = 'LABEL_HERE  '; - END; - IF seoffset_list.$ght_depth > 0; - prev_link = 'LABEL_HERE  '; - END; - - IF at_deepest_level; - prev_link.replace('LABEL_HERE', '« ' _ l('Earlier issues')); - next_link.replace('LABEL_HERE', l('Later issues') _ ' »'); - ELSE; - # XXX this is really bad for i18n (notice the sloppy pluralization), - # but then the middle layer for serials only knows English names - # for things like "month". There's a bigger problem to solve - # here... - caption = level_description.caption; - IF level_description.display_grouping == 'chron'; - caption = caption _ 's'; - END; - next_link.replace( - 'LABEL_HERE', - '« ' _ l('Earlier') _ ' ' _ caption - ); - prev_link.replace( - 'LABEL_HERE', - l('Later') _ ' ' _ caption _ ' »' - ); - END; - '
'; - END; -END; - -VIEW holding_summary_tree; - BLOCK hash; - '
'; - ctx.get_aou(item.org_unit).name; "
"; - FOREACH summary IN item.holding_summaries; - IF summary.holdings; - twisty = '▼ '; - link = mkurl( - '', {}, - ['sid','stype','selimit','sepath','seoffset'], 'issues' - ); - link_title = l('Collapse'); - ELSE; - twisty = '► '; - link = mkurl( - '', {sid => summary.id, stype => summary.summary_type}, - ['selimit','sepath','seoffset'], 'issues' - ); - link_title = l('Expand'); - END; - ''; twisty; - ''; - summary.generated_coverage.join(", "); - '
'; - IF summary.holdings; - grouped_holding_tree.print(summary.holdings); - END; - END; - FOREACH child IN item.children; - view.print(child); - END; - '
'; - END; -END %] -
- [% holding_summary_tree.print(ctx.holding_summary_tree) %] -
-
- [% slimit = CGI.param('slimit') || 10; - soffset = CGI.param('soffset') || 0; - soffset_prev = soffset - slimit; - IF soffset_prev < 0; soffset_prev = 0; END; - soffset_next = soffset + slimit; - %] - [% IF soffset > 0 %] - soffset_next}, ['sid','stype','sepath','selimit','seoffset'], 'issues') %]">[% l('Next') %] - [% END %] -
diff --git a/Open-ILS/src/templates/opac-new/parts/record/issues-mfhd.tt2 b/Open-ILS/src/templates/opac-new/parts/record/issues-mfhd.tt2 deleted file mode 100644 index bd6bb97cf2..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/issues-mfhd.tt2 +++ /dev/null @@ -1,43 +0,0 @@ -[% IF ctx.mfhd_summaries.size; %] -
- -[% - mfhd = { - basic_holdings = l('Volumes'), - basic_holdings_add = l('Additional Volume Information'), - supplement_holdings = l('Supplements'), - supplement_holdings_add = l('Additional Supplement Information'), - index_holdings = l('Indexes'), - index_holdings_add = l('Additional Index Information'), - online = l('Online'), - missing = l('Missing'), - incomplete = l('Incomplete'), - }; - - FOREACH serial IN ctx.mfhd_summaries; - printed_mfhd_header = 0; - FOREACH type IN mfhd.keys; - NEXT UNLESS serial.$type.size; - IF !printed_mfhd_header; %] - - - - [% printed_mfhd_header = 1; - END; %] - - - - - [% END; - IF printed_mfhd_header; %] - - - - [% END; %] - [% END %] -
[% l('Holdings summary ([_1])', serial.location) | html %]
[% mfhd.$type %][% - FOR thing IN serial.$type; - thing.join(", ") | html; - END %]
-
-[% END %] diff --git a/Open-ILS/src/templates/opac-new/parts/record/issues.tt2 b/Open-ILS/src/templates/opac-new/parts/record/issues.tt2 deleted file mode 100644 index 998e2d64d9..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/issues.tt2 +++ /dev/null @@ -1,8 +0,0 @@ -
- [% - IF ctx.holding_summary_tree; - INCLUDE 'opac/parts/record/issues-db.tt2'; # "new" serials holdings - END; - %] - [% INCLUDE 'opac/parts/record/issues-mfhd.tt2' # mfhd-based "classic" serials %] -
diff --git a/Open-ILS/src/templates/opac-new/parts/record/refworks.tt2 b/Open-ILS/src/templates/opac-new/parts/record/refworks.tt2 deleted file mode 100644 index b8775c7ceb..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/refworks.tt2 +++ /dev/null @@ -1,20 +0,0 @@ -[%- - # Default to the root of the org unit tree in the absence of a specific library - loc = ctx.search_ou; - - # Get the full name of the library - ou_name = ctx.get_aou(loc).name | uri; - - # Generate the gross RefWorks URL, based on parameters from config.tt2 - rw_uri = ctx.refworks.url _ - '/express/expressimport.asp?vendor=' _ - ou_name _ - '&filter=MARC+Format&database=All+MARC+Formats&' _ - 'encoding=65001&url=http%3A%2F%2F' _ - CGI.server_name _ - '/opac/extras/supercat/marctxt/record/' _ - ctx.bre_id; -%] -
- [% l('Export to RefWorks') %] -
diff --git a/Open-ILS/src/templates/opac-new/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac-new/parts/record/subjects.tt2 deleted file mode 100644 index f987125c38..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/subjects.tt2 +++ /dev/null @@ -1,144 +0,0 @@ -[% - subjects = [ - { - display_field => 'subject', - label => l('Subject: '), - xpath => '//*[@tag="600" or @tag="610" or @tag="611" or @tag="630" or @tag="650" or @tag="651"]' - }, { - display_field => 'genre', - label => l('Genre: '), - facet => 'identifier|genre', - joiner => ' -- ', - xpath => '//*[@tag="655"]', - subfields => '[abvxyz]' - }, { - label => l('Topic Heading: '), - xpath => '//*[@tag="690"]' - }, { - label => l('Geographic Setting: '), - xpath => '//*[@tag="691"]' - }, { - label => l('Biographical Subject: '), - xpath => '//*[@tag="692"]' - }, { - label => l('Character Attributes: '), - xpath => '//*[@tag="693"]' - }, { - label => l('Setting: '), - xpath => '//*[@tag="698"]' - }, { - label => l('Time Period: '), - xpath => '//*[@tag="699"]' - } - ]; - - BLOCK render_subject; - xpath = s.xpath || '//*[starts-with(@tag,"6")]'; - FOR node IN ctx.marc_xml.findnodes(xpath); - ''; - all_terms = []; - graphics = []; - FOR subfield IN node.childNodes; - NEXT UNLESS subfield.nodeName == "subfield"; - code = subfield.getAttribute('code'); - IF code == '6'; - linked_fields = [subfield.textContent()]; - target_field = node.getAttribute('tag'); - get_linked_880s; - END; - - NEXT UNLESS code.match('[a-z]'); - IF s.subfields; NEXT UNLESS code.match(s.subfields); END; - - IF code.match('[vxyz]'); " > "; END; - - # at this point, we actually have a partial term to use. - raw_term = subfield.textContent; - single_term = raw_term | html; - - # facets should be used as-is - IF !s.facet; raw_term = raw_term.replace('\-', ' ').replace('[#"^$\+,:;&|\[\]()]', ''); END; - - all_terms.push(raw_term); - - IF s.facet; - total_term = s.facet _ '[' _ all_terms.join(s.joiner).replace('\s+$', '') _ ']'; - ELSE; - total_term = all_terms.join(" ").replace('\s+$', ''); - END; - - %][% single_term %] [%- - - END; - IF all_terms.size; "
"; END; - FOREACH link880 IN graphics; - '
'; - link880.value | html; - '
'; - END; - ''; - END; - END; - - BLOCK render_hl_subject; - total_term = s.value; - IF s.facet; - total_term = s.facet _ '[' _ s.value _ ']'; - END; - - ''; - %][% s.$f %] [%- - ''; - END; -%] - -[% BLOCK render_all_subjects; - FOREACH subj IN subjects; - content = ''; - df = subj.display_field; - IF df AND attrs.hl_display_fields.$df.size; - content = []; - FOREACH hl_s IN attrs.hl_display_fields.$df; - hl_s.facet = subj.facet; - next_s = PROCESS render_hl_subject(s=hl_s,f=attrs.hl_field); - content.push(next_s); - END; - - content = content.join('
'); -%] - - - - - - - -
[% subj.label %][% content %]
-[% - ELSE; - content = PROCESS render_subject(s=subj); - IF content.match('\S'); -%] - - - - - - - -
[% subj.label %][% content %]
- [%- END; %] - [%- END; %] - [%- END; %] -[%- END %] - -[%- subject_html = PROCESS render_all_subjects; - IF subject_html.length > 0; -%] -

[% l('Search for related items by subject') %]

-[%- subject_html %] -[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/record/summaryplus.tt2 b/Open-ILS/src/templates/opac-new/parts/record/summaryplus.tt2 deleted file mode 100644 index 23e21ea1a2..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/record/summaryplus.tt2 +++ /dev/null @@ -1,20 +0,0 @@ -
- [%- IF attrs.summary %] -
- [% l('Summary: ') %] - [% FOR sum IN attrs.summaries %] - [% IF !loop.first; '
'; END %] - [% sum | html %] - [% END %] -
- [%- END %] - [%- IF ENV.OILS_CONTENT_CAFE_USER %] - - [% ident = attrs.isbn_clean || attrs.upc %] - - [%- END %] -
- diff --git a/Open-ILS/src/templates/opac-new/parts/relators.tt2 b/Open-ILS/src/templates/opac-new/parts/relators.tt2 deleted file mode 100644 index ff9550d31a..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/relators.tt2 +++ /dev/null @@ -1,276 +0,0 @@ -[%- -# Generated from http://www.loc.gov/marc/relators/relacode.html -# using the build/tools/relator_map script -relators = { - 'abr' => l('Abridger'), - 'acp' => l('Art copyist'), - 'act' => l('Actor'), - 'adi' => l('Art director'), - 'adp' => l('Adapter'), - 'aft' => l('Author of afterword, colophon, etc.'), - 'anl' => l('Analyst'), - 'anm' => l('Animator'), - 'ann' => l('Annotator'), - 'ant' => l('Bibliographic antecedent'), - 'ape' => l('Appellee'), - 'apl' => l('Appellant'), - 'app' => l('Applicant'), - 'aqt' => l('Author in quotations or text abstracts'), - 'arc' => l('Architect'), - 'ard' => l('Artistic director'), - 'arr' => l('Arranger'), - 'art' => l('Artist'), - 'asg' => l('Assignee'), - 'asn' => l('Associated name'), - 'ato' => l('Autographer'), - 'att' => l('Attributed name'), - 'auc' => l('Auctioneer'), - 'aud' => l('Author of dialog'), - 'aui' => l('Author of introduction, etc.'), - 'aus' => l('Screenwriter'), - 'aut' => l('Author'), - 'bdd' => l('Binding designer'), - 'bjd' => l('Bookjacket designer'), - 'bkd' => l('Book designer'), - 'bkp' => l('Book producer'), - 'blw' => l('Blurb writer'), - 'bnd' => l('Binder'), - 'bpd' => l('Bookplate designer'), - 'brd' => l('Broadcaster'), - 'brl' => l('Braille embosser'), - 'bsl' => l('Bookseller'), - 'cas' => l('Caster'), - 'ccp' => l('Conceptor'), - 'chr' => l('Choreographer'), - 'clb' => l('Collaborator'), - 'cli' => l('Client'), - 'cll' => l('Calligrapher'), - 'clr' => l('Colorist'), - 'clt' => l('Collotyper'), - 'cmm' => l('Commentator'), - 'cmp' => l('Composer'), - 'cmt' => l('Compositor'), - 'cnd' => l('Conductor'), - 'cng' => l('Cinematographer'), - 'cns' => l('Censor'), - 'coe' => l('Contestant-appellee'), - 'col' => l('Collector'), - 'com' => l('Compiler'), - 'con' => l('Conservator'), - 'cor' => l('Collection registrar'), - 'cos' => l('Contestant'), - 'cot' => l('Contestant-appellant'), - 'cou' => l('Court governed'), - 'cov' => l('Cover designer'), - 'cpc' => l('Copyright claimant'), - 'cpe' => l('Complainant-appellee'), - 'cph' => l('Copyright holder'), - 'cpl' => l('Complainant'), - 'cpt' => l('Complainant-appellant'), - 'cre' => l('Creator'), - 'crp' => l('Correspondent'), - 'crr' => l('Corrector'), - 'crt' => l('Court reporter'), - 'csl' => l('Consultant'), - 'csp' => l('Consultant to a project'), - 'cst' => l('Costume designer'), - 'ctb' => l('Contributor'), - 'cte' => l('Contestee-appellee'), - 'ctg' => l('Cartographer'), - 'ctr' => l('Contractor'), - 'cts' => l('Contestee'), - 'ctt' => l('Contestee-appellant'), - 'cur' => l('Curator'), - 'cwt' => l('Commentator for written text'), - 'dbp' => l('Distribution place'), - 'dfd' => l('Defendant'), - 'dfe' => l('Defendant-appellee'), - 'dft' => l('Defendant-appellant'), - 'dgg' => l('Degree granting institution'), - 'dgs' => l('Degree supervisor'), - 'dis' => l('Dissertant'), - 'dln' => l('Delineator'), - 'dnc' => l('Dancer'), - 'dnr' => l('Donor'), - 'dpc' => l('Depicted'), - 'dpt' => l('Depositor'), - 'drm' => l('Draftsman'), - 'drt' => l('Director'), - 'dsr' => l('Designer'), - 'dst' => l('Distributor'), - 'dtc' => l('Data contributor'), - 'dte' => l('Dedicatee'), - 'dtm' => l('Data manager'), - 'dto' => l('Dedicator'), - 'dub' => l('Dubious author'), - 'edc' => l('Editor of compilation'), - 'edm' => l('Editor of moving image work'), - 'edt' => l('Editor'), - 'egr' => l('Engraver'), - 'elg' => l('Electrician'), - 'elt' => l('Electrotyper'), - 'eng' => l('Engineer'), - 'enj' => l('Enacting jurisdiction'), - 'etr' => l('Etcher'), - 'evp' => l('Event place'), - 'exp' => l('Expert'), - 'fac' => l('Facsimilist'), - 'fds' => l('Film distributor'), - 'fld' => l('Field director'), - 'flm' => l('Film editor'), - 'fmd' => l('Film director'), - 'fmk' => l('Filmmaker'), - 'fmo' => l('Former owner'), - 'fmp' => l('Film producer'), - 'fnd' => l('Funder'), - 'fpy' => l('First party'), - 'frg' => l('Forger'), - 'gis' => l('Geographic information specialist'), - 'grt' => l('Graphic technician'), - 'his' => l('Host institution'), - 'hnr' => l('Honoree'), - 'hst' => l('Host'), - 'ill' => l('Illustrator'), - 'ilu' => l('Illuminator'), - 'ins' => l('Inscriber'), - 'inv' => l('Inventor'), - 'isb' => l('Issuing body'), - 'itr' => l('Instrumentalist'), - 'ive' => l('Interviewee'), - 'ivr' => l('Interviewer'), - 'jud' => l('Judge'), - 'jug' => l('Jurisdiction governed'), - 'lbr' => l('Laboratory'), - 'lbt' => l('Librettist'), - 'ldr' => l('Laboratory director'), - 'led' => l('Lead'), - 'lee' => l('Libelee-appellee'), - 'lel' => l('Libelee'), - 'len' => l('Lender'), - 'let' => l('Libelee-appellant'), - 'lgd' => l('Lighting designer'), - 'lie' => l('Libelant-appellee'), - 'lil' => l('Libelant'), - 'lit' => l('Libelant-appellant'), - 'lsa' => l('Landscape architect'), - 'lse' => l('Licensee'), - 'lso' => l('Licensor'), - 'ltg' => l('Lithographer'), - 'lyr' => l('Lyricist'), - 'mcp' => l('Music copyist'), - 'mdc' => l('Metadata contact'), - 'med' => l('Medium'), - 'mfp' => l('Manufacture place'), - 'mfr' => l('Manufacturer'), - 'mod' => l('Moderator'), - 'mon' => l('Monitor'), - 'mrb' => l('Marbler'), - 'mrk' => l('Markup editor'), - 'msd' => l('Musical director'), - 'mte' => l('Metal-engraver'), - 'mtk' => l('Minute taker'), - 'mus' => l('Musician'), - 'nrt' => l('Narrator'), - 'opn' => l('Opponent'), - 'org' => l('Originator'), - 'orm' => l('Organizer'), - 'osp' => l('Onscreen presenter'), - 'oth' => l('Other'), - 'own' => l('Owner'), - 'pan' => l('Panelist'), - 'pat' => l('Patron'), - 'pbd' => l('Publishing director'), - 'pbl' => l('Publisher'), - 'pdr' => l('Project director'), - 'pfr' => l('Proofreader'), - 'pht' => l('Photographer'), - 'plt' => l('Platemaker'), - 'pma' => l('Permitting agency'), - 'pmn' => l('Production manager'), - 'pop' => l('Printer of plates'), - 'ppm' => l('Papermaker'), - 'ppt' => l('Puppeteer'), - 'pra' => l('Praeses'), - 'prc' => l('Process contact'), - 'prd' => l('Production personnel'), - 'pre' => l('Presenter'), - 'prf' => l('Performer'), - 'prg' => l('Programmer'), - 'prm' => l('Printmaker'), - 'prn' => l('Production company'), - 'pro' => l('Producer'), - 'prp' => l('Production place'), - 'prs' => l('Production designer'), - 'prt' => l('Printer'), - 'prv' => l('Provider'), - 'pta' => l('Patent applicant'), - 'pte' => l('Plaintiff-appellee'), - 'ptf' => l('Plaintiff'), - 'pth' => l('Patent holder'), - 'ptt' => l('Plaintiff-appellant'), - 'pup' => l('Publication place'), - 'rbr' => l('Rubricator'), - 'rcd' => l('Recordist'), - 'rce' => l('Recording engineer'), - 'rcp' => l('Addressee'), - 'rdd' => l('Radio director'), - 'red' => l('Redaktor'), - 'ren' => l('Renderer'), - 'res' => l('Researcher'), - 'rev' => l('Reviewer'), - 'rpc' => l('Radio producer'), - 'rps' => l('Repository'), - 'rpt' => l('Reporter'), - 'rpy' => l('Responsible party'), - 'rse' => l('Respondent-appellee'), - 'rsg' => l('Restager'), - 'rsp' => l('Respondent'), - 'rsr' => l('Restorationist'), - 'rst' => l('Respondent-appellant'), - 'rth' => l('Research team head'), - 'rtm' => l('Research team member'), - 'sad' => l('Scientific advisor'), - 'sce' => l('Scenarist'), - 'scl' => l('Sculptor'), - 'scr' => l('Scribe'), - 'sds' => l('Sound designer'), - 'sec' => l('Secretary'), - 'sgd' => l('Stage director'), - 'sgn' => l('Signer'), - 'sht' => l('Supporting host'), - 'sll' => l('Seller'), - 'sng' => l('Singer'), - 'spk' => l('Speaker'), - 'spn' => l('Sponsor'), - 'spy' => l('Second party'), - 'srv' => l('Surveyor'), - 'std' => l('Set designer'), - 'stg' => l('Setting'), - 'stl' => l('Storyteller'), - 'stm' => l('Stage manager'), - 'stn' => l('Standards body'), - 'str' => l('Stereotyper'), - 'tcd' => l('Technical director'), - 'tch' => l('Teacher'), - 'ths' => l('Thesis advisor'), - 'tld' => l('Television director'), - 'tlp' => l('Television producer'), - 'trc' => l('Transcriber'), - 'trl' => l('Translator'), - 'tyd' => l('Type designer'), - 'tyg' => l('Typographer'), - 'uvp' => l('University place'), - 'vac' => l('Voice actor'), - 'vdg' => l('Videographer'), - 'voc' => l('Vocalist'), - 'wac' => l('Writer of added commentary'), - 'wal' => l('Writer of added lyrics'), - 'wam' => l('Writer of accompanying material'), - 'wat' => l('Writer of added text'), - 'wdc' => l('Woodcutter'), - 'wde' => l('Wood engraver'), - 'win' => l('Writer of introduction'), - 'wit' => l('Witness'), - 'wpr' => l('Writer of preface'), - 'wst' => l('Writer of supplementary textual content'), -} -%] \ No newline at end of file diff --git a/Open-ILS/src/templates/opac-new/parts/result/copy_counts.tt2 b/Open-ILS/src/templates/opac-new/parts/result/copy_counts.tt2 deleted file mode 100644 index dc8aab797c..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/result/copy_counts.tt2 +++ /dev/null @@ -1,41 +0,0 @@ -[%- depths = attrs.copy_counts.size; - depth = 0; - displayed_ous = {}; - hiding_disabled = ctx.org_hiding_disabled(); - WHILE depth < depths; - org_unit = ctx.get_aou(attrs.copy_counts.$depth.org_unit); - ou_name = org_unit.name; - displayed_ous.$ou_name = 1; - IF attrs.copy_counts.$depth.count > 0 AND ( - hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)); -%] -
-[% IF ctx.get_aou(attrs.copy_counts.$depth.org_unit).opac_visible == 't' %] - [% l('[_1] of [quant,_2,copy,copies] available at [_3].', - attrs.copy_counts.$depth.available, - attrs.copy_counts.$depth.count, - ou_name) | html - %] -[% END %] -
-[%- END; - depth = depth + 1; - END; - - depth = attrs.plib_copy_counts.size - 1; - org_unit = ctx.get_aou(attrs.plib_copy_counts.$depth.org_unit); - ou_name = org_unit.name; - UNLESS displayed_ous.exists(ou_name); - -%] -[%- IF attrs.plib_copy_counts.$depth.count > 0 AND ( - hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)) %] -
[% - l('[_1] of [quant,_2,copy,copies] available at [_3].', - attrs.plib_copy_counts.$depth.available, - attrs.plib_copy_counts.$depth.count, - ou_name) | html - %] -
-[%- END %] -[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/result/lowhits_purchase.tt2 b/Open-ILS/src/templates/opac-new/parts/result/lowhits_purchase.tt2 deleted file mode 100644 index ff34338282..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/result/lowhits_purchase.tt2 +++ /dev/null @@ -1,6 +0,0 @@ -[%# XXX Is this block generally desired?

- Still not finding what you are looking for?
- Request that your library purchase the material you are looking for by making a - Purchase Request
- Note: You must be logged in to make a Purchase Request
-

%] diff --git a/Open-ILS/src/templates/opac-new/parts/sms_number_textbox.tt2 b/Open-ILS/src/templates/opac-new/parts/sms_number_textbox.tt2 deleted file mode 100644 index 395b5a36d1..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/sms_number_textbox.tt2 +++ /dev/null @@ -1,5 +0,0 @@ -[% IF NOT sms_number_hide_label; ''; END; %] - -[% IF NOT sms_number_hide_hint; l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); END; %] diff --git a/Open-ILS/src/templates/opac-new/parts/stripe.tt2 b/Open-ILS/src/templates/opac-new/parts/stripe.tt2 deleted file mode 100644 index ea4ca04a61..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/stripe.tt2 +++ /dev/null @@ -1,35 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2" %] -[% IF ctx.use_stripe %] - - -[%- END %] diff --git a/Open-ILS/src/templates/opac-new/parts/tips.tt2 b/Open-ILS/src/templates/opac-new/parts/tips.tt2 deleted file mode 100644 index f4e73ed08b..0000000000 --- a/Open-ILS/src/templates/opac-new/parts/tips.tt2 +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- [% l("Click on a folder icon in the sidebar to access related quick searches") %] - [% l("If you don't find what you want try expanding your search using the range selector at the right of the search bar") %] -
- [% l("Tip:") %] -
-
- diff --git a/Open-ILS/src/templates/opac-new/password_reset_msg.tt2 b/Open-ILS/src/templates/opac-new/password_reset_msg.tt2 deleted file mode 100644 index c453768111..0000000000 --- a/Open-ILS/src/templates/opac-new/password_reset_msg.tt2 +++ /dev/null @@ -1,3 +0,0 @@ -
-[% l('Note: You must have a valid email address associated with your library account. If not, please contact your local library for further assistance.'); %] -
diff --git a/Open-ILS/src/templates/opac-new/place_hold.tt2 b/Open-ILS/src/templates/opac-new/place_hold.tt2 deleted file mode 100644 index 2262b8d3fc..0000000000 --- a/Open-ILS/src/templates/opac-new/place_hold.tt2 +++ /dev/null @@ -1,21 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - IF ctx.is_staff; - basic_search = "f"; - END; - ctx.page_title = l("Place Hold") %] -

[% l('Hold Placement') %]

- [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-
- [% IF ctx.hold_attempt_made %] - [% INCLUDE "opac/parts/place_hold_result.tt2" %] - [% ELSE %] - [% INCLUDE "opac/parts/place_hold.tt2" %] - [% END %] -
-
-
-[%- END %] diff --git a/Open-ILS/src/templates/opac-new/record/email.tt2 b/Open-ILS/src/templates/opac-new/record/email.tt2 deleted file mode 100644 index 88cf88cd76..0000000000 --- a/Open-ILS/src/templates/opac-new/record/email.tt2 +++ /dev/null @@ -1,32 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/config.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - ctx.page_title = l("Record Detail") %] - [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-
-
- [% IF ctx.user.email %] -

[% l('Your email has been queued for delivery to [_1]', ctx.user.email ) %]

- [% ELSE %] -

- [% here_link_text = ""; - here_link_text = here_link_text _ l("here"); - here_link_text = here_link_text _ ""; - l('Your account does not currently have an email address set. Set your email address [_1]', here_link_text) %] -

- [% END %] -
- [% IF ctx.redirect_to %] -

[ [% l("Return") %] ]

- [% ELSE %] -

[ [% l("Back to Record") %] ]

- [% END %] -
-
-
-
-[% END %] - diff --git a/Open-ILS/src/templates/opac-new/sms_cn.tt2 b/Open-ILS/src/templates/opac-new/sms_cn.tt2 deleted file mode 100644 index 7c958d1939..0000000000 --- a/Open-ILS/src/templates/opac-new/sms_cn.tt2 +++ /dev/null @@ -1,52 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - ctx.page_title = l("Send Call Number via Text/SMS") %] -

[% l('Send Call Number via Text/SMS') %]

-
- [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-
-
-
-

- [% IF ctx.event != -1 %] -
- - [% IF ctx.origin.search('redirect'); - SET ctx.origin = ctx.opac_root _ '/record/' _ CGI.url_param('rec') _ '?query=' _ - CGI.url_param('query') _ ';qtype=' _ CGI.url_param('qtype') _ ';locg=' _ CGI.url_param('locg'); - END %] - - [% IF ctx.sms_notify %] -

[% l('Your message has been sent!') %]

- [% l('Return to record') %] - 
[% ctx.event.template_output.data %]
- [% ELSE %] -

[% l('Text call number') %]

- [% l('Return to record') %] - 
[% ctx.event.template_output.data %]
-
- - - [% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_warning="true" %]
- [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]
- -
[% l('Note: carrier charges may apply'); %] -
- [% END %] - [% ELSE %] - [% l('SMS not enabled for this site.') %] - [% END %] -

-
-
-
-
-[%- END %] diff --git a/Open-ILS/src/templates/opac-new/temp_warn.tt2 b/Open-ILS/src/templates/opac-new/temp_warn.tt2 deleted file mode 100644 index 8fdea970af..0000000000 --- a/Open-ILS/src/templates/opac-new/temp_warn.tt2 +++ /dev/null @@ -1,27 +0,0 @@ -[%- PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/base.tt2"; - INCLUDE "opac/parts/topnav.tt2"; - ctx.page_title = l("Basket Warning") %] -

[% l('Basket Warning') %]

- [% INCLUDE "opac/parts/searchbar.tt2" %] -
-
-

[% l('You are adding to a basket.') %] - [% IF ctx.user ; - l('This information will disappear when you logout, unless you save it to a permanent list.'); - ELSE; - l('This information will disappear when you end your session, unless you login and save it to a permanent list.'); - END - %]

-
- - - -
- -
-
-
-
-[%- END %] diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/bootstrap-opac.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/bootstrap-opac.adoc new file mode 100644 index 0000000000..9e84ba8dce --- /dev/null +++ b/docs/RELEASE_NOTES_NEXT/OPAC/bootstrap-opac.adoc @@ -0,0 +1,28 @@ +New Bootstrap-based OPAC +^^^^^^^^^^^^^^^^^^^^^^^^ + +This release includes a new OPAC with a cleaner, more modern design. + +To enable the new OPAC design, open the _/etc/apache2/eg_vhost.conf_ file. + +Find the following line: + +------------------------------------------------------------------------------ +PerlAddVar OILSWebTemplatePath "/openils/var/templates" +------------------------------------------------------------------------------ + +Add the following line directly below it: + +------------------------------------------------------------------------------ +PerlAddVar OILSWebTemplatePath "/openils/var/templates-bootstrap" +------------------------------------------------------------------------------ + +Be sure that, if you have any local customizations, that they are referenced below +this line. This way, your customizations will still appear in the new OPAC design +(although they may need to be adjusted to better fit the new style). + +You can also turn on the new OPAC for some virtual hosts only, by adding it to the +appropriate virtual host entry. Be sure to reference the OILSWebTemplatePath for +the `templates-bootstrap` directory before referencing any local customizations +used by that virtual host. + -- 2.43.2