OPAC Tweaks - part 2

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
index 606a7e3..fb3caf9 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
@@ -137,7 +137,10 @@
                                             ' checked="checked"' : '' %]
                                         id='opac.result.ismetabib' />
                                     <label for='opac.result.ismetabib'>
-                                        [% l("Group Formats and Editions") %]</label>
+                                        [% l("Combine Same Title") %]</label>
+                                        <a title="" data-toggle="tooltip" data-original-title="When there are multiple editions or formats of a title, each one will appear as a separate result. Check this box to group them together.">
+                                        <i class="fas fa-question-circle" aria-hidden="true"></i>
+                                        </a>
                                 </div>
                                 [% END %]
                                 <div>

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
index b9ba720..e14261b 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
@@ -410,10 +410,19 @@ ctx.metalinks.push('
                 )
                 %]
                 
-                    <a class="btn btn-action no-dec" role="button" href="[% mkurl(ctx.opac_root _ '/place_hold',
-                    {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]">
-                        <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold') %]</span></a>
-              
+                    [% IF !ctx.is_staff %]
+                        <a class="btn btn-action" role="button" href="[% mkurl(ctx.opac_root _ '/place_hold',
+                        {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]"
+                            class="no-dec">
+                            <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold') %]</span></a>
+                    [% END %]
+                    <!-- PINES WORKAROUND FOR TRADITIONAL CATALOG -->
+                    [% IF ctx.is_staff %]
+                        <a class="btn btn-action" role="button" href="/eg2/en-US/staff/catalog/hold/T?target=[%- ctx.bre_id -%]"
+                            class="no-dec" target="_blank">
+                            <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold (Staff Function)') %]</span></a>
+                    [% END %]
+                    <!-- END WORKAROUND -->
                 [%- END -%]
 
                 [%- IF ebook_api.enabled == 'true' && args.ebook %]

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
index 95563c0..2917fed 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
@@ -68,18 +68,27 @@
                                 record_url_path = ctx.opac_root _ '/results';
                                 add_parms = {metarecord => rec.mmr_id};
                                 del_parms = ['page'];
+                                #PINES for more info link:
+                                    add_parms_info = {metarecord => rec.mmr_id};
+                                    del_parms_info = ['page'];
                             ELSE;
                                 # for MR, bre_id refers to the master and in
                                 # this case, only, record
                                     record_url_path = ctx.opac_root _ '/record/' _ attrs.mr_constituent_ids.0;
                                 add_parms = { badges => rec.badges.join(',') };
                                 del_parms = ['quux'];
+                                #PINES for more info link:
+                                    add_parms_info = {metarecord => rec.mmr_id};
+                                    del_parms_info = ['page'];
                             END;
                             hold_type = 'M';
                         ELSE;
                         record_url_path = ctx.opac_root _ '/record/' _ rec.bre_id;
                         add_parms = { badges => rec.badges.join(',') };
                         del_parms = ['quux'];
+                        #PINES for more info link:
+                            add_parms_info = {metarecord => rec.mmr_id};
+                            del_parms_info = ['page'];
                         hold_type = 'T';
                         END; -%]
 
@@ -382,13 +391,20 @@ src='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/r/[% rec.bre_id | uri %]
 
 
                                         <!--Place Hold Button -->
-
+                                        [% IF !ctx.is_staff %]
                                         <a role="button" href="[% mkurl(ctx.opac_root _ '/place_hold', add_parms, del_parms) %]"
                                             [% html_text_attr('title', l('Place Hold on [_1]', attrs.title)) %]
                                             class="btn btn-action" rel="nofollow" vocab="">
                                             <i class="fas fa-check" aria-hidden="true"></i>
                                             <span class="result_place_hold">[% l('Place Hold') %]</span>
                                         </a>
+                                         [% END %]
+                                         <!-- PINES WORKAROUND FOR TRADITIONAL CATALOG -->
+                                         [% IF ctx.is_staff %]
+                                             <a class="btn btn-action" role="button" href="/eg2/en-US/staff/catalog/hold/T?target=[%- rec.bre_id -%]"
+                                                 class="no-dec" target="_blank">
+                                                 <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold (Staff Function)') %]</span></a>
+                                         [% END %]
                                        
                                         [%- END -%]
 
@@ -446,7 +462,7 @@ src='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/r/[% rec.bre_id | uri %]
                                         [% END %]
                                         
                                         <!-- More info button -->
-                                            <a href="[% mkurl(record_url_path, add_parms, del_parms); %]" role="button" class="btn btn-action" title="[% l("More Info") %]" rel="nofollow" vocab="">
+                                            <a href="[% mkurl(record_url_path, add_parms_info, del_parms_info); %]" role="button" class="btn btn-action" title="[% l("More Info") %]" rel="nofollow" vocab="">
                                                     <i class="fas fa-angle-double-right" aria-hidden="true"></i>
                                                     [% l("More Info") %]
                                              </a>