add in mobile nav banners and info button where required

remove redundant includes and header content
author: Struan Donald <struan@exo.org.uk> 2012-05-25 12:35:03 +0100
committer: Struan Donald <struan@exo.org.uk> 2012-05-25 12:35:03 +0100
commit: e050af29ca4b0dd6629e418804846a61d1a1293e (patch)
tree: b97b684e2b75d072ff557831a1d96c90c629aea3 /phonegap/www
parent: a7140e8b6fe96ba8cb77ee89794c28fd9f7c4873 (diff)
6 files changed, 41 insertions, 191 deletions
diff --git a/phonegap/www/about.html b/phonegap/www/about.html
index 4fd76aa0d..4d1345a6a 100644
--- a/phonegap/www/about.html
+++ b/phonegap/www/about.html
@@ -13,34 +13,12 @@
 	<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
     <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
     <script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="js/modernizr.custom.61367.js" type="text/javascript" charset="utf-8"></script>
 
-        <script type="text/javascript" src="js/geo.min.js"></script>
         <script type="text/javascript" src="js/fixmystreet.js"></script>
         <script type="text/javascript" src="js/mobile.js"></script>
 
-        <script type="text/javascript">
-            validation_strings = {
-                update: 'Please enter a message',
-                title: 'Please enter a subject',
-                detail: 'Please enter some details',
-                name: {
-                    required: 'Please enter your name',
-                    validName: 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below'
-                },
-                category: 'Please choose a category',
-                rznvy: {
-                    required: 'Please enter your email',
-                    email: 'Please enter a valid email'
-                },
-                email: {
-                    required: 'Please enter your email',
-                    email: 'Please enter a valid email'
-                }
-            };
-            </script>
   </head>
-    <body class="frontpage fullwidthpage">
+    <body class="frontpage fullwidthpage mobile-header">
         
         <div class="wrapper">
             <div class="table-cell">
@@ -55,6 +33,8 @@
                     <div class="content" role="main">                        
                         
                         <div class="tablewrapper">
+                            <div class="container">
+                                <div class="content" role="main">
      
                             <h1><a name="faq"></a>Frequently Asked Questions</h1>
     <dl>
@@ -172,12 +152,11 @@ our servers).
 
 Let us know if we&rsquo;ve missed anyone.</dd>
     </dl>
-                        </div>
                     </div><!-- .content role=main -->
                 </div><!-- .container -->
             </div><!-- .table-cell -->
             
-            <div class="big-green-banner mobile-map-banner">
+            <div class="big-green-banner mobile-map-banner mobile-nav-banner">
                 <a href="index.html">home</a>
                 About
             </div>
diff --git a/phonegap/www/around.html b/phonegap/www/around.html
index f921655e3..52d0251fe 100644
--- a/phonegap/www/around.html
+++ b/phonegap/www/around.html
@@ -18,11 +18,10 @@
 <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
 
 <script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/modernizr.custom.61367.js" type="text/javascript" charset="utf-8"></script>
 
 <script type="text/javascript" src="js/geo.min.js"></script>
 <script type="text/javascript" src="js/fixmystreet.js"></script>
-    <script type="text/javascript" src="js/mobile.js"></script>
+<script type="text/javascript" src="js/mobile.js"></script>
 <script type="text/javascript" src="js/OpenLayers.fixmystreet.js"></script>
 <script type="text/javascript" src="js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="js/map-bing-ol.js"></script>
