4 files changed, 38 insertions, 29 deletions
diff --git a/templates/web/base/common_footer_tags.html b/templates/web/base/common_footer_tags.html
new file mode 100644
index 000000000..302d802d0
--- /dev/null
+++ b/templates/web/base/common_footer_tags.html
@@ -0,0 +1,32 @@
+[% USE date %][% USE Math %]
+
+[% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
+
+<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>
+<!--[if lte IE 9]>
+  <script type="text/javascript" src="[% version('/js/history.polyfill.min.js') %]"></script>
+<![endif]-->
+<script type="text/javascript" src="[% version('/js/validation_rules.js') %]"></script>
+<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script>
+
+[% map_js %]
+<script src="[% version('/cobrands/fixmystreet/map.js') %]"></script>
+
+<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
+<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
+
+[% IF admin %]
+  <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script>
+  <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script>
+[% END %]
+
+[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
+[% IF moderating %]
+  <script type="text/javascript" src="[% version('/js/moderate.js') %]"></script>
+[% END %]
+
+[% extra_js %]
+
+[% TRY %][% PROCESS 'footer_extra_js.html' %][% CATCH file %][% END %]
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 7f81a020c..24d2f11e5 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -1,4 +1,3 @@
-[% USE date %][% USE Math %]
 [% SET start = c.config.ADMIN_BASE_URL IF admin %]
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8"
@@ -8,35 +7,16 @@
 <!--[if (lt IE 9)]>
     <script src="[% version('/js/html5shiv.js') %]""></script>
 <![endif]-->
-<script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
-<script src="[% version('/cobrands/fixmystreet/header.js') %]"></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>
-<!--[if lte IE 9]>
-  <script type="text/javascript" src="[% version('/js/history.polyfill.min.js') %]"></script>
-<![endif]-->
-<script type="text/javascript" src="[% version('/js/validation_rules.js') %]"></script>
-<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script>
-
-<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
-<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
+<script>
+    window.Modernizr=function(e,t,n){function r(e){p.cssText=e}function o(e,t){return typeof e===t}var a,i,c,l="2.8.3",s={},u=t.documentElement,d="modernizr",f=t.createElement(d),p=f.style,m=({}.toString,{}),h=[],y=h.slice,v=function(e,n,r,o){var a,i,c,l,s=t.createElement("div"),f=t.body,p=f||t.createElement("body");if(parseInt(r,10))for(;r--;)c=t.createElement("div"),c.id=o?o[r]:d+(r+1),s.appendChild(c);return a=["&#173;",'<style id="s',d,'">',e,"</style>"].join(""),s.id=d,(f?s:p).innerHTML+=a,p.appendChild(s),f||(p.style.background="",p.style.overflow="hidden",l=u.style.overflow,u.style.overflow="hidden",u.appendChild(p)),i=n(s,e),f?s.parentNode.removeChild(s):(p.parentNode.removeChild(p),u.style.overflow=l),!!i},g=function(t){var n=e.matchMedia||e.msMatchMedia;if(n)return n(t)&&n(t).matches||!1;var r;return v("@media "+t+" { #"+d+" { position: absolute; } }",function(t){r="absolute"==(e.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position}),r},b={}.hasOwnProperty;c=o(b,"undefined")||o(b.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(e,t){return b.call(e,t)};for(var E in m)c(m,E)&&(i=E.toLowerCase(),s[i]=m[E](),h.push((s[i]?"":"no-")+i));return r(""),f=a=null,s._version=l,s.mq=g,s.testStyles=v,s}(this,this.document);
+    var fixmystreet=fixmystreet||{};
+    (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8"),c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" mobile-reporting-map only-map"))})(document);
+</script>
 
 [% IF admin %]
-  <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script>
   <link rel="stylesheet" href="[% version('/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css') %]">
-  <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script>
 [% END %]
 
-[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
-[% IF moderating %]
-  <script type="text/javascript" src="[% version('/js/moderate.js') %]"></script>
-[% END %]
-
-[% map_js %]
-[% extra_js %]
-
 [% IF robots %]
     <meta name="robots" content="[% robots %]">
 [% ELSIF c.config.STAGING_SITE %]
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index d046d6297..0356840da 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -40,11 +40,9 @@
                 </div>
             </div>
         </div>
-
-<!-- [% INCLUDE 'debug_footer.html' %] -->
     </div> <!-- .wrapper -->
 
-    [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
+    [% INCLUDE 'common_footer_tags.html' %]
 
 </body>
 </html>
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index b9dc0747c..bc71847ad 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -30,7 +30,6 @@
     <div id="map">
       [% INCLUDE 'maps/noscript_map.html' js = 1 %]
     </div>
-    <script src="[% version('/cobrands/fixmystreet/map.js') %]"></script>
     [% IF map.copyright %]
     <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
     [% END %]