Local conflict resolution for LP1903767

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

diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
index ab2fd2c..fa610d5 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -925,6 +925,11 @@ div#rdetail_actions_div {
     [%- END %]
 }
 
+div#rdetail_copy_counts {
+    margin-top: 1em;
+}
+
+/*
 span#rdetail_copy_counts {
     display: inline-block;
     vertical-align: top;
@@ -950,6 +955,7 @@ span#rdetail_hold_counts p {
     padding-left: 2em;
     [%- END %]
 }
+*/
 
 #rdetail_image_div {
     [% IF rtl == 't' -%]
@@ -2403,12 +2409,30 @@ a.opac-button-header:hover, #dash_wrapper a.opac-button:hover {
     width: 100%;
 }
 
-#rdetail_record_details {
+.rdetail_record_details {
     clear: both;
     margin-top: 1em;
 }
 
-.rdetail_content {
+h2.rdetail_record_details, #rdetail_copy_counts h2, h2.rdetail_contents,
+h2.rdetail_related_subjects, h2.rdetail_related_series,
+h2.rdetail_other_formats, h2.rdetail_uris {
+    font-size: [% css_fonts.size_biggest %];
+    font-weight: bold;
+}
+
+ul.no-bullets {
+    list-style-type: none;
+    [% IF rtl == 't' -%]
+    margin-right: 0;
+    padding-right: 1.5em;
+    [% ELSE -%]
+    margin-left: 0;
+    padding-left: 1.5em;
+    [% END -%]
+}
+
+.rdetail_content, .rdetail_subject {
     [% IF rtl == 't' -%]
     margin-right: 1.5em;
     padding-right: 1.5em;

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
index 7fdf61b..fdedfcb 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
@@ -1,7 +1,7 @@
 <div id="rdetail_copy_counts">
     <h2 style="font-size:1.7em;">[% l('Available copies') %]</h2>
 
-    <ul>
+    <ul class="no-bullets">
     [%- depths = ctx.copy_summary.size;
         depth = 0;
         displayed_ous = {};
@@ -52,7 +52,7 @@
     </ul>
 
     <h2>[% l('Holds') %]</h2>
-    <ul><li>
+    <ul class="no-bullets"><li>
     [%
         # If org hiding is enabled/relevant, only show
         # counts for copies within the hiding scope.

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2
index b7d447d..23015ce 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2
@@ -59,7 +59,8 @@ END;
 [%- series_anchors = PROCESS render_series;
     IF series_anchors.length > 0; %]
 <h2 class='rdetail_related_series' style="font-size:1.7em;">[% l('Search for related items by series') %]</h2>
-<ul>
+<ul class="no-bullets">
+
     [% series_anchors %]
 </ul>
 [%- END %]

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 8475be1..c8c3e97 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
@@ -74,7 +74,11 @@ ctx.metalinks.push('
                     <button id="btnMore" data-toggle="collapse" data-target="#demo"
                         class="btn btn-action btn-sm my-3"><i class="fas fa-info-circle" aria-hidden="true"></i> [% l('More Details') %]</button>
                     <div id="demo" class="collapse">
+
                         <h2 id='rdetail_record_details' style="font-size:1.5em;">[% l("Record details") %]</h2>
+
+
+
                         <ul class="list-unstyled">
                             [%- IF attrs.hl.isbn.size; FOR isbn IN attrs.hl.isbn %]
                             <li class='rdetail_isbns'>
@@ -255,6 +259,30 @@ ctx.metalinks.push('
                         [%- INCLUDE "opac/parts/record/contents.tt2" %]
                         [%- INCLUDE "opac/parts/record/subjects.tt2" %]
                         [%- INCLUDE "opac/parts/record/series.tt2" %]
+
+                    </div>
+
+                </div>
+                <script>jQuery('#demo').on('hidden.bs.collapse', function () {
+                        jQuery('#btnMore').html("<i class='fas fa-info-circle' aria-hidden='true'></i> More Details");
+                    })
+                    jQuery('#demo').on('shown.bs.collapse', function () {
+                        jQuery('#btnMore').html("<i class='fas fa-info-circle' aria-hidden='true'></i> Less Details");
+                    })
+                    </script>
+
+               <div id="copy_hold_counts">
+
+                [%-
+                # Hold/copy summary
+                IF ctx.copy_summary.0.count;
+                INCLUDE "opac/parts/record/copy_counts.tt2";
+                %]
+
+
+                [%- END %]
+
+                </div> <!-- metarecord_population -->
                         <div>
                             [%-
                             # l( 'mmr id = ' _ ctx.mmr_id );
@@ -267,7 +295,9 @@ ctx.metalinks.push('
 
                             IF args.mmr_unique_bib.size > 1;
                             %]
-                            <h3 style="font-size:1.5em;">[% l("More Options") %]</h3>
+
+                            <h2 class="rdetail_other_formats">[% l("Other Formats and Editions") %]</h2>
+
                             <span class="metarecord_population_format">
                                 [%- IF mmr_attrs.format_label;
 
@@ -326,56 +356,12 @@ ctx.metalinks.push('
                             [% args = save_args; %]
                         </div>
 
-                    </div>
-
-                </div>
-                <script>jQuery('#demo').on('hidden.bs.collapse', function () {
-                        jQuery('#btnMore').html("<i class='fas fa-info-circle' aria-hidden='true'></i> More Details");
-                    })
-                    jQuery('#demo').on('shown.bs.collapse', function () {
-                        jQuery('#btnMore').html("<i class='fas fa-info-circle' aria-hidden='true'></i> Less Details");
-                    })
-                    </script>
-
-               <div id="copy_hold_counts">
-
-                [%-
-                # Hold/copy summary
-                IF ctx.copy_summary.0.count;
-                INCLUDE "opac/parts/record/copy_counts.tt2";
-                %]
-
-
-                [%- END %]
-
-                </div> <!-- metarecord_population -->
-
-                <!-- PINES: Moved Holds block here -->
-                <div>
-                    <h2 style="font-size:1.5em;">[% l('Holds') %]</h2>
-                    <ul>
-                        [%
-                            # If org hiding is enabled/relevant, only show
-                            # counts for copies within the hiding scope.
-                            count_entry = 0;
-                            FOR count_chunk IN ctx.copy_summary;
-                            IF ctx.org_within_hiding_scope(count_chunk.org_unit);
-                            # always true when hiding is disabled
-                            LAST;
-                            END;
-                            count_entry = count_entry + 1;
-                            END;
-                            "<li>"; ctx.record_hold_count; " "; l("current holds");
-                        %]
-                    </ul>
-                </div>
-
 
             </div>
             <!--rdetail_title_div-->
 
             <div class="col-lg-4">
-             <div id="actions" class="mx-auto btn-group btn-group-vertical dropright mt-3">
+             <div id="actions" class="mx-auto btn-group-vertical dropright mt-3">
                 [%- search_ou = ctx.search_ou;
                 IF ctx.place_unfillable ||
                 ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size
@@ -383,12 +369,6 @@ ctx.metalinks.push('
                 )
                 %]
                 
-                    [% 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 -%]"
@@ -396,6 +376,12 @@ ctx.metalinks.push('
                             <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold (Staff Function)') %]</span></a>
                     [% END %]
                     <!-- END WORKAROUND -->
+
+                    <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>
+              
+
                 [%- END -%]
 
                 [%- IF ebook_api.enabled == 'true' && args.ebook %]