Move modernizer/extra_js into common template.

9 files changed, 2 insertions, 17 deletions

diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html
index dccbe70fb..c1d9870cd 100644
--- a/templates/web/angus/header.html
+++ b/templates/web/angus/header.html
@@ -23,9 +23,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/angus/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
             <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index ca087fc86..77c28232b 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -5,6 +5,7 @@
 
 <meta name="cobrand" content="[% c.cobrand.moniker %]">
 
+<script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
 <script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
 
 <script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script>
@@ -30,6 +31,7 @@
 [% END %]
 
 [% map_js %]
+[% extra_js %]
 
 [% IF robots %]
     <meta name="robots" content="[% robots %]">
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index b57f5d50f..c11e78b47 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -31,9 +31,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
             <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index 0459ed5d7..17765948f 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -19,9 +19,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
 
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index a1472105d..c549c41ee 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -20,9 +20,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico">
 
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index f9761aa96..ebacf9e6a 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -17,9 +17,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         [% INCLUDE 'tracking_code.html' %]
         [% PROCESS 'header_extra.html' %]
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 3b6761b5c..f5d68eabe 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -17,9 +17,7 @@
             <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
         <![endif]-->
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-        [% extra_js %]
 
         [% INCLUDE 'tracking_code.html' %]
         [% PROCESS 'header_extra.html' %]
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 14d1db37a..d55e27dba 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -25,11 +25,8 @@
         <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
     <![endif]-->
 
-    <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
-
     [% INCLUDE 'common_header_tags.html' %]
 
-    [% extra_js %]
     [% PROCESS 'header_extra.html' %]
 </head>
 
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index bf4d7e478..7697a6055 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -19,10 +19,8 @@
 
         <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css">
 
-        <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
         <script src="[% version('/cobrands/zurich/validation_rules.js') %]"></script>
-        [% extra_js %]
 
         <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script>