From 6cce083127980757e41090148d746511e394b4bc Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Tue, 1 Oct 2024 12:17:02 +0100
Subject: [PATCH 01/14] Broaden Citation#type classifications

We care more about the general grouping rather than a citation being
e.g. specifically an _academic_ research. It could be some other
generally research that we'd want to track.
---
 app/helpers/admin/citations_helper.rb         |  2 +-
 app/models/citation.rb                        |  5 ++---
 app/views/citations/new.html.erb              | 14 ++++++-------
 .../info_request_batch/_citations.html.erb    |  4 ++--
 app/views/request/_citations.html.erb         |  4 ++--
 ...14832_change_citation_type_values_again.rb | 21 +++++++++++++++++++
 doc/CHANGES.md                                |  2 +-
 spec/helpers/admin/citations_helper_spec.rb   |  8 +++----
 spec/models/citation_spec.rb                  |  2 +-
 9 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 db/migrate/20241001114832_change_citation_type_values_again.rb

diff --git a/app/helpers/admin/citations_helper.rb b/app/helpers/admin/citations_helper.rb
index a383aa7d67..135c2f8519 100644
--- a/app/helpers/admin/citations_helper.rb
+++ b/app/helpers/admin/citations_helper.rb
@@ -3,7 +3,7 @@ module Admin::CitationsHelper
   ICONS = {
     journalism: '🗞️',
     campaigning: '📣',
-    academic: '🎓',
+    research: '📚',
     other: '🌐'
   }.with_indifferent_access.freeze
 
diff --git a/app/models/citation.rb b/app/models/citation.rb
index 460eb357ef..54abf8f303 100644
--- a/app/models/citation.rb
+++ b/app/models/citation.rb
@@ -14,8 +14,7 @@
 #
 
 ##
-# A Citation of an InfoRequest or InfoRequestBatch in news stories or an
-# academic paper
+# A Citation of an InfoRequest or InfoRequestBatch
 #
 class Citation < ApplicationRecord
   self.inheritance_column = nil
@@ -29,7 +28,7 @@ class Citation < ApplicationRecord
                                    message: _('Source URL is too long') },
                          format: { with: /\Ahttps?:\/\/.*\z/,
                                    message: _('Please enter a Source URL') }
