[East Herts] Update template design.

4 files changed, 70 insertions, 118 deletions

diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index bb6d0ed23..d057b9f7b 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -10,17 +10,42 @@
     </div> <!-- .wrapper -->
 
     [% IF pagefooter %]
-    <footer role="contentinfo">
-        <ul>
-            <li><a href="http://www.eastherts.gov.uk/article/10/A-to-Z">A to Z</a></li>
-            <li><a href="http://www.eastherts.gov.uk/article/3347/Accessibility" accesskey="0">Accessibility</a></li>
-            <li><a href="http://www.eastherts.gov.uk/article/3351/Disclaimer">Disclaimer</a></li>
-            <li><a href="http://www.eastherts.gov.uk/article/3352/Copyright-2016">Copyright 2016</a></li>
-            <li><a href="http://www.eastherts.gov.uk/privacy">Privacy, Data Protection and Fraud Prevention</a></li>
-            <li class="last"><a href="http://www.eastherts.gov.uk/article/6653/Neighbouring-Councils">Neighbouring Councils</a></li>
-        </ul>
-        <p>© 2016 East Herts Council , <strong>Telephone:</strong> +44 (0)1279 655261 <strong>Bishop's Stortford Office:</strong>- Charringtons House, Bishop's Stortford, Herts, CM23 2EN. <strong>Hertford Office:</strong>- Wallfields, Pegs Lane, Hertford, SG13 8EQ.</p>
-    </footer>
+	<div class="footer clearfix">
+		<div class="container">
+			<div class="footer__left"><img src="https://www.eastherts.gov.uk/image/29958/EastHertsLogo-Footer/original.png" width="250" height="75" alt="EastHertsLogo-Footer" title="EastHertsLogo-Footer" class="footer__logo" />
+				<div class="footer__socialmedia">
+				
+				<a href="https://www.facebook.com" rel="external" title="Facebook"><img src="https://www.eastherts.gov.uk/image/29956/Facebook/original.png" width="40" height="40" alt="Facebook" title="Facebook" />
+				</a>
+				
+				<a href="https://www.twitter.com" rel="external" title="Twitter"><img src="https://www.eastherts.gov.uk/image/29959/Twitter/original.png" width="40" height="40" alt="Twitter" title="Twitter" />
+				</a><img src="https://www.eastherts.gov.uk/image/29957/RSS/original.png" width="40" height="40" alt="RSS" title="RSS" />
+				</div>
+			</div>
+			<div class="footer__right">
+		<div class="footer__navigation">
+				<ul>
+							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34224/Site-map" class="footer__navlink">Site map</a>
+							</li>
+							<li class="footer__navitem"><a href="/article/34226/Terms--Conditions" class="footer__navlink">Terms & Conditions</a>
+							</li>
+							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34230/Privacy--Cookies" class="footer__navlink">Privacy & Cookies</a>
+							</li>
+							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34378/Privacy-Data-Protection-and-Fraud-Prevention" class="footer__navlink">Privacy, Data Protection and Fraud Prevention</a>
+							</li>
+							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34376/Comments-Compliments-and-Complaints" class="footer__navlink" accesskey="7">Comments, Compliments and Complaints</a>
+							</li>
+				</ul>
+		</div>
+				<div class="footer__copyright">
+					<p>&copy; 2017 mySociety</p>
+				</div>
+				<div class="footer__goss">
+					<a href="https://www.fixmystreet.com/about/council">Powered by FixMyStreet</a>
+				</div>
+			</div>
+		</div>
+	</div>
     [% END %]
 
     [% INCLUDE 'common_footer_tags.html' %]
