From 08547af8c656c40d271dec93680f97cc03ebdb6c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Thu, 9 Nov 2023 11:52:07 +0000
Subject: [PATCH 1/4] Refactor search_latest styles

Use more generic class names to reuse on a forthcoming sidebar list.
---
 app/assets/stylesheets/responsive/_search_style.scss | 10 ++++------
 app/views/general/_search_latest.html.erb            |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_search_style.scss b/app/assets/stylesheets/responsive/_search_style.scss
index b4ccc014be..a05229f97c 100644
--- a/app/assets/stylesheets/responsive/_search_style.scss
+++ b/app/assets/stylesheets/responsive/_search_style.scss
@@ -136,13 +136,11 @@ input.use-datepicker[type=text] {
   }
 }
 
-.search_latest {
-  ul.search_latest__list {
-    list-style: none;
-    padding-left: 0;
-  }
+.search_sidebar_list {
+  list-style: none;
+  padding-left: 0;
 
-  li.search_latest__item {
+  .search_sidebar_list__item {
     a:after {
       content: " →"
     }
diff --git a/app/views/general/_search_latest.html.erb b/app/views/general/_search_latest.html.erb
index 660fbb88f4..372e2cb1c5 100644
--- a/app/views/general/_search_latest.html.erb
+++ b/app/views/general/_search_latest.html.erb
@@ -1,10 +1,10 @@
 <div class="search_latest">
-  <ul class="search_latest__list">
-    <li class="search_latest__item">
+  <ul class="search_sidebar_list">
+    <li class="search_sidebar_list__item">
       <%= link_to _('Browse latest responses'), search_general_all_path('variety:response') %>
     </li>
 
-    <li class="search_latest__item">
+    <li class="search_sidebar_list__item">
       <%= link_to _('Browse latest requests'), search_general_all_path('variety:sent') %>
     </li>
   </ul>

From 24539774ea46fe5b118fc265d8c09dad19e1b34a Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Thu, 9 Nov 2023 12:00:47 +0000
Subject: [PATCH 2/4] Add search_requests_path

Nicer URL and pre-selects the requests filter.
---
 app/views/general/_search_latest.html.erb | 4 ++--
 config/routes.rb                          | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/general/_search_latest.html.erb b/app/views/general/_search_latest.html.erb
index 372e2cb1c5..9eeac6432a 100644
--- a/app/views/general/_search_latest.html.erb
+++ b/app/views/general/_search_latest.html.erb
@@ -1,11 +1,11 @@
 <div class="search_latest">
   <ul class="search_sidebar_list">
     <li class="search_sidebar_list__item">
-      <%= link_to _('Browse latest responses'), search_general_all_path('variety:response') %>
+      <%= link_to _('Browse latest responses'), search_requests_path('variety:response') %>
     </li>
 
     <li class="search_sidebar_list__item">
-      <%= link_to _('Browse latest requests'), search_general_all_path('variety:sent') %>
+      <%= link_to _('Browse latest requests'), search_requests_path('variety:sent') %>
     </li>
   </ul>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index dae9301879..44e850665e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,6 +52,9 @@ def matches?(request)
   match '/search(/*combined)' => 'general#search',
         :as => :search_general,
         :via => :get
+  match '/search/:query/requests' => 'general#search',
+        as: :search_requests,
+        via: :get
   match '/search/:query/users' => 'general#search',
         as: :search_users,
         via: :get

From 016f6b888897448ae5acc2593005bfa33c75665f Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Thu, 9 Nov 2023 12:03:37 +0000
Subject: [PATCH 3/4] Signpost key request admin contributions

A basic version of https://github.com/mysociety/alaveteli/issues/1513
A basic version of https://github.com/mysociety/alaveteli/issues/6871
---
 app/views/general/_help_requests.html.erb | 11 +++++++++++
 app/views/request/list.html.erb           |  3 +++
 doc/CHANGES.md                            |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 app/views/general/_help_requests.html.erb

diff --git a/app/views/general/_help_requests.html.erb b/app/views/general/_help_requests.html.erb
new file mode 100644
index 0000000000..9dead51669
--- /dev/null
+++ b/app/views/general/_help_requests.html.erb
@@ -0,0 +1,11 @@
+<div class="help_requests">
+  <ul class="search_sidebar_list">
+    <li class="search_sidebar_list__item">
+      <%= link_to _('Classify requests'), categorise_play_path %>
+    </li>
+
+    <li class="search_sidebar_list__item">
+      <%= link_to _('Find updated contact details'), search_requests_path('latest_status:error_message') %>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/request/list.html.erb b/app/views/request/list.html.erb
index 09bc4665a1..8b7aebb6c0 100644
--- a/app/views/request/list.html.erb
+++ b/app/views/request/list.html.erb
@@ -13,6 +13,9 @@
 
   <h2><%= _('Latest') %></h2>
   <%= render partial: 'general/search_latest' %>
+
+  <h2><%= _('Help Out') %></h2>
+  <%= render partial: 'general/help_requests' %>
 </div>
 
 <div style="clear:both"></div>
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 185e621a1b..af7cd4fba7 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Highlighted Features
 
+* Signpost key user administration contributions for requests on request list
+  pages (Gareth Rees)
 * Signpost users to find new contact details for requests with delivery errors
   (Gareth Rees)
 * Add admin view of unmasked version of main body part attachments (Gareth Rees)

From 8c6ab9499d5952482051b08901911d9277da799c Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Thu, 9 Nov 2023 12:13:35 +0000
Subject: [PATCH 4/4] Improve styling of search_sidebar_list headings

Contain the heading within the element `<div>` and reduce the margin so
they're a bit tighter together, which works better in the context.
---
 app/assets/stylesheets/responsive/_search_style.scss | 7 +++++++
 app/views/general/_help_requests.html.erb            | 2 ++
 app/views/general/_search_latest.html.erb            | 2 ++
 app/views/request/list.html.erb                      | 3 ---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/responsive/_search_style.scss b/app/assets/stylesheets/responsive/_search_style.scss
index a05229f97c..69cfb731d2 100644
--- a/app/assets/stylesheets/responsive/_search_style.scss
+++ b/app/assets/stylesheets/responsive/_search_style.scss
@@ -146,3 +146,10 @@ input.use-datepicker[type=text] {
     }
   }
 }
+
+.search_latest,
+.help_requests {
+  h2 {
+    margin-top: 1.5em !important;
+  }
+}
diff --git a/app/views/general/_help_requests.html.erb b/app/views/general/_help_requests.html.erb
index 9dead51669..a739d467b9 100644
--- a/app/views/general/_help_requests.html.erb
+++ b/app/views/general/_help_requests.html.erb
@@ -1,4 +1,6 @@
 <div class="help_requests">
+  <h2><%= _('Help Out') %></h2>
+
   <ul class="search_sidebar_list">
     <li class="search_sidebar_list__item">
       <%= link_to _('Classify requests'), categorise_play_path %>
diff --git a/app/views/general/_search_latest.html.erb b/app/views/general/_search_latest.html.erb
index 9eeac6432a..bd34ad1c79 100644
--- a/app/views/general/_search_latest.html.erb
+++ b/app/views/general/_search_latest.html.erb
@@ -1,4 +1,6 @@
 <div class="search_latest">
+  <h2><%= _('Latest') %></h2>
+
   <ul class="search_sidebar_list">
     <li class="search_sidebar_list__item">
       <%= link_to _('Browse latest responses'), search_requests_path('variety:response') %>
diff --git a/app/views/request/list.html.erb b/app/views/request/list.html.erb
index 8b7aebb6c0..498c45e7ee 100644
--- a/app/views/request/list.html.erb
+++ b/app/views/request/list.html.erb
@@ -11,10 +11,7 @@
     <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'main' } %>
   <% end %>
 
-  <h2><%= _('Latest') %></h2>
   <%= render partial: 'general/search_latest' %>
-
-  <h2><%= _('Help Out') %></h2>
   <%= render partial: 'general/help_requests' %>
 </div>