From 3bda49a97154d39e908432ac6714131d82d29822 Mon Sep 17 00:00:00 2001
From: Alex Parsons <alex.parsons@mysociety.org>
Date: Wed, 5 Jun 2024 13:32:58 +0000
Subject: [PATCH] Common footer across MP subpages

---
 .../{_vote_footer.php => _profile_footer.php} | 14 +++++++++
 .../templates/html/mp/divisions.php           |  2 +-
 .../templates/html/mp/profile.php             | 30 +------------------
 .../templates/html/mp/recent.php              |  2 +-
 .../templates/html/mp/register.php            | 30 +------------------
 .../templates/html/mp/votes.php               |  2 +-
 6 files changed, 19 insertions(+), 61 deletions(-)
 rename www/includes/easyparliament/templates/html/mp/{_vote_footer.php => _profile_footer.php} (55%)

diff --git a/www/includes/easyparliament/templates/html/mp/_vote_footer.php b/www/includes/easyparliament/templates/html/mp/_profile_footer.php
similarity index 55%
rename from www/includes/easyparliament/templates/html/mp/_vote_footer.php
rename to www/includes/easyparliament/templates/html/mp/_profile_footer.php
index 4ce9e62b19..88661d1670 100644
--- a/www/includes/easyparliament/templates/html/mp/_vote_footer.php
+++ b/www/includes/easyparliament/templates/html/mp/_profile_footer.php
@@ -1,6 +1,8 @@
 <div class="panel panel--secondary">
     <p><?= gettext('Note for journalists and researchers: The data on this page may be used freely, on condition that TheyWorkForYou.com is cited as the source.') ?></p>
 
+    <p><?= gettext('This data was produced by TheyWorkForYou from a variety of sources.') ?></p>
+
     <p><?= gettext('For an explanation of the vote descriptions please see our page about <a href="/voting-information">voting information on TheyWorkForYou</a>.') ?></p>
 
   <?php if(isset($data['photo_attribution_text'])) { ?>
@@ -13,4 +15,16 @@
       <?php } ?>
     </p>
   <?php } ?>
+  <?php if(!$image || !$image['exists']) { ?>
+    <p>
+        We&rsquo;re missing a photo of <?= $full_name ?>.
+        If you have a photo <em>that you can release under
+        a Creative Commons Attribution-ShareAlike license</em>
+        or can locate a <em>copyright free</em> photo,
+        <a href="mailto:<?= str_replace('@', '&#64;', CONTACTEMAIL) ?>">please email it to us</a>.
+        Please do not email us about copyrighted photos
+        elsewhere on the internet; we can&rsquo;t use them.
+    </p>
+    <?php }; ?>
+                  
 </div>
diff --git a/www/includes/easyparliament/templates/html/mp/divisions.php b/www/includes/easyparliament/templates/html/mp/divisions.php
index 31b46a07ce..965109b08f 100644
--- a/www/includes/easyparliament/templates/html/mp/divisions.php
+++ b/www/includes/easyparliament/templates/html/mp/divisions.php
@@ -249,7 +249,7 @@
                     </div>
 
                 <?php }
-                include('_vote_footer.php'); ?>
+                include('_profile_footer.php'); ?>
 
             </div>
         </div>
diff --git a/www/includes/easyparliament/templates/html/mp/profile.php b/www/includes/easyparliament/templates/html/mp/profile.php
index 06529b29fa..396f67e214 100644
--- a/www/includes/easyparliament/templates/html/mp/profile.php
+++ b/www/includes/easyparliament/templates/html/mp/profile.php
@@ -248,35 +248,7 @@
                 </div>
                 <?php endif; ?>
 
