fixes header and footer

templates/Includes/Footer.ss

@@ -41,7 +41,7 @@
       <% if $SiteConfig.FooterLogoSecondary %>
         src="$SiteConfig.FooterLogoSecondary.URL"
       <% else %>
-        src="themes/watea/images/cwp-logo.png"
+        src="/resources/themes/watea/images/cwp-logo.png"
       <% end_if %>
 
       <% if $SiteConfig.FooterLogoSecondaryDescription %>
@@ -63,7 +63,7 @@
       <% if $SiteConfig.FooterLogo %>
         src="$SiteConfig.FooterLogo.URL"
       <% else %>
-        src="themes/watea/images/newzealand-government-footer.png"
+        src="/resources/themes/watea/images/newzealand-government-footer.png"
       <% end_if %>
 
       <% if $SiteConfig.FooterLogoDescription %>

templates/Includes/Header.ss

@@ -1,26 +1,34 @@
-<div class="container site-header">
-    <% include SkipLinks %>
-    <div class="site-header-brand">
-        <a title="<%t CWP_Header.Title "Go to Home Page" %>" class="site-header-brand-link-default" href="$BaseHref">
-            <% if $SiteConfig.Logo %>
-                <img
-                    src="$SiteConfig.Logo.URL" width="$SiteConfig.Logo.Width" height="$SiteConfig.Logo.Height"
-                    alt="$SiteConfig.Title"
-                    aria-hidden="true" />
-            <% else %>
-                <span>$SiteConfig.Title</span>
+<div class="site-header-background">
+    <div class="container site-header">
+        <% include SkipLinks %>
+        <div class="site-header-brand">
+            <a title="<%t CWP_Header.Title "Go to Home Page" %>" class="site-header-brand-link-default" href="$BaseHref">
+                <% if $SiteConfig.Brandmark %>
+                    <img
+                        src="$SiteConfig.Brandmark.URL" width="$SiteConfig.Brandmark.Width" height="$SiteConfig.Brandmark.Height"
+                        alt="$SiteConfig.Title - Brandmark" class="brandmark"
+                        aria-hidden="true" />
+                <% end_if %>
+                <% if $SiteConfig.Logo %>
+                    <img
+                        src="$SiteConfig.Logo.URL" width="$SiteConfig.Logo.Width" height="$SiteConfig.Logo.Height"
+                        alt="$SiteConfig.Title" class="logo"
+                        aria-hidden="true" />
+                <% else %>
+                    <span>$SiteConfig.Title</span>
+                <% end_if %>
+            </a>
+            <% if $SiteConfig.Tagline %>
+                <span class="site-header-brand-tagline small">$SiteConfig.Tagline</span>
             <% end_if %>
-        </a>
-        <% if $SiteConfig.Tagline %>
-            <span class="site-header-brand-tagline small">$SiteConfig.Tagline</span>
-        <% end_if %>
+        </div>
+        <button type="button" class="navbar-toggle collapsed pull-right" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
+            <span class="sr-only"><%t CWP_Header.Toggle "Toggle navigation" %></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+        <% include HeaderSearch %>
+        <% include LanguageSelector %>
     </div>
-    <button type="button" class="navbar-toggle collapsed pull-right" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
-        <span class="sr-only"><%t CWP_Header.Toggle "Toggle navigation" %></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-    </button>
-    <% include HeaderSearch %>
-    <% include LanguageSelector %>
 </div>

templates/Page.ss

@@ -26,6 +26,6 @@
         <% require javascript('//code.jquery.com/jquery-1.7.2.min.js') %>
         <% require javascript('themes/starter/dist/js/main.js') %>
         <% require javascript('themes/watea/dist/js/main.js') %>
-        <% include GoogleAnalytics %>
+        <!-- % include GoogleAnalytics % -->
     </body>
 </html>