For texting CN's, make it more obvious that...

a text was sent and offer a link back to the original page. Also tweak the
labels and the format hint, and a show a warning about carrier charges.

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

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/SMS.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/SMS.pm
index 8200717..bdaaddb 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/SMS.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/SMS.pm
@@ -28,6 +28,7 @@ sub load_sms_cn {
     $ctx->{sms_notify} = $cgi->param('sms_notify');
     $ctx->{copy_id} = $cgi->param('copy_id');
     $ctx->{query} = $cgi->param('query');
+    $ctx->{origin} = $cgi->param('origin');
 
     my $acn_results = $e->json_query({
         select => {
@@ -51,7 +52,6 @@ sub load_sms_cn {
     $ctx->{orig_params} = $cgi->Vars;
 
     return Apache2::Const::OK;
-    return $self->generic_redirect;
 }
 
 

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index a53359c..d93ceca 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -53,7 +53,7 @@
             </tr>
             [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %]
             <tr>
-                <td>[% l('Notify by SMS/Text by default when a hold is ready for pickup?') %]</td>
+                <td>[% l('Notify by Text by default when a hold is ready for pickup?') %]</td>
                 <td>
                     [% setting = 'opac.hold_notify' %]
                     <input name='[% setting %].sms' type="checkbox"
@@ -61,16 +61,15 @@
                 </td>
             </tr>
             <tr>
-                <td>[% l('Default SMS/Text Carrier') %]</td>
+                <td>[% l('Default Mobile Carrier') %]</td>
                 <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
             </tr>
             <tr>
-                <td>[% l('Default SMS/Text Number') %]</td>
+                <td>[% l('Default Mobile Number') %]</td>
                 <td>
                     [% 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/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 8afecfd..c06c694 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -48,7 +48,7 @@ END;
                 org_name | html
             -%]
             </td>
-            <td header='copy_header_callnumber'>[% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">SMS</a>)[% END %]</td>
+            <td header='copy_header_callnumber'>[% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Text</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td header='copy_header_part'>[% copy_info.part_label | html %]</td>
             [%- 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 79d84d6..c0ed33b 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,7 +17,7 @@
         });
     END;
 %]
-[% IF NOT sms_carrier_hide_label; l('SMS Carrier:'); END; %]
+[% IF NOT sms_carrier_hide_label; l('Mobile carrier:'); END; %]
 <select name="sms_carrier">
     [% FOR carrier IN carriers.sort('name','region') -%]
     <option value='[% carrier.id | html %]'[%
@@ -25,3 +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; %]

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 fcd42b1..8b1c29f 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('SMS Number:'); END; %]
+[% 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_hint; l('(Hint: For most carriers, enter the phone number--including the area code--with no spaces or punctuation. So for example, instead of entering 800-555-1234, enter 8005551234)'); END; %]
+[% IF NOT sms_number_hide_warning; l('Note: carrier charges may apply'); END; %]

diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 497bcab..5211299 100644 (file)
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -11,27 +11,33 @@
             <div>
                 <p>
                     [% IF ctx.event != -1 %]
+                    <br/>
                     [% IF ctx.sms_notify %]
-                    <h1>Call Number sent via SMS/Text</h1>
+                    <h1>Your message has been sent!</h1>
+                    <a href="[% ctx.origin %]">Return to record</a>
+                    <pre>[% ctx.event.template_output.data %]</pre>
                     [% ELSE %]
-                    <h1>Call Number to send via SMS/Text</h1>
-                    [% END %]
+                    <h1>Text call number</h1>
+                    <a href="[% ctx.origin %]">Return to record</a>
                     <pre>[% ctx.event.template_output.data %]</pre>
                     <blockquote>
                         <form method="POST">
                             <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" %]<br/>
+                                [% INCLUDE "opac/parts/sms_number_textbox.tt2" sms_number_hide_warning="true" %]<br/>
                                 <input type="submit"
                                     name="submit"
                                     value="[% l('Submit') %]"
                                     title="[% l('Submit') %]"
                                     alt="[% l('Submit') %]"
                                     class="opac-button" />
+                                <br/>[% l('Note: carrier charges may apply'); %]
                             </blockquote>
                         </form>
                     </blockquote>
+                    [% END %]
                     [% ELSE %]
                     <span>SMS not enabled for this site.</span>
                     [% END %]