Improve subscribe page and links

classes/Homepage.php

@@ -63,7 +63,7 @@ protected function getSearchBox(array $data): Search\SearchBox{
             $search_box->add_quick_link('Find out more about your MP (' . $data["mp_data"]['name'] . ')', $data["mp_data"]['mp_url'], 'torso');
         }
         $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone');
-        $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail');
+        $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail');
         $search_box->add_quick_link('Donate to support our work', '/support-us/', 'pound');
         $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass');
         return $search_box;

classes/SPHomepage.php

@@ -27,7 +27,7 @@ protected function getSearchBox(array $data): Search\SearchBox{
             $search_box->add_quick_link('Find out more about your MSPs for ' . $data["mp_data"]["constituency"] . ' (' . $regional_con . ')', '/postcode/?pc=' . $data["mp_data"]['postcode'], 'torso' );
         }
         $search_box->add_quick_link('Create and manage email alerts', '/alert/', 'megaphone');
-        $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail');
+        $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail');
         $search_box->add_quick_link('Donate to support our work', '/support-us/', 'pound');
         $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass');
         return $search_box;

classes/SectionView/NiView.php

@@ -115,7 +115,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S
             $search_box->add_quick_link('Find out more about your MLAs for ' . $constituency, '/postcode/?pc=' . $postcode, 'torso');
         }
         $search_box->add_quick_link('Create and manage email alerts', '/alert/','megaphone');
-        $search_box->add_quick_link('Subscribe to our newsletter', 'https://www.mysociety.org/subscribe/', 'mail');
+        $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail');
         $search_box->add_quick_link('Donate to support our work', '/support-us/','pound');
         $search_box->add_quick_link('Learn more about TheyWorkForYou', '/about/', 'magnifying-glass');
         return $search_box;

classes/SectionView/SeneddView.php

@@ -121,7 +121,7 @@ protected function getSearchBox(array $data): \MySociety\TheyWorkForYou\Search\S
         $search_box->add_quick_link(sprintf(gettext('Find out more about your MSs for %s and %s'), $constituencies[0], $constituencies[1]), '/postcode/?pc=' . $data["mp_data"]['postcode'],'torso');
         }
         $search_box->add_quick_link(gettext('Create and manage email alerts'), '/alert/','megaphone');
-        $search_box->add_quick_link(gettext('Subscribe to our newsletter'), 'https://www.mysociety.org/subscribe/', 'mail');
+        $search_box->add_quick_link(gettext('Subscribe to our newsletter'), '/about/#about-mysociety', 'mail');
         $search_box->add_quick_link(gettext('Donate to support our work'), '/support-us/', 'pound');
         $search_box->add_quick_link(gettext('Learn more about TheyWorkForYou'), '/about/', 'magnifying-glass');
         return $search_box;

locale/cy_GB.UTF-8/LC_MESSAGES/TheyWorkForYou.po

@@ -2619,7 +2619,7 @@ msgid "About mySociety"
 msgstr "Ynglŷn â mySociety"
 
 #: www/includes/easyparliament/templates/html/static/about.php:34
-msgid "TheyWorkForYou is run by <a href=\"https://www.mysociety.org/\">mySociety</a>, a UK charity that puts <a href=\"https://www.mysociety.org/2021/11/24/the-need-to-repower-democracy/\">power in more people's hands</a> through the use of digital tools and data."
+msgid "TheyWorkForYou is run by <a href=\"https://www.mysociety.org/\">mySociety</a>, a UK charity that helps people access information and participate in democracy. We enable people across the UK to become changemakers by providing technology, research and data, openly and for free."
 msgstr "Mae TheyWorkForYou yn cael ei reoli gan <a href=\"https://www.mysociety.org/\">mySociety</a>, elusen yn y Deyrnas Unedig sy'n rhoi grym yn nwylo mwy o bobl drwy ddefnyddio data  ac offer digidol."
 
 #: www/includes/easyparliament/templates/html/static/about.php:35
@@ -2631,7 +2631,7 @@ msgid "Find out more about how mySociety is funded."
 msgstr "Rhagor o wybodaeth am y modd y mae mySociety yn cael ei ariannu."
 
 #: www/includes/easyparliament/templates/html/static/about.php:39
-msgid "Sign up for updates from mySociety"
+msgid "Sign up for updates on our democracy and Parliaments work"
 msgstr "Cofrestrwch am y newyddion diweddaraf gan mySociety"
 
 #: www/includes/easyparliament/templates/html/static/about.php:61

www/includes/easyparliament/templates/html/static/about.php

@@ -29,14 +29,9 @@
 
 
         </div>
-        <div class="panel about-page__mysociety">
+        <div class="panel about-page__mysociety" id="about-mysociety">
             <h1><?= gettext('About mySociety') ?></h1>
-            <p><?= gettext('TheyWorkForYou is run by <a href="https://www.mysociety.org/">mySociety</a>, a UK charity that puts <a href="https://www.mysociety.org/2021/11/24/the-need-to-repower-democracy/">power in more people\'s hands</a> through the use of digital tools and data.') ?></p>
-            <p><?= gettext('Through <strong>TheyWorkForYou</strong> and <strong>WriteToThem</strong> we have made elected representatives more transparent and contactable. Every year, hundreds of thousands of reports are made through <strong>FixMyStreet</strong>, and over a million Freedom of Information requests have been made through <strong>WhatDoTheyKnow</strong>.') ?></p>
-
-            <p><a href="https://www.mysociety.org/about/funding/"><?= gettext('Find out more about how mySociety is funded.') ?></a></p>
-
-            <h3><?= gettext('Sign up for updates from mySociety')?></h3>
+            <h3><?= gettext('Sign up for updates on our democracy and Parliaments work')?></h3>
             <form method="post" class="footer__newsletter-form" action="//mysociety.us9.list-manage.com/subscribe/post?u=53d0d2026dea615ed488a8834&amp;id=287dc28511" onsubmit="trackFormSubmit(this, 'FooterNewsletterSignup', 'submit', null); return false;">
                 <div class="row collapse">
                     <div class="small-8 columns">
@@ -46,12 +41,20 @@
                         <label style="position: absolute; left: -5000px;">
                           Leave this box empty: <input type="text" name="b_53d0d2026dea615ed488a8834_287dc28511" tabindex="-1" value="" />
                         </label>
-                        <input type="hidden" name="group[11745][32]" value="1">
+                        <input type="hidden" name="group[11745][4]" value="1">
                         <input type="submit" value="Subscribe" name="subscribe" class="button prefix">
                     </div>
                 </div>
+                <div class="row collapse">
+                  <div class="small-12 columns">
+                      <label>
+                          <input type="checkbox" name="group[11745][32]" value="1" style="height: 1em;" checked>
+                      Also sign up to the monthly mySociety newsletter
+                      </label>
+                  </div>
+                </div>
             </form>
-            <hr>
+          <hr>
             <p><?= gettext('TheyWorkForYou is run by <a href="https://www.mysociety.org/">mySociety</a>, a UK charity that helps people access information and participate in democracy. We enable people across the UK to become changemakers by providing technology, research and data, openly and for free.') ?></p>
             <p><?= gettext('Through <strong>TheyWorkForYou</strong> and <strong>WriteToThem</strong> we have made elected representatives more transparent and contactable. Every year, hundreds of thousands of reports are made through <strong>FixMyStreet</strong>, and over a million Freedom of Information requests have been made through <strong>WhatDoTheyKnow</strong>.') ?></p>