diff --git a/templates/web/eastherts/header_extra.html b/templates/web/eastherts/header_extra.html
new file mode 100644
index 000000000..6a1d1bdc1
--- /dev/null
+++ b/templates/web/eastherts/header_extra.html
@@ -0,0 +1,2 @@
+<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700" rel="stylesheet" type="text/css">
+
diff --git a/templates/web/eastherts/header_logo.html b/templates/web/eastherts/header_logo.html
deleted file mode 100644
index 868edc6cd..000000000
--- a/templates/web/eastherts/header_logo.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a>
-<a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
-
-<div class="header__eh_top_nav">
-    <ul id="toputilnav" class="internal">
-        <li><a href="http://www.eastherts.gov.uk/">Home</a>
-        </li>
-        <li><a href="http://www.eastherts.gov.uk/cookies">Cookies on our site</a></li>
-        [%# <li><a href="http://www.eastherts.gov.uk/article/5/Log-in">Log in</a></li> %]
-        <li><a href="http://www.eastherts.gov.uk/search" accesskey="4">Search the site</a></li>
-        <li><a href="http://www.eastherts.gov.uk/article/42/Site-Map" accesskey="3">Site Map</a></li>
-        <li class="last"><a href="http://www.eastherts.gov.uk/article/6715/Translation-Services">Translation Services</a></li>
-    </ul>
-    <ul id="bannerimages">
-        <li><a href="http://www.eastherts.gov.uk/payments"><img src="[% version('/cobrands/eastherts/img/paymentsd1.gif') %]" width="110" height="50" alt="Payments"></a>
-        </li>
-        <li><a href="http://www.eastherts.gov.uk/report"><img src="[% version('/cobrands/eastherts/img/reportd1.gif') %]" width="110" height="50" alt="Report"></a>
-        </li>
-        <li><a href="http://www.eastherts.gov.uk/contactus"><img src="[% version('/cobrands/eastherts/img/contactusd1.gif') %]" width="110" height="50" alt="Contact Us"></a>
-        </li>
-        <li>
-        <img src="[% version('/cobrands/eastherts/img/consultationd1.gif') %]" width="110" height="50" alt="Consultations">
-        </li>
-    </ul>
-</div>
\ No newline at end of file
diff --git a/templates/web/eastherts/header_site.html b/templates/web/eastherts/header_site.html
index 30f692573..5f1f4965e 100644
--- a/templates/web/eastherts/header_site.html
+++ b/templates/web/eastherts/header_site.html
@@ -1,87 +1,37 @@
-<header id="site-header" role="banner">
+<div class="toputils">
     <div class="container">
-        [% INCLUDE 'header_logo.html' %]
+        <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
         <a href="#main-nav" id="nav-link">Main Navigation</a>
-    </div>
-    <div class="header__eh_nav">
-        <div class="container">
-            <ul>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/11/A">A - Z Index - A</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/12/B">B</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/13/C">C</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/14/D">D</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/15/E">E</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/16/F">F</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/17/G">G</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/18/H">H</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/29071/I">I</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/20/J">J</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/21/K">K</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/22/L">L</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/23/M">M</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/24/N">N</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/25/O">O</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/26/P">P</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/28/R">R</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/29/S">S</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/30/T">T</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/31/U">U</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/32/V">V</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/33/W">W</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/34/X">X</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/35/Y">Y</a>
-                </li>
-                <li>
-                    <a href="http://www.eastherts.gov.uk/article/36/Z">Z</a>
-                </li>
-            </ul>
+        <!-- <a href="https://www.eastherts.gov.uk/article/34246/Search">Search</a> -->
+
+        <div class="toputils__right desk-only">
+            <div class="toputils__nav">
+                    <ul class="toputils__navlist">
+                                <li><a href="/article/34210/Accessibility" class="toputils__navitem">Accessibility</a>
+                                </li>
+                                <li><a href="/article/34212/A-Z-of-Services" class="toputils__navitem">A-Z of Services</a>
+                                </li>
+                                <li><a href="/article/34377/Contact-us" class="toputils__navitem">Contact us</a>
+                                </li>
+                    </ul>
+            </div>
         </div>
     </div>
+</div>
+
+<header id="site-header" role="banner">
+    <div class="container">
+        <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a>
+		<div class="mainmenu desk-only">
+			<ul class="mainmenu__list">
+				<li class="footer__navitem"><a href="http://www.eastherts.gov.uk/residents" class="mainmenu__item">Residents</a></li>
+				<li class="footer__navitem"><a href="http://www.eastherts.gov.uk/business" class="mainmenu__item">Business</a></li>
+				<li class="footer__navitem"><a href="http://www.eastherts.gov.uk/council" class="mainmenu__item">Your Council</a></li>
+				<li class="footer__navitem"><a href="http://www.eastherts.gov.uk/news" class="mainmenu__item">News</a></li>
+			</ul>
+		</div>
+		<div class="searchcontrol desk-only">
+			<a href="https://www.eastherts.gov.uk/article/34246/Search" class="searchcontrol__expandtoggle">Search</a>
+		</div>
+    </div>
 </header>