-
+
-- [% l("Actions for selected holds") %] --
@@ -83,14 +85,13 @@
%]
- [% IF CGI.param("available") %]
- [% l('Show all') %] |
- [% l("Show only available") %]
- [% ELSE %]
- [% l("Show all") %] |
- [% l("Show only available") %]
- [% END %]
- [% l("holds") %]
+ [% IF CGI.param("available") -%]
+ [% l('Show all holds') %] |
+ [% l("Show only available holds") %]
+ [% ELSE -%]
+ [% l("Show all holds") %] |
+ [% l("Show only available holds") %]
+ [% END -%]
[% l('-- Sort By --') %]
[% l('Title') %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index cf7309a4ce..43eed643bb 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -19,38 +19,46 @@
[% END %]
+ [% setting = 'opac.hold_notify' %]
- [% l('Notify by Email by default when a hold is ready for pickup?') %]
+ [%
+ l('Notify by Email by default when a hold is ready for pickup?')
+ %]
- [% setting = 'opac.hold_notify' %]
-
- [%- IF allow_phone_notifications == 'true' %]
+ [%- IF allow_phone_notifications == 'true';
+ setting = 'opac.hold_notify';
+ -%]
- [% l('Notify by Phone by default when a hold is ready for pickup?') %]
+ [%
+ l('Notify by Phone by default when a hold is ready for pickup?')
+ %]
- [% setting = 'opac.hold_notify' %]
-
+ [% setting = 'opac.default_phone' %]
- [% l('Default Phone Number') %]
+ [% l('Default Phone Number') %]
- [% setting = 'opac.default_phone' %]
-
[%- END %]
- [% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %]
+ [%- IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1;
+ setting = 'opac.hold_notify';
+ -%]
- [% l('Notify by Text by default when a hold is ready for pickup?') %]
+ [%
+ l('Notify by Text by default when a hold is ready for pickup?')
+ %]
- [% setting = 'opac.hold_notify' %]
-
@@ -58,11 +66,11 @@
[% l('Default Mobile Carrier') %]
[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]
+ [% setting = 'opac.default_sms_notify' %]
- [% l('Default Mobile Number') %]
+ [% l('Default Mobile Number') %]
- [% setting = 'opac.default_sms_notify' %]
-
[% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index cd3ba175ab..7f682a29c7 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -18,11 +18,11 @@
[% END %]
+ [%- setting = 'opac.hits_per_page' -%]
- [% l("Search hits per page") %]
+ l("Search hits per page") %]
- [% setting = 'opac.hits_per_page' %]
-
+
[% UNLESS ctx.user_setting_map.$setting;
ctx.user_setting_map.$setting = 10;
END;
@@ -37,57 +37,59 @@
/>
+ [%- setting = 'opac.default_search_location'; -%]
- [% l("Preferred search location") %]
+ [% l("Preferred search location") %]
- [%- setting = 'opac.default_search_location';
- thang = ctx.user.home_ou.id;
+ [%- thang = ctx.user.home_ou.id;
IF ctx.user_setting_map.$setting;
thang = ctx.user_setting_map.$setting;
END;
+ id = setting;
INCLUDE build_org_selector name=setting value=thang;
%]
+ [%- setting = 'opac.default_pickup_location'; -%]
- [% l("Preferred pickup location") %]
+ [% l("Preferred pickup location") %]
- [%- setting = 'opac.default_pickup_location';
- thang = ctx.user.home_ou.id;
+ [%- thang = ctx.user.home_ou.id;
IF ctx.user_setting_map.$setting;
thang = ctx.user_setting_map.$setting;
END;
+ id = setting;
INCLUDE build_org_selector name=setting value=thang can_have_vols_only=1;
%]
+ [%- setting = 'history.circ.retention_start' -%]
- [% l('Keep history of checked out items?') %]
+ [% l('Keep history of checked out items?') %]
- [% setting = 'history.circ.retention_start' %]
-
+ [%- setting = 'history.hold.retention_start' -%]
- [% l('Keep history of holds?') %]
+ [% l('Keep history of holds?') %]
- [% setting = 'history.hold.retention_start' %]
-
+ [%- setting = 'opac.temporary_list_no_warn' -%]
- [% l('Skip warning when adding to temporary book list?') %]
+ [% l('Skip warning when adding to temporary book list?') %]
- [% setting = 'opac.temporary_list_no_warn' %]
-
[% l('ISBN') %]
[% l('ISSN') %]
@@ -18,13 +18,14 @@
-
+
- [% l("Search Library:") %]
+ [%- lib_select_id="numeric_search_library" -%]
+ [% l("Search Library:") %]
[% PROCESS "opac/parts/org_selector.tt2";
- INCLUDE build_org_selector show_loc_groups=1
+ INCLUDE build_org_selector id=lib_select_id show_loc_groups=1
%]
diff --git a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
index 18bb4a4166..7d7a03ad19 100644
--- a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
@@ -17,7 +17,8 @@
+ size ? (' size="' _ size _ '"') : '';
+%] aria-label="[% l('Select item type:') %]">
[% IF none_ok %]
[% none_label ? none_label : l('-- Any --') %]
[% END;
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 62b189894a..d82933d683 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -24,10 +24,12 @@ BLOCK build_org_selector;
# disable the ou-hide scoping altogether.
hiding_disabled = ctx.org_hiding_disabled(value);
- %]
+ -%]
-
- [%
+
+ [%-
WHILE node_stack.size > 0;
node = node_stack.pop();
org_unit = node.org;
@@ -107,6 +109,6 @@ BLOCK build_org_selector;
[% ' ' FOR [0..pad_depth]; display_name | html %]
- [% END %]
+ [%- END %]
-[% END %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 31892fd871..33c45a666b 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -47,8 +47,10 @@
[% IF hdata.parts %]
[% IF hdata.parts.size > 0 %]
- [% hdata.part_required ? l('Select a Part:') : l('Select a Part (optional):') %]
-
+ [%
+ hdata.part_required ? l('Select a Part:') : l('Select a Part (optional):')
+ %]
+
[% IF !hdata.part_required %]
[% l('- All Parts -') %]
[% END %]
@@ -67,33 +69,34 @@
- [% l('Pickup location:') %]
+ [%- org_select_id = 'pickup_lib'; -%]
+
[% l('Notify when hold is ready for pickup?') %]
-
- [% l('Yes, by Email') %]
+ [% l('Yes, by Email') %]
[% l('Email Address:') %] [% ctx.user.email %]
[%- IF allow_phone_notifications == 'true' %]
-
- [% l('Yes, by Phone') %]
+ [% l('Yes, by Phone') %]
- [% l('Phone Number:') %] [% l('Phone Number:') %]
+ [%- ELSIF ctx.user.day_phone; %] value='[% ctx.user.day_phone | html %]' [% END %]/>
[%- END -%]
[% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %]
-
- [% l('Yes, by Text Messaging') %]
+ [% l('Yes, by Text Messaging') %]