-  validates :type, inclusion: { in: %w(journalism academic campaigning other),
+  validates :type, inclusion: { in: %w(journalism research campaigning other),
                                 message: _('Please select a type') }
 
   scope :newest, ->(limit = 1) do
diff --git a/app/views/citations/new.html.erb b/app/views/citations/new.html.erb
index 996858f3dd..a6cddcb184 100644
--- a/app/views/citations/new.html.erb
+++ b/app/views/citations/new.html.erb
@@ -2,11 +2,11 @@
 
 <p>
   <% if @resource.is_a?(InfoRequestBatch) %>
-    <%= _('Has this batch request been referenced in a news article or ' \
-          'academic paper? Let us know:') %>
+    <%= _('Has this batch request been referenced in journalism, ' \
+          'campaigning, or research?') %>
   <% else %>
-    <%= _('Has this request been referenced in a news article or academic ' \
-          'paper? Let us know:') %>
+    <%= _('Has this request been referenced in journalism, campaigning, ' \
+          'or research?') %>
   <% end %>
 </p>
 
@@ -40,9 +40,9 @@
       <%= _('Campaigning') %>
     </label>
 
-    <label for="citation_type_academic" class="form_label">
-      <%= f.radio_button :type, 'academic' %>
-      <%= _('Academic') %>
+    <label for="citation_type_research" class="form_label">
+      <%= f.radio_button :type, 'research' %>
+      <%= _('Research') %>
     </label>
 
     <label for="citation_type_other" class="form_label">
diff --git a/app/views/info_request_batch/_citations.html.erb b/app/views/info_request_batch/_citations.html.erb
index 26bf65a70f..208c525590 100644
--- a/app/views/info_request_batch/_citations.html.erb
+++ b/app/views/info_request_batch/_citations.html.erb
@@ -8,8 +8,8 @@
       </ul>
     <% elsif can? :create_citation, info_request_batch %>
       <p>
-        <%= _('Has this batch request been referenced in a news article or ' \
-              'academic paper?') %>
+        <%= _('Has this batch request been referenced in journalism, ' \
+              'campaigning, or research?') %>
       </p>
     <% end %>
 
diff --git a/app/views/request/_citations.html.erb b/app/views/request/_citations.html.erb
index 351c5839dd..e74422701b 100644
--- a/app/views/request/_citations.html.erb
+++ b/app/views/request/_citations.html.erb
@@ -8,8 +8,8 @@
       </ul>
     <% elsif can? :create_citation, info_request %>
       <p>
-        <%= _('Has this request been referenced in a news article or ' \
-              'academic paper?') %>
+        <%= _('Has this request been referenced in journalism, ' \
+              'campaigning, or research?') %>
       </p>
     <% end %>
 
diff --git a/db/migrate/20241001114832_change_citation_type_values_again.rb b/db/migrate/20241001114832_change_citation_type_values_again.rb
new file mode 100644
index 0000000000..b375d234ea
--- /dev/null
+++ b/db/migrate/20241001114832_change_citation_type_values_again.rb
@@ -0,0 +1,21 @@
+class ChangeCitationTypeValuesAgain < ActiveRecord::Migration[7.0]
+  CHANGES = {
+    'academic' => 'research'
+  }
+
+  def up
+    perform(CHANGES)
+  end
+
+  def down
+    perform(CHANGES.invert)
+  end
+
+  private
+
+  def perform(data)
+    data.each_pair do |before, after|
+      Citation.where(type: before).update_all(type: after)
+    end
+  end
+end
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index f72aad51cd..58f45675ef 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -30,7 +30,7 @@
 * Strengthen 2FA warning. Users *must* remember to keep this code safe (Gareth
   Rees)
 * Broaden citation type classifications to cover wider thematic areas and add
-  "campaigning" type (Gareth Rees)
+  "campaigning" type (Gareth Rees, Graeme Porteous)
 * Treat unstemmed words as normal search terms. (Matthew Somerville)
 * Update `/alaveteli_pro` base path to `/pro` (Alexander Griffen, Graeme
   Porteous)
diff --git a/spec/helpers/admin/citations_helper_spec.rb b/spec/helpers/admin/citations_helper_spec.rb
index 1e31a47fa8..a32e8b3623 100644
--- a/spec/helpers/admin/citations_helper_spec.rb
+++ b/spec/helpers/admin/citations_helper_spec.rb
@@ -12,10 +12,10 @@
       it { is_expected.to include('citation-icon--journalism') }
     end
 
-    context 'with an academic link' do
-      let(:citation) { FactoryBot.build(:citation, type: 'academic') }
-      it { is_expected.to include('🎓') }
-      it { is_expected.to include('citation-icon--academic') }
+    context 'with an research link' do
+      let(:citation) { FactoryBot.build(:citation, type: 'research') }
+      it { is_expected.to include('📚') }
+      it { is_expected.to include('citation-icon--research') }
     end
 
     context 'with a generic link' do
diff --git a/spec/models/citation_spec.rb b/spec/models/citation_spec.rb
index 46d940ac03..9d238a2e30 100644
--- a/spec/models/citation_spec.rb
+++ b/spec/models/citation_spec.rb
@@ -203,7 +203,7 @@ def setup_for_x_scope_data
       is_expected.to be_valid
       citation.type = 'campaigning'
       is_expected.to be_valid
-      citation.type = 'academic'
+      citation.type = 'research'
       is_expected.to be_valid
       citation.type = 'other'
       is_expected.to be_valid

From efa5efba98106b86bef3dd7661b0ad286a46748d Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Wed, 2 Oct 2024 11:04:27 +0100
Subject: [PATCH 02/14] Update citation routing

Reorder and combined routes to a single part in the config/routes.rb.
---
 config/routes.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 10c4047911..4af90b3815 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -173,18 +173,27 @@ def matches?(request)
   end
   ####
 
+  #### Citations controller
   scope path: 'request/:url_title' do
-    #### Citations controller
-    resources :citations, only: [:new, :create],
+    resources :citations,
+      only: [:new, :create],
       defaults: { resource: 'InfoRequest' }
-    ####
+  end
+
+  resources :info_request_batch, :only => :show do
+    resources :citations,
+      only: [:new, :create],
+      defaults: { resource: 'InfoRequestBatch' }
+  end
+  ####
 
-    #### Classifications controller
+  #### Classifications controller
+  scope path: 'request/:url_title' do
     resources :classifications, only: [:create], param: :described_state do
       get :message, on: :member
     end
-    ####
   end
+  ####
 
   #### Followups controller
   match '/request/:request_url_title/followups/new' => 'followups#new',
@@ -237,13 +246,6 @@ def matches?(request)
     resources :widget_votes, :only => [:create]
   end
 
-  resources :info_request_batch, :only => :show do
-    #### Citations controller
-    resources :citations, only: [:new, :create],
-      defaults: { resource: 'InfoRequestBatch' }
-    ####
-  end
-
   #### OutgoingMessage controller
   resources :outgoing_messages, :only => [] do
     resource :delivery_status, :only => [:show], :module => 'outgoing_messages'

From 8edb898a649af97f150f18827593ea97457a619c Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Thu, 3 Oct 2024 21:52:32 +0100
Subject: [PATCH 03/14] Add Citation.not_embargoed scope

---
 app/models/application_record.rb | 24 ++++++++++++++++++++++++
 app/models/citation.rb           | 13 +++++++++++++
 spec/models/citation_spec.rb     | 25 ++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index b3ed67569f..a52c3985bb 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -8,4 +8,28 @@ class ApplicationRecord < ActiveRecord::Base
   def self.admin_title
     name
   end
+
+  def self.belongs_to(name, scope = nil, **options)
+    if options.key?(:via)
+      via = options.delete(:via)
+      polymorphic_association = reflect_on_association(via)
+
+      unless polymorphic_association&.polymorphic?
+        raise ArgumentError, "Association #{via} must be polymorphic"
+      end
+
+      options[:foreign_key] ||= polymorphic_association.foreign_key
+      options[:class_name] ||= name.to_s.classify
+
+      scope = -> {
+        where(
+          polymorphic_association.active_record.table_name => {
+            polymorphic_association.foreign_type => options[:class_name]
+          }
+        )
+      }
+    end
+
+    super(name, scope, **options)
+  end
 end
diff --git a/app/models/citation.rb b/app/models/citation.rb
index 54abf8f303..e06dd6fcd6 100644
--- a/app/models/citation.rb
+++ b/app/models/citation.rb
@@ -22,6 +22,9 @@ class Citation < ApplicationRecord
   belongs_to :user, inverse_of: :citations
   belongs_to :citable, polymorphic: true
 
+  belongs_to :info_request, via: :citable
+  belongs_to :info_request_batch, via: :citable
+
   validates :user, :citable, presence: true
   validates :citable_type, inclusion: { in: %w(InfoRequest InfoRequestBatch) }
   validates :source_url, length: { maximum: 255,
@@ -35,6 +38,16 @@ class Citation < ApplicationRecord
     order(created_at: :desc).limit(limit)
   end
 
+  scope :not_embargoed, -> do
+    left_joins(info_request: :embargo, info_request_batch: []).
+      where(citable_type: 'InfoRequest').
+      merge(InfoRequest.not_embargoed).
+      or(
+        where(citable_type: 'InfoRequestBatch').
+        merge(InfoRequestBatch.not_embargoed)
+      )
+  end
+
   scope :for_request, ->(info_request) do
     where(citable: info_request).
       or(where(citable: info_request.info_request_batch))
diff --git a/spec/models/citation_spec.rb b/spec/models/citation_spec.rb
index 9d238a2e30..f741b0f1e0 100644
--- a/spec/models/citation_spec.rb
+++ b/spec/models/citation_spec.rb
@@ -48,10 +48,17 @@ def setup_for_x_scope_data
     FactoryBot.create(:citation, citable: info_request_c)
   end
 
+  # Citations on single InfoRequest: D
+  let!(:info_request_d) { FactoryBot.create(:info_request, :embargoed) }
+
+  let!(:citation_info_request_d) do
+    FactoryBot.create(:citation, citable: info_request_d)
+  end
+
   # Batch and Requests: X
   # Unused, but required to ensure we're not finding incorrect citations
   let!(:batch_x) do
-    FactoryBot.create(:info_request_batch, :sent)
+    FactoryBot.create(:info_request_batch, :sent, :embargoed)
   end
 
   let!(:batch_x_info_request_a) { batch_x.info_requests.first }
@@ -85,6 +92,22 @@ def setup_for_x_scope_data
     end
   end
 
+  describe '.not_embargoed' do
+    subject { described_class.not_embargoed }
+
+    setup_for_x_scope_data
+
+    it 'returns citations belonging to unembargoed requests and batches' do
+      is_expected.to match_array(
+        [
+          citation_batch_a, citation_batch_a_request_a,
+          citation_batch_b,
+          citation_info_request_c
+        ]
+      )
+    end
+  end
+
   describe '.for_request' do
     subject { described_class.for_request(info_request) }
 

From bd312d8b8f3b86b2759b39518cf48d45516bce3f Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Fri, 4 Oct 2024 12:47:03 +0100
Subject: [PATCH 04/14] Rename existing citation partial

Rename as compact as this is currently used to render the citation
minimally in the sidebar.

Updated the CSS classes too which aren't yet used.
---
 app/assets/stylesheets/responsive/_sidebar_layout.scss      | 2 +-
 app/assets/stylesheets/responsive/_sidebar_style.scss       | 2 +-
 .../citations/{_citation.html.erb => _compact.html.erb}     | 2 +-
 app/views/info_request_batch/_citations.html.erb            | 6 ++++--
 app/views/request/_citations.html.erb                       | 6 ++++--
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename app/views/citations/{_citation.html.erb => _compact.html.erb} (73%)

diff --git a/app/assets/stylesheets/responsive/_sidebar_layout.scss b/app/assets/stylesheets/responsive/_sidebar_layout.scss
index 8b8c6691d4..d0d689eac3 100644
--- a/app/assets/stylesheets/responsive/_sidebar_layout.scss
+++ b/app/assets/stylesheets/responsive/_sidebar_layout.scss
@@ -36,7 +36,7 @@
 }
 
 .sidebar__section.citations {
-  .citations-list {
+  .citations-list--compact {
     overflow-wrap: break-word;
   }
 }
diff --git a/app/assets/stylesheets/responsive/_sidebar_style.scss b/app/assets/stylesheets/responsive/_sidebar_style.scss
index 094a85d0df..29bc3d11df 100644
--- a/app/assets/stylesheets/responsive/_sidebar_style.scss
+++ b/app/assets/stylesheets/responsive/_sidebar_style.scss
@@ -109,7 +109,7 @@
 }
 
 .sidebar__section.citations {
-  .citations-list {
+  .citations-list--compact {
     list-style: none;
     padding: 0;
   }
diff --git a/app/views/citations/_citation.html.erb b/app/views/citations/_compact.html.erb
similarity index 73%
rename from app/views/citations/_citation.html.erb
rename to app/views/citations/_compact.html.erb
index eb4543302d..9c9e7b18d5 100644
--- a/app/views/citations/_citation.html.erb
+++ b/app/views/citations/_compact.html.erb
@@ -1,4 +1,4 @@
-<li class="citations-list__citation">
+<li class="citations-list__citation--compact">
   <%=
     MySociety::Format.make_clickable(
       citation.source_url, contract: true, nofollow: true
diff --git a/app/views/info_request_batch/_citations.html.erb b/app/views/info_request_batch/_citations.html.erb
index 208c525590..13f298418d 100644
--- a/app/views/info_request_batch/_citations.html.erb
+++ b/app/views/info_request_batch/_citations.html.erb
@@ -3,8 +3,10 @@
     <h2><%= _('In the News') %></h2>
 
     <% if citations.any? %>
-      <ul class="citations-list">
-        <%= render citations %>
+      <ul class="citations-list--compact">
+        <%= render partial: 'citations/compact',
+                   collection: citations,
+                   as: :citation %>
       </ul>
     <% elsif can? :create_citation, info_request_batch %>
       <p>
diff --git a/app/views/request/_citations.html.erb b/app/views/request/_citations.html.erb
index e74422701b..eae97bea79 100644
--- a/app/views/request/_citations.html.erb
+++ b/app/views/request/_citations.html.erb
@@ -3,8 +3,10 @@
     <h2><%= _('In the News') %></h2>
 
     <% if citations.any? %>
-      <ul class="citations-list">
-        <%= render citations %>
+      <ul class="citations-list--compact">
+        <%= render partial: 'citations/compact',
+                   collection: citations,
+                   as: :citation %>
       </ul>
     <% elsif can? :create_citation, info_request %>
       <p>

From 6c9403b6a6e0d5df22607db8bf79fae1bbcfe9bf Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Wed, 2 Oct 2024 11:06:29 +0100
Subject: [PATCH 05/14] Add CitationsController#index action

---
 .../stylesheets/responsive/_citations.scss    | 29 +++++++
 app/assets/stylesheets/responsive/all.scss    |  2 +
 app/controllers/citations_controller.rb       | 14 +++-
 app/helpers/admin/citations_helper.rb         | 10 ++-
 app/views/citations/_citation.html.erb        | 29 +++++++
 app/views/citations/index.html.erb            | 76 +++++++++++++++++++
 config/routes.rb                              |  2 +
 doc/CHANGES.md                                |  1 +
 8 files changed, 157 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/stylesheets/responsive/_citations.scss
 create mode 100644 app/views/citations/_citation.html.erb
 create mode 100644 app/views/citations/index.html.erb

diff --git a/app/assets/stylesheets/responsive/_citations.scss b/app/assets/stylesheets/responsive/_citations.scss
new file mode 100644
index 0000000000..67e79da0d8
--- /dev/null
+++ b/app/assets/stylesheets/responsive/_citations.scss
@@ -0,0 +1,29 @@
+.citations-types {
+  border-top: 1px solid #d1d1d1;
+  border-bottom: 1px solid #d1d1d1;
+  margin-top: 2em;
+  margin-bottom: 1em;
+}
+
+ul.citations-list {
+  list-style: none;
+  padding-left: 0;
+
+  li.citations-list__citation {
+    padding: 1em 0;
+    border-bottom: 1px solid #d1d1d1;
+
+    display: flex;
+    align-items: flex-start;
+    gap: 1em;
+
+    .citation_icon {
+      flex-shrink: 0;
+    }
+
+    .citation__title {
+      flex-basis: 50%;
+      word-break: break-word;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/responsive/all.scss b/app/assets/stylesheets/responsive/all.scss
index 0181ce6d08..deed7da137 100644
--- a/app/assets/stylesheets/responsive/all.scss
+++ b/app/assets/stylesheets/responsive/all.scss
@@ -89,6 +89,8 @@
 @import "responsive/_notes_layout.scss";
 @import "responsive/_notes_styles.scss";
 
+@import "responsive/_citations";
+
 @import "responsive/alaveteli_pro/_pro_layout";
 @import "responsive/alaveteli_pro/_pro_style";
 
diff --git a/app/controllers/citations_controller.rb b/app/controllers/citations_controller.rb
index 541c42a5f9..dd790edeb5 100644
--- a/app/controllers/citations_controller.rb
+++ b/app/controllers/citations_controller.rb
@@ -2,9 +2,17 @@
 # Controller to create a new Citation for an InfoRequest or an InfoRequestBatch.
 #
 class CitationsController < ApplicationController
-  before_action :authenticate
-  before_action :load_resource_and_authorise
-  before_action :set_in_pro_area
+  before_action :authenticate, except: :index
+  before_action :load_resource_and_authorise, except: :index
+  before_action :set_in_pro_area, except: :index
+
+  def index
+    per_page = 10
+    page = get_search_page_from_params
+
+    @citations = Citation.not_embargoed.order(created_at: :desc).
+      paginate(page: page, per_page: per_page)
+  end
 
   def new
     @citation = current_user.citations.build
diff --git a/app/helpers/admin/citations_helper.rb b/app/helpers/admin/citations_helper.rb
index 135c2f8519..3778f86892 100644
--- a/app/helpers/admin/citations_helper.rb
+++ b/app/helpers/admin/citations_helper.rb
@@ -8,11 +8,15 @@ module Admin::CitationsHelper
   }.with_indifferent_access.freeze
 
   def citation_icon(citation)
+    citation_icon_for_type(citation.type)
+  end
+
+  def citation_icon_for_type(type)
     html_attrs = {
-      title: citation.type.humanize,
-      class: "citation-icon citation-icon--#{citation.type}"
+      title: type.humanize,
+      class: "citation-icon citation-icon--#{type}"
     }
 
-    tag.span(ICONS.fetch(citation.type), **html_attrs)
+    tag.span(ICONS.fetch(type), **html_attrs)
   end
 end
diff --git a/app/views/citations/_citation.html.erb b/app/views/citations/_citation.html.erb
new file mode 100644
index 0000000000..2a85b48a37
--- /dev/null
+++ b/app/views/citations/_citation.html.erb
@@ -0,0 +1,29 @@
+<li class="citations-list__citation">
+  <div class="citation__icon">
+    <%= citation_icon(citation) %>
+  </div>
+
+  <div class="citation__title">
+    <strong>
+      <%= MySociety::Format.make_clickable(
+        citation.source_url, contract: true, nofollow: true
+      ).html_safe %>
+    </strong>
+    <br>
+    <% case citation.citable %>
+    <% when InfoRequest %>
+      <%= _('<a href="{{info_request_url}}">{{title}}</a> requested from <a href="{{public_body_url}}">{{public_body_name}}</a> on {{date}}',
+          title: citation.citable.title,
+          info_request_url: request_path(citation.citable),
+          public_body_name: citation.citable.public_body.name,
+          public_body_url: public_body_path(citation.citable.public_body),
+          date: simple_date(citation.citable.created_at)) %>
+    <% when InfoRequestBatch %>
+      <%= _('<a href="{{info_request_batch_url}}">{{title}}</a> part of a batch sent to {{count}} authorities on {{date}}',
+          title: citation.citable.title,
+          info_request_batch_url: info_request_batch_path(citation.citable),
+          count: citation.citable.public_bodies.count,
+          date: simple_date(citation.citable.created_at)) %>
+    <% end %>
+  </div>
+</li>
diff --git a/app/views/citations/index.html.erb b/app/views/citations/index.html.erb
new file mode 100644
index 0000000000..1221e42dd0
--- /dev/null
+++ b/app/views/citations/index.html.erb
@@ -0,0 +1,76 @@
+<% @title = _('FOI in Action') %>
+<h1><%= @title %></h1>
+
+<p>
+  <%= _(<<~TXT)
+    Freedom of Information requests empower individuals, journalists, \
+    researchers, and campaigners to hold organisations accountable and shed \
+    light on matters of public interest. Below are real-world examples where \
+    FOI responses have made a significant impact.
+    TXT
+  %>
+</p>
+
+<div class="row citations-types">
+  <div class="large-6 columns citation-type">
+    <h2>
+      <%= citation_icon_for_type('journalism') %>
+      <%= _('Journalism') %>
+    </h2>
+    <p>
+      <%= _(<<~TXT)
+        Journalists often use FOI data to uncover stories that inform the \
+        public, reveal injustices, or investigate policy failures
+        TXT
+      %>
+    </p>
+  </div>
+
+  <div class="large-6 columns citation-type">
+    <h2>
+      <%= citation_icon_for_type('research') %>
+      <%= _('Research') %>
+    </h2>
+    <p>
+      <%= _(<<~TXT)
+        FOI requests are a valuable tool for researchers seeking data that \
+        might otherwise remain behind closed doors
+        TXT
+      %>
+    </p>
+  </div>
+
+  <div class="large-6 columns citation-type">
+    <h2>
+      <%= citation_icon_for_type('campaigning') %>
+      <%= _('Campaigning and Advocacy') %>
+    </h2>
+    <p>
+      <%= _(<<~TXT)
+        FOI requests help campaigners bring critical information to light, \
+        often influencing public discourse and policy decisions
+        TXT
+      %>
+    </p>
+  </div>
+
+  <div class="large-6 columns citation-type">
+    <h2>
+      <%= citation_icon_for_type('other') %>
+      <%= _('Other') %>
+    </h2>
+    <p>
+      <%= _(<<~TXT)
+        FOI requests serve as a cornerstone of democracy by providing \
+        transparency in government and public institutions
+        TXT
+      %>
+    </p>
+  </div>
+</div>
+
+<ul class="citations-list">
+  <%= render @citations %>
+</ul>
+
+<%= will_paginate(@citations) %>
diff --git a/config/routes.rb b/config/routes.rb
index 4af90b3815..a171a97d69 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -174,6 +174,8 @@ def matches?(request)
   ####
 
   #### Citations controller
+  resources :citations, only: [:index]
+
   scope path: 'request/:url_title' do
     resources :citations,
       only: [:new, :create],
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 58f45675ef..83814db976 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+* Add public citations view (Graeme Porteous)
 * Add example logrotate configuration (Graeme Porteous)
 * Switch application server from Thin to Puma (Graeme Porteous)
 * Fix rendering invoices page when there are discounted Pro subscription (Graeme

From 509e3f71a7b5f96038631efe29e2e7a032e7def4 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Fri, 4 Oct 2024 16:13:33 +0100
Subject: [PATCH 06/14] Add JSON endpoint for CitationsController#index

---
 app/controllers/citations_controller.rb |  7 +++++++
 app/models/citation.rb                  | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/controllers/citations_controller.rb b/app/controllers/citations_controller.rb
index dd790edeb5..6c1968eddf 100644
--- a/app/controllers/citations_controller.rb
+++ b/app/controllers/citations_controller.rb
@@ -6,12 +6,19 @@ class CitationsController < ApplicationController
   before_action :load_resource_and_authorise, except: :index
   before_action :set_in_pro_area, except: :index
 
+  skip_before_action :html_response, only: :index
+
   def index
     per_page = 10
     page = get_search_page_from_params
 
     @citations = Citation.not_embargoed.order(created_at: :desc).
       paginate(page: page, per_page: per_page)
+
+    respond_to do |format|
+      format.html { @has_json = true }
+      format.json { render json: @citations }
+    end
   end
 
   def new
diff --git a/app/models/citation.rb b/app/models/citation.rb
index e06dd6fcd6..e6bf9a91ee 100644
--- a/app/models/citation.rb
+++ b/app/models/citation.rb
@@ -17,6 +17,9 @@
 # A Citation of an InfoRequest or InfoRequestBatch
 #
 class Citation < ApplicationRecord
+  include Rails.application.routes.url_helpers
+  include LinkToHelper
+
   self.inheritance_column = nil
 
   belongs_to :user, inverse_of: :citations
@@ -61,4 +64,17 @@ class Citation < ApplicationRecord
   def applies_to_batch_request?
     citable.is_a?(InfoRequestBatch)
   end
+
+  def as_json(_options)
+    citable_path = case citable
+                   when InfoRequest
+                     request_path(citable)
+                   when InfoRequestBatch
+                     info_request_batch_path(citable)
+                   end
+
+    attributes.
+      except('user_id', 'citable_id', 'citable_type').
+      merge(citable_path: citable_path)
+  end
 end

From 81514e82f647db85045c6e1098ce1bebae8f952b Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 7 Oct 2024 10:27:52 +0100
Subject: [PATCH 07/14] Add citation title and description columns

---
 app/models/citation.rb                                      | 4 +++-
 ...20241007090524_add_title_and_description_to_citations.rb | 6 ++++++
 spec/factories/citations.rb                                 | 4 +++-
 spec/models/citation_spec.rb                                | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20241007090524_add_title_and_description_to_citations.rb

diff --git a/app/models/citation.rb b/app/models/citation.rb
index e6bf9a91ee..11bc602fc1 100644
--- a/app/models/citation.rb
+++ b/app/models/citation.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20241007090524
 #
 # Table name: citations
 #
@@ -11,6 +11,8 @@
 #  type         :string
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  title        :string
+#  description  :text
 #
 
 ##
diff --git a/db/migrate/20241007090524_add_title_and_description_to_citations.rb b/db/migrate/20241007090524_add_title_and_description_to_citations.rb
new file mode 100644
index 0000000000..27fbe247ae
--- /dev/null
+++ b/db/migrate/20241007090524_add_title_and_description_to_citations.rb
@@ -0,0 +1,6 @@
+class AddTitleAndDescriptionToCitations < ActiveRecord::Migration[7.0]
+  def change
+    add_column :citations, :title, :string
+    add_column :citations, :description, :text
+  end
+end
diff --git a/spec/factories/citations.rb b/spec/factories/citations.rb
index b2bbf2ab70..47566c1371 100644
--- a/spec/factories/citations.rb
+++ b/spec/factories/citations.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20241007090524
 #
 # Table name: citations
 #
@@ -11,6 +11,8 @@
 #  type         :string
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  title        :string
+#  description  :text
 #
 
 FactoryBot.define do
diff --git a/spec/models/citation_spec.rb b/spec/models/citation_spec.rb
index f741b0f1e0..cb948ba137 100644
--- a/spec/models/citation_spec.rb
+++ b/spec/models/citation_spec.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20210114161442
+# Schema version: 20241007090524
 #
 # Table name: citations
 #
@@ -11,6 +11,8 @@
 #  type         :string
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
+#  title        :string
+#  description  :text
 #
 
 require 'spec_helper'

From fed12e3825b8e35df5a76c5df9b2e209a96c5b46 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 7 Oct 2024 10:32:36 +0100
Subject: [PATCH 08/14] Add admin citation edit/update and destroy actions

---
 app/controllers/admin/citations_controller.rb | 28 ++++++++
 app/views/admin/citations/_list.html.erb      |  2 +-
 app/views/admin/citations/edit.html.erb       | 41 ++++++++++++
 config/routes.rb                              |  2 +-
 doc/CHANGES.md                                |  2 +
 .../admin/citations_controller_spec.rb        | 67 +++++++++++++++++++
 6 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 app/views/admin/citations/edit.html.erb

diff --git a/app/controllers/admin/citations_controller.rb b/app/controllers/admin/citations_controller.rb
index 51a42fa130..f5d0d348c9 100644
--- a/app/controllers/admin/citations_controller.rb
+++ b/app/controllers/admin/citations_controller.rb
@@ -1,8 +1,36 @@
 class Admin::CitationsController < AdminController
+  before_action :find_citation, except: :index
+
   def index
     @citations =
       Citation.
       order(created_at: :desc).
       paginate(page: params[:page], per_page: 50)
   end
+
+  def edit
+  end
+
+  def update
+    if @citation.update(citation_params)
+      redirect_to admin_citations_path, notice: 'Citation updated successfully.'
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @citation.destroy
+    redirect_to admin_citations_path, notice: 'Citation deleted successfully.'
+  end
+
+  private
+
+  def find_citation
+    @citation = Citation.find(params[:id])
+  end
+
+  def citation_params
+    params.require(:citation).permit(:source_url, :title, :description)
+  end
 end
diff --git a/app/views/admin/citations/_list.html.erb b/app/views/admin/citations/_list.html.erb
index d620a9b7f7..6b9b5dc8b9 100644
--- a/app/views/admin/citations/_list.html.erb
+++ b/app/views/admin/citations/_list.html.erb
@@ -4,7 +4,7 @@
       <div class="row">
         <span class="item-title span6">
           <%= citation_icon(citation) %>
-          <tt><%= link_to citation.source_url, citation.source_url %></tt>
+          <tt><%= link_to citation_source_url, edit_admin_citation_path(citation) %></tt>
         </span>
 
         <span class="item-metadata span6">
diff --git a/app/views/admin/citations/edit.html.erb b/app/views/admin/citations/edit.html.erb
new file mode 100644
index 0000000000..68469be920
--- /dev/null
+++ b/app/views/admin/citations/edit.html.erb
@@ -0,0 +1,41 @@
+<div class="row">
+  <div class="span12">
+    <div class="page-header">
+      <h1><%= @title = 'Edit citation' %></h1>
+    </div>
+  </div>
+</div>
+
+<%= form_for [:admin, @citation], class: 'form form-inline' do |f| %>
+  <div class="control-group">
+    <%= f.label :source_url %>
+    <div class="controls">
+      <%= f.text_field :source_url, class: 'form-control' %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <%= f.label :title %>
+    <div class="controls">
+      <%= f.text_field :title, class: 'form-control' %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <%= f.label :description, class: 'control-label' %>
+    <div class="controls">
+      <%= f.text_area :description, class: 'input-block-level', rows: 10 %>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= f.submit 'Update ciation', class: 'btn btn-success' %>
+  </div>
+<% end %>
+
+<%= form_for [:admin, @citation], class: 'form form-inline', method: 'delete' do |f| %>
+  <%= f.submit 'Destroy citation',
+               class: 'btn btn-danger',
+               data: { confirm: 'Are you sure? This is irreversible.' } %>
+  (this is permanent!)
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index a171a97d69..14a77c88c6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -532,7 +532,7 @@ def matches?(request)
 
   #### Admin::Citations controller
   namespace :admin do
-    resources :citations, only: [:index]
+    resources :citations, only: [:index, :edit, :update, :destroy]
   end
   ####
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 83814db976..d5b5313756 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Highlighted Features
 
+* Improve citations admin to allow title and description updates (Graeme
+  Porteous)
 * Add public citations view (Graeme Porteous)
 * Add example logrotate configuration (Graeme Porteous)
 * Switch application server from Thin to Puma (Graeme Porteous)
diff --git a/spec/controllers/admin/citations_controller_spec.rb b/spec/controllers/admin/citations_controller_spec.rb
index b9a34d43a0..a68f82f1b4 100644
--- a/spec/controllers/admin/citations_controller_spec.rb
+++ b/spec/controllers/admin/citations_controller_spec.rb
@@ -19,4 +19,71 @@
       expect(response).to render_template(:index)
     end
   end
+
+  describe 'GET edit' do
+    let(:citation) { FactoryBot.create(:citation) }
+    before { get :edit, params: { id: citation.id } }
+
+    it 'returns a successful response' do
+      expect(response).to be_successful
+    end
+
+    it 'assigns the citation' do
+      expect(assigns[:citation]).to eq(citation)
+    end
+
+    it 'renders the correct template' do
+      expect(response).to render_template(:edit)
+    end
+  end
+
+  describe 'PUT update' do
+    let(:citation) { FactoryBot.create(:citation) }
+    let(:valid_attributes) { { title: 'Updated Title' } }
+
+    context 'with valid params' do
+      before do
+        put :update, params: { id: citation.id, citation: valid_attributes }
+      end
+
+      it 'updates the citation' do
+        citation.reload
+        expect(citation.title).to eq('Updated Title')
+      end
+
+      it 'redirects to the citation' do
+        expect(response).to redirect_to(admin_citations_url)
+      end
+    end
+
+    context 'with invalid params' do
+      before do
+        put :update, params: { id: citation.id, citation: { source_url: '' } }
+      end
+
+      it 'does not update the citation' do
+        citation.reload
+        expect(citation.source_url).not_to eq('')
+      end
+
+      it 're-renders the edit template' do
+        expect(response).to render_template(:edit)
+      end
+    end
+  end
+
+  describe 'DELETE destroy' do
+    let!(:citation) { FactoryBot.create(:citation) }
+
+    it 'destroys the requested citation' do
+      expect {
+        delete :destroy, params: { id: citation.id }
+      }.to change(Citation, :count).by(-1)
+    end
+
+    it 'redirects to the citations list' do
+      delete :destroy, params: { id: citation.id }
+      expect(response).to redirect_to(admin_citations_url)
+    end
+  end
 end

From dcf5597ccd5569e15683327e1f7d31f528f1ed3a Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 7 Oct 2024 10:43:12 +0100
Subject: [PATCH 09/14] Add citation_title helper

Use `title` over the `source_url` but fallback if not present.
---
 app/helpers/admin/citations_helper.rb       |  4 ++++
 app/views/admin/citations/_list.html.erb    |  2 +-
 app/views/citations/_citation.html.erb      |  6 +-----
 app/views/citations/_compact.html.erb       |  6 +-----
 spec/helpers/admin/citations_helper_spec.rb | 17 +++++++++++++++++
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/helpers/admin/citations_helper.rb b/app/helpers/admin/citations_helper.rb
index 3778f86892..a26e947f73 100644
--- a/app/helpers/admin/citations_helper.rb
+++ b/app/helpers/admin/citations_helper.rb
@@ -7,6 +7,10 @@ module Admin::CitationsHelper
     other: '🌐'
   }.with_indifferent_access.freeze
 
+  def citation_title(citation)
+    citation.title.presence || citation.source_url
+  end
+
   def citation_icon(citation)
     citation_icon_for_type(citation.type)
   end
diff --git a/app/views/admin/citations/_list.html.erb b/app/views/admin/citations/_list.html.erb
index 6b9b5dc8b9..c3a7c4dbd7 100644
--- a/app/views/admin/citations/_list.html.erb
+++ b/app/views/admin/citations/_list.html.erb
@@ -4,7 +4,7 @@
       <div class="row">
         <span class="item-title span6">
           <%= citation_icon(citation) %>
-          <tt><%= link_to citation_source_url, edit_admin_citation_path(citation) %></tt>
+          <tt><%= link_to citation_title(citation), edit_admin_citation_path(citation) %></tt>
         </span>
 
         <span class="item-metadata span6">
diff --git a/app/views/citations/_citation.html.erb b/app/views/citations/_citation.html.erb
index 2a85b48a37..7c5a8d62ee 100644
--- a/app/views/citations/_citation.html.erb
+++ b/app/views/citations/_citation.html.erb
@@ -4,11 +4,7 @@
   </div>
 
   <div class="citation__title">
-    <strong>
-      <%= MySociety::Format.make_clickable(
-        citation.source_url, contract: true, nofollow: true
-      ).html_safe %>
-    </strong>
+    <strong><%= link_to citation_title(citation), citation.source_url, rel: 'nofollow' %></strong>
     <br>
     <% case citation.citable %>
     <% when InfoRequest %>
diff --git a/app/views/citations/_compact.html.erb b/app/views/citations/_compact.html.erb
index 9c9e7b18d5..1df58e66b7 100644
--- a/app/views/citations/_compact.html.erb
+++ b/app/views/citations/_compact.html.erb
@@ -1,7 +1,3 @@
 <li class="citations-list__citation--compact">
-  <%=
-    MySociety::Format.make_clickable(
-      citation.source_url, contract: true, nofollow: true
-    ).html_safe
-  %>
+  <%= link_to citation_title(citation), citation.source_url, rel: 'nofollow' %>
 </li>
diff --git a/spec/helpers/admin/citations_helper_spec.rb b/spec/helpers/admin/citations_helper_spec.rb
index a32e8b3623..290a542bdb 100644
--- a/spec/helpers/admin/citations_helper_spec.rb
+++ b/spec/helpers/admin/citations_helper_spec.rb
@@ -3,6 +3,23 @@
 RSpec.describe Admin::CitationsHelper do
   include Admin::CitationsHelper
 
+  describe '#citation_title' do
+    subject { citation_title(citation) }
+
+    context 'with a citation that has a title' do
+      let(:citation) { FactoryBot.build(:citation, title: 'Example Title') }
+      it { is_expected.to eq('Example Title') }
+    end
+
+    context 'with a citation that has a blank title' do
+      let(:citation) do
+        FactoryBot.build(:citation, title: '', source_url: 'http://example.com')
+      end
+
+      it { is_expected.to eq('http://example.com') }
+    end
+  end
+
   describe '#citation_icon' do
     subject { citation_icon(citation) }
 

From dbc45c629ea60ade6de31e736bb61a1b014a1c5f Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 7 Oct 2024 11:08:52 +0100
Subject: [PATCH 10/14] Add citation description to public index

---
 app/assets/stylesheets/responsive/_citations.scss | 4 ++++
 app/views/citations/_citation.html.erb            | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/assets/stylesheets/responsive/_citations.scss b/app/assets/stylesheets/responsive/_citations.scss
index 67e79da0d8..e84e21d271 100644
--- a/app/assets/stylesheets/responsive/_citations.scss
+++ b/app/assets/stylesheets/responsive/_citations.scss
@@ -25,5 +25,9 @@ ul.citations-list {
       flex-basis: 50%;
       word-break: break-word;
     }
+
+    .citation__description {
+      flex-basis: 50%;
+    }
   }
 }
diff --git a/app/views/citations/_citation.html.erb b/app/views/citations/_citation.html.erb
index 7c5a8d62ee..88324c94a6 100644
--- a/app/views/citations/_citation.html.erb
+++ b/app/views/citations/_citation.html.erb
@@ -22,4 +22,8 @@
           date: simple_date(citation.citable.created_at)) %>
     <% end %>
   </div>
+
+  <div class="citation__description">
+    <%= citation.description %>
+  </div>
 </li>

From 7c628976ea0872b7c4ab48b6535baa457c6cded9 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Wed, 9 Oct 2024 12:41:19 +0100
Subject: [PATCH 11/14] Add citation_both_links

Makes it easier to view the source of the citation now that we link to
the edit form in the admin UI.
---
 app/helpers/admin/link_helper.rb         | 9 +++++++++
 app/views/admin/citations/_list.html.erb | 2 +-
 spec/helpers/admin/link_helper_spec.rb   | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/helpers/admin/link_helper.rb b/app/helpers/admin/link_helper.rb
index d9241392d8..8cc4c433c6 100644
--- a/app/helpers/admin/link_helper.rb
+++ b/app/helpers/admin/link_helper.rb
@@ -108,6 +108,15 @@ def category_both_links(category)
             title: admin_title)
   end
 
+  def citation_both_links(citation)
+    title = 'View citation'
+    icon = eye
+
+    link_to(icon, citation.source_url, title: title) + ' ' +
+      link_to(citation.source_url, edit_admin_citation_path(citation),
+              title: admin_title)
+  end
+
   def admin_title
     'View full details'
   end
diff --git a/app/views/admin/citations/_list.html.erb b/app/views/admin/citations/_list.html.erb
index c3a7c4dbd7..63b4a59715 100644
--- a/app/views/admin/citations/_list.html.erb
+++ b/app/views/admin/citations/_list.html.erb
@@ -4,7 +4,7 @@
       <div class="row">
         <span class="item-title span6">
           <%= citation_icon(citation) %>
-          <tt><%= link_to citation_title(citation), edit_admin_citation_path(citation) %></tt>
+          <tt><%= both_links(citation) %></tt>
         </span>
 
         <span class="item-metadata span6">
diff --git a/spec/helpers/admin/link_helper_spec.rb b/spec/helpers/admin/link_helper_spec.rb
index 9c054c1788..3fa106a4c9 100644
--- a/spec/helpers/admin/link_helper_spec.rb
+++ b/spec/helpers/admin/link_helper_spec.rb
@@ -118,5 +118,13 @@
         end
       end
     end
+
+    context 'with a Citation' do
+      let(:record) { FactoryBot.create(:citation) }
+
+      it { is_expected.to include('icon-eye-open') }
+      it { is_expected.to include(record.source_url) }
+      it { is_expected.to include(edit_admin_citation_path(record)) }
+    end
   end
 end

From 5a9a07f4fda408279459e3ef60e2912707a81685 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Wed, 9 Oct 2024 12:57:24 +0100
Subject: [PATCH 12/14] Update citation language to "FOI in Action"

Matches the new /citations page and reflects the broader themes that
we're interested in tracking.
---
 app/views/citations/new.html.erb                          | 2 +-
 app/views/info_request_batch/_citations.html.erb          | 2 +-
 app/views/request/_citations.html.erb                     | 2 +-
 spec/views/info_request_batch/_citations.html.erb_spec.rb | 6 +++---
 spec/views/request/_citations.html.erb_spec.rb            | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/citations/new.html.erb b/app/views/citations/new.html.erb
index a6cddcb184..c34adcb463 100644
--- a/app/views/citations/new.html.erb
+++ b/app/views/citations/new.html.erb
@@ -1,4 +1,4 @@
-<h1><%= _('In the News') %></h1>
+<h1><%= _('FOI in Action') %></h1>
 
 <p>
   <% if @resource.is_a?(InfoRequestBatch) %>
diff --git a/app/views/info_request_batch/_citations.html.erb b/app/views/info_request_batch/_citations.html.erb
index 13f298418d..fe453dc27c 100644
--- a/app/views/info_request_batch/_citations.html.erb
+++ b/app/views/info_request_batch/_citations.html.erb
@@ -1,6 +1,6 @@
 <% if can?(:create_citation, info_request_batch) || citations.any? %>
   <div class="sidebar__section citations">
-    <h2><%= _('In the News') %></h2>
+    <h2><%= _('FOI in Action') %></h2>
 
     <% if citations.any? %>
       <ul class="citations-list--compact">
diff --git a/app/views/request/_citations.html.erb b/app/views/request/_citations.html.erb
index eae97bea79..d5397d6eb9 100644
--- a/app/views/request/_citations.html.erb
+++ b/app/views/request/_citations.html.erb
@@ -1,6 +1,6 @@
 <% if can?(:create_citation, info_request) || citations.any? %>
   <div class="sidebar__section citations">
-    <h2><%= _('In the News') %></h2>
+    <h2><%= _('FOI in Action') %></h2>
 
     <% if citations.any? %>
       <ul class="citations-list--compact">
diff --git a/spec/views/info_request_batch/_citations.html.erb_spec.rb b/spec/views/info_request_batch/_citations.html.erb_spec.rb
index 38e584f418..23657dcefc 100644
--- a/spec/views/info_request_batch/_citations.html.erb_spec.rb
+++ b/spec/views/info_request_batch/_citations.html.erb_spec.rb
@@ -34,7 +34,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'renders the blank slate text' do
@@ -59,7 +59,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'does not render the blank slate text' do
@@ -81,7 +81,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'does not render the blank slate text' do
diff --git a/spec/views/request/_citations.html.erb_spec.rb b/spec/views/request/_citations.html.erb_spec.rb
index 6f9b940744..e481468001 100644
--- a/spec/views/request/_citations.html.erb_spec.rb
+++ b/spec/views/request/_citations.html.erb_spec.rb
@@ -32,7 +32,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'renders the blank slate text' do
@@ -57,7 +57,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'does not render the blank slate text' do
@@ -79,7 +79,7 @@ def render_view
       before { render_view }
 
       it 'renders the section' do
-        expect(rendered).to match(/In the News/)
+        expect(rendered).to match(/FOI in Action/)
       end
 
       it 'does not render the blank slate text' do

From bf75167b01d660c2b646a37095cc29da7b490e8f Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Wed, 9 Oct 2024 13:10:31 +0100
Subject: [PATCH 13/14] Simplify citation sidebar logic

* Always show the context text
* Use the same CTA irrespective of existing citations
---
 .../info_request_batch/_citations.html.erb     | 18 ++++++++++--------
 app/views/request/_citations.html.erb          | 18 ++++++++++--------
 .../_citations.html.erb_spec.rb                | 14 +++++---------
 spec/views/request/_citations.html.erb_spec.rb | 10 +++++-----
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/info_request_batch/_citations.html.erb b/app/views/info_request_batch/_citations.html.erb
index fe453dc27c..8ff0531469 100644
--- a/app/views/info_request_batch/_citations.html.erb
+++ b/app/views/info_request_batch/_citations.html.erb
@@ -8,18 +8,20 @@
                    collection: citations,
                    as: :citation %>
       </ul>
-    <% elsif can? :create_citation, info_request_batch %>
+    <% end %>
+
+    <% if can? :create_citation, info_request_batch %>
       <p>
         <%= _('Has this batch request been referenced in journalism, ' \
               'campaigning, or research?') %>
-      </p>
-    <% end %>
 
-    <% if can? :create_citation, info_request_batch %>
-      <%= link_to new_info_request_batch_citation_path(info_request_batch),
-            class: 'citations-new' do %>
-        <%= citations.any? ? _('New Citation') : _('Let us know') %>
-      <% end %>
+        <br>
+
+        <%= link_to new_info_request_batch_citation_path(info_request_batch),
+              class: 'citations-new' do %>
+          <%= _('Let us know') %>
+        <% end %>
+      </p>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/request/_citations.html.erb b/app/views/request/_citations.html.erb
index d5397d6eb9..e0ac5cb961 100644
--- a/app/views/request/_citations.html.erb
+++ b/app/views/request/_citations.html.erb
@@ -8,18 +8,20 @@
                    collection: citations,
                    as: :citation %>
       </ul>
-    <% elsif can? :create_citation, info_request %>
+    <% end %>
+
+    <% if can? :create_citation, info_request %>
       <p>
         <%= _('Has this request been referenced in journalism, ' \
               'campaigning, or research?') %>
-      </p>
-    <% end %>
 
-    <% if can? :create_citation, info_request %>
-      <%= link_to new_citation_path(url_title: info_request.url_title),
-            class: 'citations-new' do %>
-        <%= citations.any? ? _('New Citation') : _('Let us know') %>
-      <% end %>
+        <br>
+
+        <%= link_to new_citation_path(url_title: info_request.url_title),
+              class: 'citations-new' do %>
+          <%=  _('Let us know') %>
+        <% end %>
+      </p>
     <% end %>
   </div>
 <% end %>
diff --git a/spec/views/info_request_batch/_citations.html.erb_spec.rb b/spec/views/info_request_batch/_citations.html.erb_spec.rb
index 23657dcefc..6142dfb209 100644
--- a/spec/views/info_request_batch/_citations.html.erb_spec.rb
+++ b/spec/views/info_request_batch/_citations.html.erb_spec.rb
@@ -62,10 +62,6 @@ def render_view
         expect(rendered).to match(/FOI in Action/)
       end
 
-      it 'does not render the blank slate text' do
-        expect(rendered).not_to match(/Has this batch request been referenced/)
-      end
-
       it 'renders the citations' do
         expect(rendered).to match(/citations-list/)
       end
@@ -84,16 +80,16 @@ def render_view
         expect(rendered).to match(/FOI in Action/)
       end
 
-      it 'does not render the blank slate text' do
-        expect(rendered).not_to match(/Has this request been referenced/)
-      end
-
       it 'renders the citations' do
         expect(rendered).to match(/citations-list/)
       end
 
+      it 'renders the blank slate text' do
+        expect(rendered).to match(/Has this batch request been referenced/)
+      end
+
       it 'renders the link to add citations' do
-        expect(rendered).to match('New Citation')
+        expect(rendered).to match('Let us know')
       end
     end
   end
diff --git a/spec/views/request/_citations.html.erb_spec.rb b/spec/views/request/_citations.html.erb_spec.rb
index e481468001..c8354085e1 100644
--- a/spec/views/request/_citations.html.erb_spec.rb
+++ b/spec/views/request/_citations.html.erb_spec.rb
@@ -82,16 +82,16 @@ def render_view
         expect(rendered).to match(/FOI in Action/)
       end
 
-      it 'does not render the blank slate text' do
-        expect(rendered).not_to match(/Has this request been referenced/)
-      end
-
       it 'renders the citations' do
         expect(rendered).to match(/citations-list/)
       end
 
+      it 'renders the blank slate text' do
+        expect(rendered).to match(/Has this request been referenced/)
+      end
+
       it 'renders the link to add citations' do
-        expect(rendered).to match('New Citation')
+        expect(rendered).to match('Let us know')
       end
     end
   end

From 1b1bdf34e8d559b1669e51e752e210c43916cbc3 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@garethrees.co.uk>
Date: Wed, 9 Oct 2024 13:20:34 +0100
Subject: [PATCH 14/14] Add some links to /citations

Add some basic navigation links to the new public list of citations.

It would be nice to add a homepage section for this by extracting out
the intro text of citations/index into a partial, but let's leave that
for a later release to give people a chance to build up a list of
citations before heavier promotion.
---
 app/views/citations/new.html.erb                 | 4 ++++
 app/views/info_request_batch/_citations.html.erb | 6 ++++++
 app/views/request/_citations.html.erb            | 6 ++++++
 app/views/request/_tabs.html.erb                 | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/app/views/citations/new.html.erb b/app/views/citations/new.html.erb
index c34adcb463..ac78742a95 100644
--- a/app/views/citations/new.html.erb
+++ b/app/views/citations/new.html.erb
@@ -8,6 +8,10 @@
     <%= _('Has this request been referenced in journalism, campaigning, ' \
           'or research?') %>
   <% end %>
+
+  <%= _('Let us know about great examples of <a href="{{citations_path}}">' \
+        'FOI in Action</a>.',
+        citations_path: citations_path) %>
 </p>
 
 <%= form_for @citation,
diff --git a/app/views/info_request_batch/_citations.html.erb b/app/views/info_request_batch/_citations.html.erb
index 8ff0531469..a4ba0cefba 100644
--- a/app/views/info_request_batch/_citations.html.erb
+++ b/app/views/info_request_batch/_citations.html.erb
@@ -22,6 +22,12 @@
           <%= _('Let us know') %>
         <% end %>
       </p>
+    <% else %>
+      <p>
+        <%= _('See more examples of <a href="{{citations_path}}">' \
+              'FOI in Action</a>.',
+              citations_path: citations_path) %>
+      </p>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/request/_citations.html.erb b/app/views/request/_citations.html.erb
index e0ac5cb961..1f49396ed9 100644
--- a/app/views/request/_citations.html.erb
+++ b/app/views/request/_citations.html.erb
@@ -22,6 +22,12 @@
           <%=  _('Let us know') %>
         <% end %>
       </p>
+    <% else %>
+      <p>
+        <%= _('See more examples of <a href="{{citations_path}}">' \
+              'FOI in Action</a>.',
+              citations_path: citations_path) %>
+      </p>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/request/_tabs.html.erb b/app/views/request/_tabs.html.erb
index c833ec344f..4d5c8fc840 100644
--- a/app/views/request/_tabs.html.erb
+++ b/app/views/request/_tabs.html.erb
@@ -5,4 +5,7 @@
   <li class="<%= 'selected' if current_page?(requests_path) %>">
     <%= link_to _('Browse by category'), requests_path %>
   </li>
+  <li>
+    <%= link_to _('FOI in Action'), citations_path %>
+  </li>
 <% end %>