Merge pull request #197 from ukparliament/development

Development merge
ukparliament · Nov 29, 2024 · 7f27f09 · 7f27f09
2 parents d304f53 + b8d0330
commit 7f27f09
Show file tree

Hide file tree

Showing 46 changed files with 137 additions and 124 deletions.
diff --git a/app/assets/stylesheets/primary.css b/app/assets/stylesheets/primary.css
@@ -166,7 +166,7 @@ div.callout {
 
 /* Object view sections */
 
-#about-this-result {
+.object-claw {
     border: 1px solid black;
     padding: 16px;
 
@@ -409,7 +409,6 @@ table {
         padding: 4px 8px;
         cursor: pointer;
         font-size: small;
-        /*width: 250px;*/
 
         &:hover {
             background: #f1f1f1;

diff --git a/app/assets/stylesheets/search_results.css b/app/assets/stylesheets/search_results.css
@@ -38,6 +38,25 @@
     }
 }
 
+.results-claw {
+    font-size: smaller;
+
+    div.grid-container {
+        display: grid;
+        grid-template-columns: auto auto auto auto auto;
+        grid-template-rows: auto;
+        padding: 0;
+        margin-top: 4px;
+        column-gap: 12px;
+        row-gap: 12px;
+
+        span {
+            align-content: center;
+            word-wrap: anywhere;
+        }
+    }
+}
+
 #search-results {
     width: 100%;
 

diff --git a/app/javascript/controllers/claw_controller.js b/app/javascript/controllers/claw_controller.js
@@ -14,9 +14,12 @@ export default class extends Controller {
     }
 
     showClaw() {
-        const element = document.querySelector("#about-this-result");
-        if (element) {
-            element.toggleAttribute("hidden");
-        }
+        const all_elements = Array.from(document.getElementsByClassName('claw'));
+
+        all_elements.forEach(
+            element => {
+                element.toggleAttribute("hidden");
+            }
+        )
     }
 }
diff --git a/app/views/search/fragments/_about_this_result.html.erb b/app/views/search/fragments/_about_this_result.html.erb
@@ -1,4 +1,4 @@
-<section hidden data-controller="claw" data-action="keydown@document->claw#handleKeyDown" id="about-this-result">
+<section hidden data-controller="claw" data-action="keydown@document->claw#handleKeyDown" id="about-this-result" class="object-claw claw">
   <div class="content-heading-small">Librarians' tools</div>
   <div class="claw-grid-container">
     <% unless object.date.blank? %>

diff --git a/app/views/search/fragments/_search_claw.html.erb b/app/views/search/fragments/_search_claw.html.erb
@@ -0,0 +1,30 @@
+<div hidden class="results-claw claw">
+  <div class="grid-container">
+    <% unless object.timestamp.blank? %>
+      <span class="claw-timestamp"><%= object.timestamp[:value] %></span>
+    <% end %>
+    <% unless object.object_uri.blank? %>
+      <span class="claw-uri"><%= object.object_uri[:value] %></span>
+    <% end %>
+    <% unless object.object_uri.blank? %>
+    <span data-controller="clipboard" class="mini-button-container">
+      <span hidden data-clipboard-target="source" data-clipboard-text="<%= object.object_uri.dig(:value) %>"></span>
+      <button data-action="clipboard#copy" title="Copy" class="page-button">
+        Copy
+      </button>
+    </span>
+    <% end %>
+
+    <% unless object.indexing_link.blank? %>
+      <span class="mini-button-container">
+        <%= link_to 'Indexing', object.indexing_link, target: :_blank, class: 'page-button' %>
+      </span>
+    <% end %>
+
+    <% unless object.solr_deep_link.blank? %>
+      <span class="mini-button-container">
+        <%= link_to 'Solr', object.solr_deep_link, target: :_blank, class: 'page-button' %>
+      </span>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
@@ -76,9 +76,11 @@
       <div class="results-container">
         <%= render 'search_control_panel' %>
 
-        <div>
+        <div data-controller="claw" data-action="keydown@document->claw#handleKeyDown">
           <% @search_data.objects.each do |object| %>
             <%= render object.search_result_partial, object: object unless object.class == NotSupported %>
+            <%= render 'search/fragments/search_claw', object: object %>
+            <hr>
           <% end %>
 
           <% unless @search_data.current_page.blank? || @search_data.total_pages.blank? %>

diff --git a/app/views/search/preliminary_sentences/_edm.haml b/app/views/search/preliminary_sentences/_edm.haml
@@ -3,16 +3,13 @@
     .content-prelim-text#prelim-text
       %span>= object_display_name_link(object.object_name)
       - unless object.primary_sponsor.blank?
-        %span=" tabled by "
+        %span=" tabled by primary sponsor "
         %span>= search_link(object.primary_sponsor)
-        - if object.primary_sponsor_party.blank?
-          %span= " (primary sponsor)"
-        - else
-          %span= " (primary sponsor, "
+        - unless object.primary_sponsor_party.blank?
+          %span= " ("
           %span>= render 'search/fragments/list', items: object.primary_sponsor_party, terminator: '', singular: false
-          %span= ")"
-          %span= " and "
-      %span= " tabled on "
+          %span>= ")"
+      %span= ", on "
       %span>= format_date(object.date_tabled)
       %span= ", in the "
       %span= render 'search/fragments/list', items: object.legislature, terminator: '.', singular: false

diff --git a/app/views/search/results/_bill.html.erb b/app/views/search/results/_bill.html.erb
@@ -64,5 +64,4 @@
       </div>
     </div>
   </div>
-</section>
-<hr/>
+</section>
diff --git a/app/views/search/results/_church_of_england_measure.html.erb b/app/views/search/results/_church_of_england_measure.html.erb
@@ -47,5 +47,4 @@
       </div>
     </div>
   </div>
-</section>
-<hr/>
+</section>
diff --git a/app/views/search/results/_command_paper.html.erb b/app/views/search/results/_command_paper.html.erb
@@ -100,5 +100,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_committee_proceeding.html.erb b/app/views/search/results/_committee_proceeding.html.erb
@@ -69,5 +69,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_deposited_paper.html.erb b/app/views/search/results/_deposited_paper.html.erb
@@ -82,5 +82,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_early_day_motion.html.erb b/app/views/search/results/_early_day_motion.html.erb
@@ -66,5 +66,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_european_deposited_document.html.erb b/app/views/search/results/_european_deposited_document.html.erb
@@ -54,5 +54,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_european_material.html.erb b/app/views/search/results/_european_material.html.erb
@@ -45,5 +45,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb b/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb
@@ -40,5 +40,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb b/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb
@@ -40,5 +40,4 @@
       <div id="house"></div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_european_scrutiny_recommendation.html.erb b/app/views/search/results/_european_scrutiny_recommendation.html.erb
@@ -39,5 +39,4 @@
       <div id="house"></div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_formal_proceeding.html.erb b/app/views/search/results/_formal_proceeding.html.erb
@@ -64,5 +64,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_grand_committee_proceeding.html.erb b/app/views/search/results/_grand_committee_proceeding.html.erb
@@ -66,5 +66,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_house_of_commons_paper.html.erb b/app/views/search/results/_house_of_commons_paper.html.erb
@@ -90,5 +90,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_impact_assessment.html.erb b/app/views/search/results/_impact_assessment.html.erb
@@ -64,5 +64,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_ministerial_correction.html.erb b/app/views/search/results/_ministerial_correction.html.erb
@@ -52,5 +52,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_observation_on_a_petition.html.erb b/app/views/search/results/_observation_on_a_petition.html.erb
@@ -68,5 +68,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_oral_answer_to_question.html.erb b/app/views/search/results/_oral_answer_to_question.html.erb
@@ -75,5 +75,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_oral_question.html.erb b/app/views/search/results/_oral_question.html.erb
@@ -94,5 +94,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_oral_question_time_intervention.html.erb b/app/views/search/results/_oral_question_time_intervention.html.erb
@@ -63,5 +63,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_paper_ordered_to_be_printed.html.erb b/app/views/search/results/_paper_ordered_to_be_printed.html.erb
@@ -89,5 +89,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_paper_petition.html.erb b/app/views/search/results/_paper_petition.html.erb
@@ -50,5 +50,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_parliamentary_committee.erb b/app/views/search/results/_parliamentary_committee.erb
@@ -52,5 +52,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_parliamentary_paper_laid.html.erb b/app/views/search/results/_parliamentary_paper_laid.html.erb
@@ -90,5 +90,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_parliamentary_proceeding.html.erb b/app/views/search/results/_parliamentary_proceeding.html.erb
@@ -68,5 +68,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_private_act.html.erb b/app/views/search/results/_private_act.html.erb
@@ -48,5 +48,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_proceeding_contribution.html.erb b/app/views/search/results/_proceeding_contribution.html.erb
@@ -63,5 +63,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_public_act.html.erb b/app/views/search/results/_public_act.html.erb
@@ -51,5 +51,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>
diff --git a/app/views/search/results/_research_briefing.html.erb b/app/views/search/results/_research_briefing.html.erb
@@ -51,5 +51,4 @@
       </div>
     </div>
   </div>
-</div>
-<hr/>
+</div>