swap the sms carrier/number hint/warning

Also add the number formatting hint to Account Preferences -> Notification Preferences

Signed-off-by: Jason Etheridge <jason@esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index d93ceca..7d23021 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -70,6 +70,7 @@
                     [% setting = 'opac.default_sms_notify' %]
                     <input name='[% setting %]' type="text"
                         [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
+                    [% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
                 </td>
             </tr>
             [% END %]

diff --git a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2 b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
index c0ed33b..919ba07 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
@@ -25,4 +25,4 @@
     %]>[% carrier.name | html %] ([% carrier.region | html %])</option>
     [% END -%]
 </select>
-[% IF NOT sms_carrier_hide_hint; l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); END; %]
+[% IF NOT sms_carrier_hide_warning; l('Note: carrier charges may apply'); END; %]

diff --git a/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2 b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
index 8b1c29f..e8d7eb8 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
@@ -1,4 +1,4 @@
 [% IF NOT sms_number_hide_label; l('Mobile number:'); END; %]
 <input type="text" name="sms_notify" [% setting = 'opac.default_sms_notify';
 IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
-[% IF NOT sms_number_hide_warning; l('Note: carrier charges may apply'); 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/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 5211299..6a1dc16 100644 (file)
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -25,8 +25,8 @@
                             <blockquote>
                                 <input type="hidden" name="copy_id" value="[% ctx.copy_id %]"/>
                                 <input type="hidden" name="origin" value="[% ctx.origin %]"/>
-                                [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
-                                [% INCLUDE "opac/parts/sms_number_textbox.tt2" sms_number_hide_warning="true" %]<br/>
+                                [% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_warning="true" %]<br/>
+                                [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                                 <input type="submit"
                                     name="submit"
                                     value="[% l('Submit') %]"