labels for SMS and Phone Notify widgets

also SMS Number hint and some layout tweaks

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 05505c2..a53359c 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -62,7 +62,7 @@
             </tr>
             <tr>
                 <td>[% l('Default SMS/Text Carrier') %]</td>
-                <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]</td>
+                <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
             </tr>
             <tr>
                 <td>[% l('Default SMS/Text Number') %]</td>
@@ -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 %]/>
+                    [% IF NOT sms_number_hide_hint; l('(Hint: Format XXX-XXX-XXXX works for most carriers)'); END; %]
                 </td>
             </tr>
             [% END %]

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index a75ca01..bd95814 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -80,7 +80,7 @@
                     [% IF ctx.default_phone_notify %]checked="checked"[% END %]/>
                     [% l('Yes, by Phone') %]<br/>
                 <blockquote>
-                    <input type="text" name="phone_notify" [% setting = 'opac.default_phone';
+                    [% l('Phone Number:') %]<input type="text" name="phone_notify" [% setting = 'opac.default_phone';
                     IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
                 </blockquote>
                 [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %]
@@ -88,9 +88,8 @@
                     [% IF ctx.default_sms_notify %]checked="checked"[% END %]/>
                     [% l('Yes, by Text Messaging') %]<br/>
                 <blockquote>
-                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]
-                    <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 %]/>
+                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
+                    [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                 </blockquote>
                 [% END %]
             </blockquote>

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 c118b80..79d84d6 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
@@ -17,6 +17,7 @@
         });
     END;
 %]
+[% IF NOT sms_carrier_hide_label; l('SMS Carrier:'); END; %]
 <select name="sms_carrier">
     [% FOR carrier IN carriers.sort('name','region') -%]
     <option value='[% carrier.id | html %]'[%

diff --git a/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2 b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
new file mode 100644 (file)
index 0000000..6a41c43
--- /dev/null
+++ b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
@@ -0,0 +1,4 @@
+[% IF NOT sms_number_hide_label; l('SMS 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_hint; l('(Hint: Format XXX-XXX-XXXX works for most carriers)'); END; %]

diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 8eb9b70..497bcab 100644 (file)
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -21,9 +21,8 @@
                         <form method="POST">
                             <blockquote>
                                 <input type="hidden" name="copy_id" value="[% ctx.copy_id %]"/>
-                                [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]
-                                <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 %]/>
+                                [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
+                                [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                                 <input type="submit"
                                     name="submit"
                                     value="[% l('Submit') %]"