@@ -318,23 +317,6 @@ var fixmystreet = {
             </div><!-- .container -->
         </div><!-- .table-cell -->
 
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul id="mysoc-menu">
-                        <li><a id="mysoc-logo" href="http://www.mysociety.org/" rel="external">mySociety</a></li><li><a href="http://mysociety.org/donate/" rel="external">Donate</a></li><li><a href="http://www.mysociety.org/projects/" rel="external">Our Sites</a></li>
-                    </ul>
-
-                    <ul id="main-menu">
-                        <li><a href="index.html" class="report-a-problem-btn">Report a problem</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-<!-- 
-
- -->
     </div> <!-- .wrapper -->
 </body>
 </html>
diff --git a/phonegap/www/css/mobile.css b/phonegap/www/css/mobile.css
index 748d0fbdf..29203bf31 100644
--- a/phonegap/www/css/mobile.css
+++ b/phonegap/www/css/mobile.css
@@ -1,3 +1,7 @@
+.mobile-nav-banner {
+    background: black;
+}
+
 .mobile-info {
     position: fixed;
     bottom: 0px;
@@ -40,3 +44,17 @@
   right: 0.3em;
   bottom: 0.3em;
 }
+
+.mobile-map-banner {
+    position: fixed;
+}
+
+.mobile-header {
+    margin-top: 35px;
+}
+
+
+
+.mobile-header #site-logo {
+    margin-top: 35px;
+}
+\ No newline at end of file
diff --git a/phonegap/www/email_sent.html b/phonegap/www/email_sent.html
index 33f190270..2b4a24cff 100644
--- a/phonegap/www/email_sent.html
+++ b/phonegap/www/email_sent.html
@@ -1,9 +1,4 @@
 <!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 9]>   <html class="no-js ie9 oldie" lang="en-gb"><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js" lang="en-gb"><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
 
@@ -12,76 +7,25 @@
         <meta name="mobileoptimized" content="0">
 
         <link rel="stylesheet" href="css/base.css">
+        <link rel="stylesheet" href="css/mobile.css">
         <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)">
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="/cobrands/fixmystreet/layout.css?1331294274">
-        <![endif]-->
-
-        <script type="text/javascript">
-    validation_strings = {
-        update: 'Please enter a message',
-        title: 'Please enter a subject',
-        detail: 'Please enter some details',
-        name: {
-            required: 'Please enter your name',
-            validName: 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below'
-        },
-        category: 'Please choose a category',
-        rznvy: {
-            required: 'Please enter your email',
-            email: 'Please enter a valid email'
-        },
-        email: {
-            required: 'Please enter your email',
-            email: 'Please enter a valid email'
-        }
-    };
-</script>
-
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
-
 <script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
-
-<script src="js/modernizr.custom.61367.js" type="text/javascript" charset="utf-8"></script>
-
-
-<script type="text/javascript" src="js/geo.min.js"></script>
 <script type="text/javascript" src="js/fixmystreet.js"></script>
-
-
-
-
-
-
-    <meta name="robots" content="noindex,nofollow">
-
-
-
-
 <title>
     Create a report :: 
     FixMyStreet
 </title>
-
-                
-        
-
-        
-<!-- Tracking code not inserted as "http://matthew.fixmystreet.dev.mysociety.org" not "http://www.fixmystreet.com" -->
-
-
-
     </head>
-    <body class="">
+    <body class="fullwidthpage mobile-header">
 
     <div class="wrapper">
         <div class="table-cell">
             <header id="site-header" role="banner">
                 <div class="container">
                     <a href="/" id="site-logo">FixMyStreet</a>
-                    <a href="#main-nav" id="nav-link">Main Navigation</a>
                 </div>
             </header>
 
@@ -94,11 +38,6 @@
             <div class="container">
                 <div class="content" role="main">
 
-        <!-- 
- -->
-
-
-
 
 <h1>Nearly Done! Now check your email...</h1>
 
@@ -115,23 +54,15 @@
             </div><!-- .container -->
         </div><!-- .table-cell -->
 
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul id="mysoc-menu">
-                        <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li><li><a href="http://mysociety.org/donate/">Donate</a></li><li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>
-                    </ul>
-
-                    <ul id="main-menu">
-                        <li><a href="/" class="report-a-problem-btn">Report a problem</a></li><li><a href="/my">Your reports</a></li><li><a href="/reports">All reports</a></li><li><a href="/alert">Local alerts</a></li><li><a href="/faq">Help</a></li>
-                    </ul>
-                </div>
-            </div>
+        <div class="big-green-banner mobile-map-banner mobile-nav-banner">
+            <a href="index.html">home</a>
+            Confirm Report
+        </div>
+        
+        <div class="mobile-info">
+            <a href="about.html">i</a>
         </div>
 
-<!-- 
-
- -->
     </div> <!-- .wrapper -->
 </body>
 </html>
