Skip to content

Commit 78b2a97

Browse files
tmccannagmcharlt
authored andcommitted
LP2096772 My Account - Send SMS success block
Fixes issue where SMS test success block was appearing all of the time. Also clean up some spacing to make code easier to read. Release-note: Hides SMS test success message until after test is sent. Signed-off-by: Terran McCanna <[email protected]> Signed-off-by: Gina Monti <[email protected]> Signed-off-by: Galen Charlton <[email protected]>
1 parent af38b12 commit 78b2a97

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,38 +93,39 @@
9393
[%- IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1;
9494
setting = 'opac.hold_notify';
9595
-%]
96-
<p class="form-check">
97-
[% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
98-
<input class="form-check-input" onchange="record_change(event)" id='[% setting %].sms' name='[% setting %].sms'
99-
type="checkbox" title="[% sms_label %]"
100-
[% IF (matches = ctx.user_setting_map.$setting.match('sms')); %] checked='checked' [% END %]/>
101-
<label class="form-check-label" for='[% setting %].sms'>[% sms_label %]</label>
102-
</p>
103-
<p>
104-
<label for="sms_carrier">[% l('Default Mobile Carrier') %]</label>
105-
[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]
106-
</p>
107-
[% setting = 'opac.default_sms_notify' %]
108-
<p>
109-
<label for='[% setting %]'>[% l('Default Mobile Number') %]</label>
110-
<input onchange="record_change(event)" id='[% setting %]' name='[% setting %]' type="text" autocomplete="tel-national"
96+
<p class="form-check">
97+
[% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
98+
<input class="form-check-input" onchange="record_change(event)" id='[% setting %].sms' name='[% setting %].sms'
99+
type="checkbox" title="[% sms_label %]"
100+
[% IF (matches = ctx.user_setting_map.$setting.match('sms')); %] checked='checked' [% END %]/>
101+
<label class="form-check-label" for='[% setting %].sms'>[% sms_label %]</label>
102+
</p>
103+
<p class="form-check">
104+
<label for="sms_carrier">[% l('Default Mobile Carrier') %]</label>
105+
[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]
106+
</p>
107+
[% setting = 'opac.default_sms_notify' %]
108+
<p class="form-check">
109+
<label for='[% setting %]'>[% l('Default Mobile Number') %]</label>
110+
<input onchange="record_change(event)" id='[% setting %]' name='[% setting %]' type="text" autocomplete="tel-national"
111111
[% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
112-
[% IF ctx.user_setting_map.$setting; %]
113-
<span class='light_border'>
114-
<button type="button" class="btn btn-sm btn-action" onclick="sendTestSMS(
115-
[% ctx.user.id %], '[% ctx.authtoken %]'
116-
)">
117-
<i class="fas fa-mobile"></i> [% l('Send Test Text Message') %]
118-
</button>
119-
</span><br />
120-
[% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
121-
[% END %]
122-
</td>
123-
</p>
112+
[% IF ctx.user_setting_map.$setting; %]
113+
<span class='light_border'>
114+
<button type="button" class="btn btn-sm btn-action" onclick="sendTestSMS(
115+
[% ctx.user.id %], '[% ctx.authtoken %]'
116+
)">
117+
<i class="fas fa-mobile"></i> [% l('Send Test Text Message') %]
118+
</button>
119+
</span><br />
120+
[% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
121+
[% END %]
122+
</p>
124123
[% END %]
125-
<p role="status" id="test_notification_banner" style="display:none">
124+
125+
<div role="status" id="test_notification_banner" style="display:none;" class="form-check">
126126
[% INCLUDE "opac/myopac/test_notification.tt2" message_type = "sms" %]
127-
</p>
127+
</div>
128+
128129
[% FOR optin IN ctx.opt_in_settings %]
129130
<p class="form-check">
130131
<input class="form-check-input" type='checkbox' name='setting'

Open-ILS/web/js/ui/default/opac/test_notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function sendTestNotification(user_id, hook, authtoken) {
2020
var resp = r.recv();
2121
if (resp) {
2222
var banner = document.getElementById('test_notification_banner');
23-
banner.style.display = 'table-row';
23+
banner.style.display = 'block';
2424
}
2525
}
2626
}).send();

0 commit comments

Comments
 (0)