7 files changed, 24 insertions, 17 deletions
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index a1787c699..b720a5f99 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -3,6 +3,7 @@
 
 <script src="/js/jquery.validate.js" type="text/javascript" charset="utf-8"></script>
 
+<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script>
 
 [% map_js %]
diff --git a/templates/web/default/debug_footer.html b/templates/web/default/debug_footer.html
index ffb3abbab..a1b7fc155 100644
--- a/templates/web/default/debug_footer.html
+++ b/templates/web/default/debug_footer.html
@@ -1,4 +1,4 @@
-[% IF c.config.STAGING_SITE %]
+[% IF c.config.STAGING_SITE and c.config.SHOW_DEBUG %]
 
 <hr style="clear: both;">
 
diff --git a/templates/web/default/debug_header.html b/templates/web/default/debug_header.html
index 1468d171c..92ccbc357 100644
--- a/templates/web/default/debug_header.html
+++ b/templates/web/default/debug_header.html
@@ -1,4 +1,4 @@
-[% IF c.config.STAGING_SITE %]
+[% IF c.config.STAGING_SITE and c.config.SHOW_DEBUG %]
     <p class="dev-site-notice">
         [% loc("This is a developer site; things might break at any time, and the database will be periodically deleted.") %]
     </p>
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index bd684b722..b1f22da2c 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -14,7 +14,7 @@
 
 <div id="footer">
     <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
-    | <a href="/contact">[% loc("Contact FixMyStreet") %]</a></p>
+    | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a></p>
 
     <p>Mobile apps:
         <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>,
diff --git a/templates/web/default/front/stats.html b/templates/web/default/front/stats.html
index 4b98ef31e..c5d931d08 100644
--- a/templates/web/default/front/stats.html
+++ b/templates/web/default/front/stats.html
@@ -4,8 +4,6 @@
     # 'Template::Plugin::Number::Format'
 %]
 
-<h2>[% loc('FixMyStreet updates') %]</h2>
-
 [%
     stats = c.cobrand.front_stats_data();
 
@@ -43,4 +41,3 @@
     [% END %]
     <div>[% tprintf( updates_text, stats.updates ) | comma %]</div>
 </div>
-
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 5290ffc41..b240bfb06 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -1,12 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="[% lang_code %]">
+<!doctype html>
+<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]>   <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]>   <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
     <head>
 
+        <meta name="viewport" content="initial-scale=1.0; target-densitydpi=device-dpi">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+        <meta name="HandHeldFriendly" content="true">
+        <meta name="mobileoptimized" content="0">
+
         <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
         <link rel="stylesheet" type="text/css" href="[% version('/css/main.css') %]">
-        <!--[if LT IE 7]>
-            <link rel="stylesheet" type="text/css" href="/css/ie6.css">
-        <![endif]-->
 
         [% INCLUDE 'js_validation_msgs.html' %]
 
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index 131701b0e..96f5c33de 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -29,12 +29,12 @@
 
 <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
     <label for="pc">[% question %]:</label>
-    &nbsp;<input type="text" name="pc" value="" id="pc" size="10" maxlength="200">
-    &nbsp;<input type="submit" value="[% loc('Go') %]" id="submit">
+    <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200">
+    <input type="submit" value="[% loc('Go') %]" id="submit">
+    </span>
     [% c.cobrand.form_elements('postcodeForm') %]
 </form>
 
-
 <div id="front_intro">
 
     <h2>[% loc('How to report a problem') %]</h2>
@@ -59,22 +59,24 @@
 
 [% IF probs.size || recent_photos.size %]
 <div id="front_recent">
+    <h2>[% loc('Recently reported problems') %]</h2>
     [% IF recent_photos.size %]
-        <h2>[% loc('Photos of recent reports') %]</h2>
+        <p id="front_photos">
         [% FOREACH p IN recent_photos %]
             <a href="/report/[% p.id %]"><img border="0" height="100"
                 src="/photo?tn=1;id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
         [% END %]
+        </p>
     [% END %]
 
     [% IF probs.size %]
 
-        <h2>[% loc('Recently reported problems') %]</h2>
     
-        <ul>
+        <ul id="nearby_lists">
         [% FOREACH p IN probs %]
             <li>
                 <a href="/report/[% p.id %]">[% p.title | html %]</a>
+                <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small>
             </li>    
         [% END %]
         </ul>