-                <div class="panel panel--secondary">
-                    <p><?= gettext('Note for journalists and researchers: The data on this page may be used freely, on condition that TheyWorkForYou.com is cited as the source.') ?></p>
-
-                    <p><?php print gettext('This data was produced by TheyWorkForYou from a variety of sources.') . ' ';
-                        printf(gettext('Voting information from <a href="%s">Public Whip</a>.'), "https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/ $member_id&amp;showall=yes"); ?></p>
-
-                  <?php if($image && $image['exists']) {
-                      if(isset($data['photo_attribution_text'])) { ?>
-                    <p>
-                      <?php if(isset($data['photo_attribution_link'])) { ?>
-                        <?= gettext('Profile photo:') ?>
-                        <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
-                      <?php } else { ?>
-                        <?= gettext('Profile photo:') ?> <?= $data['photo_attribution_text'] ?>
-                      <?php } ?>
-                    </p>
-                  <?php }
-                  } else { ?>
-                    <p>
-                        We&rsquo;re missing a photo of <?= $full_name ?>.
-                        If you have a photo <em>that you can release under
-                        a Creative Commons Attribution-ShareAlike license</em>
-                        or can locate a <em>copyright free</em> photo,
-                        <a href="mailto:<?= str_replace('@', '&#64;', CONTACTEMAIL) ?>">please email it to us</a>.
-                        Please do not email us about copyrighted photos
-                        elsewhere on the internet; we can&rsquo;t use them.
-                    </p>
-                  <?php } ?>
-                </div>
+                <?php include('_profile_footer.php'); ?>
 
             </div>
         </div>
diff --git a/www/includes/easyparliament/templates/html/mp/recent.php b/www/includes/easyparliament/templates/html/mp/recent.php
index 1f2658b1e9..759b11017c 100644
--- a/www/includes/easyparliament/templates/html/mp/recent.php
+++ b/www/includes/easyparliament/templates/html/mp/recent.php
@@ -49,7 +49,7 @@
                     </div>
                 <?php }
                 include('_covid19_panel.php');
-                include('_vote_footer.php'); ?>
+                include('_profile_footer.php'); ?>
             </div>
 
             <div class="sidebar__unit in-page-nav">
diff --git a/www/includes/easyparliament/templates/html/mp/register.php b/www/includes/easyparliament/templates/html/mp/register.php
index 68a1c98d85..cdb1aa48a9 100644
--- a/www/includes/easyparliament/templates/html/mp/register.php
+++ b/www/includes/easyparliament/templates/html/mp/register.php
@@ -42,35 +42,7 @@
                 </div>
                 <?php endif; ?>
 
-                <div class="panel panel--secondary">
-                    <p><?= gettext('Note for journalists and researchers: The data on this page may be used freely, on condition that TheyWorkForYou.com is cited as the source.') ?></p>
-
-                    <p><?php print gettext('This data was produced by TheyWorkForYou from a variety of sources.') . ' ';
-                        printf(gettext('Voting information from <a href="%s">Public Whip</a>.'), "https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/ $member_id&amp;showall=yes"); ?></p>
-
-                  <?php if($image && $image['exists']) {
-                      if(isset($data['photo_attribution_text'])) { ?>
-                    <p>
-                      <?php if(isset($data['photo_attribution_link'])) { ?>
-                        <?= gettext('Profile photo:') ?>
-                        <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
-                      <?php } else { ?>
-                        <?= gettext('Profile photo:') ?> <?= $data['photo_attribution_text'] ?>
-                      <?php } ?>
-                    </p>
-                  <?php }
-                  } else { ?>
-                    <p>
-                        We&rsquo;re missing a photo of <?= $full_name ?>.
-                        If you have a photo <em>that you can release under
-                        a Creative Commons Attribution-ShareAlike license</em>
-                        or can locate a <em>copyright free</em> photo,
-                        <a href="mailto:<?= str_replace('@', '&#64;', CONTACTEMAIL) ?>">please email it to us</a>.
-                        Please do not email us about copyrighted photos
-                        elsewhere on the internet; we can&rsquo;t use them.
-                    </p>
-                  <?php } ?>
-                </div>
+                <?php include('_profile_footer.php'); ?>
 
             </div>
         </div>
diff --git a/www/includes/easyparliament/templates/html/mp/votes.php b/www/includes/easyparliament/templates/html/mp/votes.php
index 85f9a7d208..f0c58ce548 100644
--- a/www/includes/easyparliament/templates/html/mp/votes.php
+++ b/www/includes/easyparliament/templates/html/mp/votes.php
@@ -269,7 +269,7 @@
                 <?php endif; ?>
                 <?php include('_covid19_panel.php'); ?>
 
-                <?php include('_vote_footer.php'); ?>
+                <?php include('_profile_footer.php'); ?>
             </div>
         </div>
     </div>