diff --git a/phonegap/www/index.html b/phonegap/www/index.html
index 2e62b70c9..338851543 100644
--- a/phonegap/www/index.html
+++ b/phonegap/www/index.html
@@ -13,7 +13,6 @@
 	<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
     <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
     <script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="js/modernizr.custom.61367.js" type="text/javascript" charset="utf-8"></script>
 
         <script type="text/javascript" src="js/geo.min.js"></script>
         <script type="text/javascript" src="js/fixmystreet.js"></script>
diff --git a/phonegap/www/report_created.html b/phonegap/www/report_created.html
index 654beef53..794b5347e 100644
--- a/phonegap/www/report_created.html
+++ b/phonegap/www/report_created.html
@@ -1,9 +1,4 @@
 <!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 oldie" lang="en-gb"><![endif]-->
-<!--[if IE 9]>   <html class="no-js ie9 oldie" lang="en-gb"><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js" lang="en-gb"><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
 
@@ -12,42 +7,13 @@
         <meta name="mobileoptimized" content="0">
 
         <link rel="stylesheet" href="css/base.css">
+        <link rel="stylesheet" href="css/mobile.css">
         <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)">
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="/cobrands/fixmystreet/layout.css?1331294274">
-        <![endif]-->
-
-        <script type="text/javascript">
-    validation_strings = {
-        update: 'Please enter a message',
-        title: 'Please enter a subject',
-        detail: 'Please enter some details',
-        name: {
-            required: 'Please enter your name',
-            validName: 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below'
-        },
-        category: 'Please choose a category',
-        rznvy: {
-            required: 'Please enter your email',
-            email: 'Please enter a valid email'
-        },
-        email: {
-            required: 'Please enter your email',
-            email: 'Please enter a valid email'
-        }
-    };
-            
-
-</script>
-
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="js/config.js"></script>
 <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
 <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
-<script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="js/modernizr.custom.61367.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="js/geo.min.js"></script>
 <script type="text/javascript" src="js/fixmystreet.js"></script>
 <script type="text/javascript" src="js/mobile.js"></script>
 
@@ -60,12 +26,6 @@
 </script>
 
 
-
-    <meta name="robots" content="noindex,nofollow">
-
-
-
-
 <title>
     Report Created :: 
     FixMyStreet
@@ -74,31 +34,20 @@
 
 
     </head>
-    <body class="">
+    <body class="mobile-header">
 
     <div class="wrapper">
         <div class="table-cell">
             <header id="site-header" role="banner">
                 <div class="container">
                     <a href="/" id="site-logo">FixMyStreet</a>
-                    <a href="#main-nav" id="nav-link">Main Navigation</a>
                 </div>
             </header>
 
-            <div id="user-meta">
-                
-                    <!-- <a href="/auth">Sign in</a> -->
-                
-            </div>
 
             <div class="container">
                 <div class="content" role="main">
 
-        <!-- 
- -->
-
-
-
 
 <h1>Your report has been created</h1>
 
@@ -108,23 +57,15 @@
             </div><!-- .container -->
         </div><!-- .table-cell -->
 
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul id="mysoc-menu">
-                        <li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li><li><a href="http://mysociety.org/donate/">Donate</a></li><li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>
-                    </ul>
-
-                    <ul id="main-menu">
-                        <li><a href="/" class="report-a-problem-btn">Report a problem</a></li><li><a href="/my">Your reports</a></li><li><a href="/reports">All reports</a></li><li><a href="/alert">Local alerts</a></li><li><a href="/faq">Help</a></li>
-                    </ul>
-                </div>
-            </div>
+        <div class="big-green-banner mobile-map-banner mobile-nav-banner">
+            <a href="index.html">home</a>
+            Report Created
+        </div>
+        
+        <div class="mobile-info">
+            <a href="about.html">i</a>
         </div>
 
-<!-- 
-
- -->
     </div> <!-- .wrapper -->
 </body>
 </html>
author	Struan Donald <struan@exo.org.uk>	2012-05-25 12:35:03 +0100
committer	Struan Donald <struan@exo.org.uk>	2012-05-25 12:35:03 +0100
commit	e050af29ca4b0dd6629e418804846a61d1a1293e (patch)
tree	b97b684e2b75d072ff557831a1d96c90c629aea3 /phonegap/www
parent	a7140e8b6fe96ba8cb77ee89794c28fd9f7c4873 (diff)