From aea31199fd2ad48c4458b94371166eb997e5831f Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 22 Oct 2024 17:37:19 +0100
Subject: [PATCH] fix form to add alerts for when a rep is mentioned

---
 www/docs/style/sass/parts/_accordion.scss           | 10 ++++++++++
 .../easyparliament/templates/html/alert/index.php   | 13 ++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/www/docs/style/sass/parts/_accordion.scss b/www/docs/style/sass/parts/_accordion.scss
index f6d797785e..b8408fd3fa 100644
--- a/www/docs/style/sass/parts/_accordion.scss
+++ b/www/docs/style/sass/parts/_accordion.scss
@@ -76,6 +76,10 @@
 
     .alert-controller-wrapper {
         margin-bottom: 2rem;
+        form {
+            display: inline;
+        }
+
         button {
             margin-bottom: 0;
             span {
@@ -114,6 +118,12 @@
     }
 }
 
+.alert-page-alert-controls {
+    form {
+        display: inline;
+    }
+}
+
 .keyword-list {
     ul {
         list-style: none;
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 8a92f25cca..f875ee8cd6 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -438,7 +438,6 @@
                           <li>
                               <?= sprintf(gettext('You are not subscribed to an alert for your current MP, %s'), $current_mp->full_name()) ?>.
                               <form action="<?= $actionurl ?>" method="post">
-                                  <input type="hidden" name="t" value="<?=_htmlspecialchars($token)?>">
                                   <input type="hidden" name="pid" value="<?= $current_mp->person_id() ?>">
                                   <input type="submit" class="button" value="<?= gettext('Subscribe') ?>">
                               </form>
@@ -450,7 +449,7 @@
                           <h3 class="alert-page-subsection--heading"><?= gettext('Your MP') ?> ﹒ XXX</h3>
 
                           <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
-                          <div>
+                          <div class="alert-page-alert-controls">
                             <form action="<?= $actionurl ?>" method="POST">
                               <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
                               <?php if ($alert['status'] == 'unconfirmed') { ?>
@@ -481,13 +480,11 @@
                               </button>
                             </form>
                               <?php } ?>
-                          </div>
 
                           <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
                           <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
                           <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="speaker" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
+                            <input type="hidden" name="keyword" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
                             <button type="submit" class="button small" name="action" value="Subscribe">
                               <?= gettext('Create new alert') ?>
                               <i aria-hidden="true" role="img" class="fi-megaphone"></i>
@@ -503,7 +500,7 @@
                         <h3 class="alert-page-subsection--heading"><?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?></h3>
 
                           <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?>
-                          <div>
+                          <div class="alert-page-alert-controls">
                             <form action="<?= $actionurl ?>" method="POST">
                               <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
                               <?php if ($alert['status'] == 'unconfirmed') { ?>
@@ -534,13 +531,11 @@
                               </button>
                               <?php } ?>
                             </form>
-                          </div>
 
                           <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
                           <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
                           <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="speaker" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
+                            <input type="hidden" name="keyword" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
                             <button type="submit" class="button small" name="action" value="Subscribe">
                               <?= gettext('Create new alert') ?>
                               <i aria-hidden="true" role="img" class="fi-megaphone"></i>