Merge branch 'release/v1.7.1'

functions.php

@@ -1,7 +1,7 @@
 <?php
 
 // Theme version
-define( 'EDD_VERSION', '1.7' );
+define( 'EDD_VERSION', '1.7.1' );
 
 // Included classes
 include 'src/CreateMetaBox.php';

inc/content/footer-content.php

@@ -11,8 +11,8 @@
         <h4>Find out more</h4>
         <ul>
             <li><a href="/contact-us/">Contact us</a></li>
-							<li><a href="/about/press-room/">Press room</a></li>
-							<li><a href="about/jobs/">Jobs and careers</a></li>
+			<li><a href="/about/press-room/">Press room</a></li>
+			<li><a href="/about/jobs/">Jobs and careers</a></li>
             <li><a href="/about/get-involved/friends-of-the-national-archives/">Friends of The National Archives</a></li>
         </ul>
     </div>

inc/content/footer-newsletter.php

@@ -3,21 +3,22 @@
         <img src="http://www.nationalarchives.gov.uk/wp-content/themes/tna-base/img/tna-newsletter-icon.png" alt="TNA Newsletter Icon"/>
     </div>
 
-    <div class="news-content">
+    <div class="news-content" id="newsletterAccessibility">
         <h2>Send me The National Archives’ newsletter</h2>
         <p>A monthly round-up of news, blogs, offers and events</p>
     </div>
 
     <div class="news-form">
-        <form name="signup" id="signup" action="http://r1.wiredemail.net/signup.ashx" method="post" role="form">
+        <form name="signup" id="signup" action="https://r1-t.trackedlink.net/signup.ashx" method="post" role="form">
             <input type="hidden" name="addressbookid" value="636353"> <!-- homepage and general sign up -->
             <!-- input type="hidden" name="addressbookid" value="732466" --> <!-- first world war portal sign up -->
             <input type="hidden" name="userid" value="173459">
+            <input type="hidden" name="cd_SOURCE" value="web">
             <input type="hidden" name="ReturnURL"
                    value="http://www.nationalarchives.gov.uk/about/get-involved/newsletters/the-national-archives-newsletter/thank-you/">
             <label for="Email">Send me The National Archives’ newsletter</label>
             <input type="email" name="Email" id="Email" required="required"
-                   placeholder="Enter your email address">
+                   placeholder="Enter your email address" aria-labelledby="newsletterAccessibility">
             <input id="newsletterSignUp" type="submit" name="Submit" value="Subscribe" class="margin-left-medium">
         </form>
     </div>

style.css

@@ -4,7 +4,7 @@ Theme URI: https://github.com/nationalarchives
 Author: The National Archives
 Author URI: https://github.com/nationalarchives
 Description: Theme for website of The National Archives
-Version: 1.7
+Version: 1.7.1
 License: GNU General Public License
 License URI: license.txt
 Text Domain: tna-base