Fix Return to record link when texting callnumbers

also localize some strings

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 bdaaddb..cff29f3 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,7 +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');
+    $ctx->{bre_id} = $cgi->param('bre_id');
 
     my $acn_results = $e->json_query({
         select => {

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 8148dd9..4fd913b 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -54,7 +54,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}) %]">Text</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, bre_id => ctx.bre_id}) %]">[% l('Text') | html %]</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/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 6a1dc16..9982bdd 100644 (file)
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -13,33 +13,33 @@
                     [% IF ctx.event != -1 %]
                     <br/>
                     [% IF ctx.sms_notify %]
-                    <h1>Your message has been sent!</h1>
-                    <a href="[% ctx.origin %]">Return to record</a>
+                    <h1>[% l('Your message has been sent!') | html %]</h1>
+                    <a href="[% mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id) %]">[% l('Return to record') | html %]</a>
                     <pre>[% ctx.event.template_output.data %]</pre>
                     [% ELSE %]
-                    <h1>Text call number</h1>
-                    <a href="[% ctx.origin %]">Return to record</a>
+                    <h1>[% l('Text call number') | html %]</h1>
+                    <a href="[% mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id) %]">[% l('Return to record') | html %]</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 %]"/>
+                                <input type="hidden" name="bre_id" value="[% ctx.bre_id %]"/>
                                 [% 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') %]"
-                                    title="[% l('Submit') %]"
-                                    alt="[% l('Submit') %]"
+                                    value="[% l('Submit') | html %]"
+                                    title="[% l('Submit') | html %]"
+                                    alt="[% l('Submit') | html %]"
                                     class="opac-button" />
-                                <br/>[% l('Note: carrier charges may apply'); %]
+                                <br/>[% l('Note: carrier charges may apply') | html %]
                             </blockquote>
                         </form>
                     </blockquote>
                     [% END %]
                     [% ELSE %]
-                    <span>SMS not enabled for this site.</span>
+                    <span>[% l('SMS not enabled for this site.') | html %]</span>
                     [% END %]
                 </p>
             </div>