diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-06-01 17:07:36 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-06-01 17:07:36 +0100 |
| commit | 80bc04d0dfcdbe8c29130e559182de155761e6bb (patch) | |
| tree | 42e712f00f0ca470af84559995cf6e36641cbfa4 /phonegap | |
| parent | d7ec11d4ff1467f61b7fc5936cebcf158ef1765a (diff) | |
whitespace and layout tidy up
Diffstat (limited to 'phonegap')
| -rw-r--r-- | phonegap/www/about.html | 24 | ||||
| -rw-r--r-- | phonegap/www/around.html | 489 | ||||
| -rw-r--r-- | phonegap/www/email_sent.html | 35 | ||||
| -rw-r--r-- | phonegap/www/index.html | 66 | ||||
| -rw-r--r-- | phonegap/www/js/fixmystreet.js | 6 | ||||
| -rw-r--r-- | phonegap/www/js/mobile.js | 9 | ||||
| -rw-r--r-- | phonegap/www/report_created.html | 34 | ||||
| -rw-r--r-- | phonegap/www/sign_in.html | 149 | ||||
| -rw-r--r-- | phonegap/www/signed_in.html | 82 |
9 files changed, 365 insertions, 529 deletions
diff --git a/phonegap/www/about.html b/phonegap/www/about.html index 70b6d9dfb..abb1da6e8 100644 --- a/phonegap/www/about.html +++ b/phonegap/www/about.html @@ -2,38 +2,27 @@ <html> <head> <title></title> - + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" /> - <meta charset="utf-8"> + <meta charset="utf-8"> <link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/mobile.css"> - <!-- If your application is targeting iOS BEFORE 4.0 you MUST put json2.js from http://www.JSON.org/json2.js into your www directory and include it here --> <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" charset="utf-8" src="cordova-1.5.0.js"></script> <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script> <script type="text/javascript" src="js/json2.js"></script> - - </head> <body class="frontpage fullwidthpage mobile-header"> - <div class="wrapper"> <div class="table-cell"> - <div id="user-meta"> - - <!-- <a href="/auth">Sign in</a> --> - </div> - <div class="container"> - <div class="content" role="main"> - + <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> <dt>What is FixMyStreet?</dt> @@ -153,15 +142,10 @@ Let us know if we’ve missed anyone.</dd> </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> - <div class="big-green-banner mobile-map-banner mobile-nav-banner"> <a href="index.html">home</a> About </div> - - <!-- - - --> </div> <!-- .wrapper --> </body> </html> diff --git a/phonegap/www/around.html b/phonegap/www/around.html index d45a24ccf..6392f47f6 100644 --- a/phonegap/www/around.html +++ b/phonegap/www/around.html @@ -11,49 +11,45 @@ <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)"> <link rel="stylesheet" href="css/mobile.css"> -<script type="text/javascript" src="js/config.js"></script> - -<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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/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> -<script type="text/javascript" src="js/jquery.ba-hashchange.min.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 type="text/javascript" src="js/config.js"></script> + + <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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/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> + <script type="text/javascript" src="js/jquery.ba-hashchange.min.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> -<title> - Viewing a location :: FixMyStreet -</title> - - + <title> Viewing a location :: FixMyStreet</title> </head> <body class="mappage"> @@ -68,260 +64,191 @@ </header> <div id="user-meta"> - + </div> <div class="container"> <div class="content" role="main"> - -<form action="" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate"> - - <input type="hidden" name="pc" id="pc" value=""> - - <input type="hidden" name="latitude" id="fixmystreet.latitude" value=""> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value=""> - - - - - - -<input type="hidden" name="zoom" value="2"> -<script type="text/javascript"> -var fixmystreet = { - 'page': 'around', - 'area': '', - 'all_pins': '', - 'latitude': localStorage.latitude, - 'longitude': localStorage.longitude, - - 'zoom': 2, - 'numZoomLevels': 5, - 'zoomOffset': 13, - 'map_type': "", - 'pins': [ ] - -} - - $('#fixmystreet\\.latitude').val( localStorage.latitude ); - $('#fixmystreet\\.longitude').val( localStorage.longitude ); - $('#pc').val( localStorage.pc ); -</script> - <div id="map_box"> - - <div id="map"></div> - - <p id="sub_map_links"> - - <a id="hide_pins_link" rel="nofollow" href="">Hide pins</a> - - - - <a id="all_pins_link" rel="nofollow" href="">Show old</a> - - - </p> - - </div> - - - - - <div id="side"> - - <h1 class="big-green-banner">Click map to report a problem</h1> - - <!-- p id="skip-this-step"> - Can't see the map? <a href='http://matthew.fixmystreet.dev.mysociety.org/report/new?longitude=-2.798601&latitude=56.328422&pc=ky16+8yg&skipped=1' rel='nofollow'>Skip this step</a> - </p --> - - <!-- div class="shadow-wrap"> - <ul id="key-tools" class="singleton"> - <li><a class="feed" id="key-tool-around-updates" href="http://matthew.fixmystreet.dev.mysociety.org/alert/list?feed=local%3A56.328422%3A-2.798601&lat=56.328422&lon=-2.798601&zoom=3">Get updates</a></li> - </ul> - </div --> - - <section class="full-width"> - <menu id="problems-nav" class="tab-nav"> - <ul> - <li><a href="#current">Problems on the map</a></li> - <li><a href="#current_near">Problems nearby</a></li> - </ul> - </menu> - - <ul id="current" class="issue-list-a tab"> - - <li><p>No problems have been reported yet.</p></li> - - - </ul> - - <ul id="current_near" class="issue-list-a tab"> - - <li><p>No problems found.</p></li> - - - </ul> - </section> - </div> - - <div style="display:none" id="side-form"> - <div id="report-a-problem-main"> - <h1>Reporting a problem</h1> - - - <p id="councils_text"> - All the information you provide here will be sent to <strong>the local council</strong>. - The subject and details of the problem will be public, plus your name if you give us permission. - </p> - - - <div id="report-a-problem-sidebar"> - - <div class="sidebar-tips"> - - - <p>You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. </p> - - - <p> - - Please fill in details of the problem below. The council won't be able - to help unless you leave as much detail as you can, so please describe the exact location of - the problem (e.g. on a wall), what it is, how long it has been there, a description (and a - photo of the problem if you have one), etc. - - </p> - </div> - - <div class="sidebar-notes"> - <p>Please note:</p> - -<ul class="plain-list"> - <li>We will only use your personal information in accordance with our <a href="/faq#privacy">privacy policy.</a></li> - <li>Please be polite, concise and to the point.</li> - <li>Please do not be abusive — abusing your council devalues the service for all users.</li> - <li>Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.</li> - <li>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.</li> -</ul> - </div> - - </div> - - - - <fieldset> - <div id="problem_form"> - - - - - - - - - <label for="form_title">Subject</label> - - <input type="text" value="" name="title" id="form_title" placeholder="Provide a title" required> - - <label for="form_detail">Details</label> - - <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="Please fill in details of the problem." required></textarea> - - - <div id="form_category_row"> - <label class="inline" for="form_category">Category</label> - <select name="category" id="form_category" required><option>Loading...</option></select> - </div> - - <div id="add_photo"> - <label>Add a Photo</label> - <input value="Take Photo" type="button" name="photo_button" id="id_photo_button" onclick="takePhoto(navigator.camera.PictureSourceType.CAMERA);" class="green-btn"> Or - <input value="Choose" type="button" name="existing" id="id_existing" onclick="takePhoto(navigator.camera.PictureSourceType.SAVEDPHOTOALBUM);" class="green-btn"> - </div> - - <div id="display_photo" style="display: none"> - <label>Your Photo</label> - <img id="photo" src="" width="200" /> - <input value="Remove Photo" type="button" name="del_photo_button" id="id_del_photo_button" onclick="delPhoto();" class="green-btn"> - </div> - - <input type="hidden" name="photo" id="form_photo" value=""> - <label for="form_email" id="email_label">Your email</label> - - <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required> - - <div id="form_sign_in"> - <h3 id="now_submit">Now to submit your report…</h3> - <h2 id="have_password">Do you have a FixMyStreet password?</h2> - - <div id="form_sign_in_yes" class="form-box"> - - <h5><strong>Yes</strong> I have a password</h5> - - <label class="hidden-js n" for="password_sign_in">Yes I have a password</label> - <div class="form-txt-submit-box"> - - <input type="password" name="password_sign_in" id="password_sign_in" placeholder="Your password" value=""> - <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="Submit"> + <form action="" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate"> + + <input type="hidden" name="pc" id="pc" value=""> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value=""> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value=""> + + <input type="hidden" name="zoom" value="2"> + <script type="text/javascript"> + var fixmystreet = { + 'page': 'around', + 'area': '', + 'all_pins': '', + 'latitude': localStorage.latitude, + 'longitude': localStorage.longitude, + + 'zoom': 2, + 'numZoomLevels': 5, + 'zoomOffset': 13, + 'map_type': "", + 'pins': [ ] + + }; + + $('#fixmystreet\\.latitude').val( localStorage.latitude ); + $('#fixmystreet\\.longitude').val( localStorage.longitude ); + $('#pc').val( localStorage.pc ); + </script> + <div id="map_box"> + <div id="map"></div> + <p id="sub_map_links"> + <a id="hide_pins_link" rel="nofollow" href="">Hide pins</a> + <a id="all_pins_link" rel="nofollow" href="">Show old</a> + </p> </div> - - <div class="checkbox-group"> - <input type="checkbox" id="remember_me" name="remember_me" value='1'> - <label class="n inline" for="remember_me">Keep me signed in on this computer</label> - </div> - </div> - - <div id="form_sign_in_no" class="form-box"> - <h5 id="let_me_confirm"><strong>No</strong> Let me confirm my report by email</h5> - - <label for="form_may_show_nameme">Name</label> - - <input type="text" class="form-focus-trigger validName" value="" name="name" id="form_name" placeholder="Your name"> - - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> - <label class="inline" for="form_may_show_name">Show my name publicly</label> + <div id="side"> + + <h1 class="big-green-banner">Click map to report a problem</h1> + + <section class="full-width"> + <menu id="problems-nav" class="tab-nav"> + <ul> + <li><a href="#current">Problems on the map</a></li> + <li><a href="#current_near">Problems nearby</a></li> + </ul> + </menu> + <ul id="current" class="issue-list-a tab"> + <li><p>No problems have been reported yet.</p></li> + </ul> + + <ul id="current_near" class="issue-list-a tab"> + <li><p>No problems found.</p></li> + </ul> + </section> </div> - <div class="general-sidebar-notes form-focus-hidden"> - <p class="dark">We never show your email address or phone number.</p> - <p id="providing_password">Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p> + <div style="display:none" id="side-form"> + <div id="report-a-problem-main"> + <h1>Reporting a problem</h1> + + <p id="councils_text"> + All the information you provide here will be sent to <strong>the local council</strong>. + The subject and details of the problem will be public, plus your name if you give us permission. + </p> + + <div id="report-a-problem-sidebar"> + + <div class="sidebar-tips"> + <p>You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. </p> + <p> + Please fill in details of the problem below. The council won't be able + to help unless you leave as much detail as you can, so please describe the exact location of + the problem (e.g. on a wall), what it is, how long it has been there, a description (and a + photo of the problem if you have one), etc. + </p> + </div> + + <div class="sidebar-notes"> + <p>Please note:</p> + + <ul class="plain-list"> + <li>We will only use your personal information in accordance with our <a href="/faq#privacy">privacy policy.</a></li> + <li>Please be polite, concise and to the point.</li> + <li>Please do not be abusive — abusing your council devalues the service for all users.</li> + <li>Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.</li> + <li>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.</li> + </ul> + </div> + </div> + + <fieldset> + <div id="problem_form"> + <label for="form_title">Subject</label> + <input type="text" value="" name="title" id="form_title" placeholder="Provide a title" required> + + <label for="form_detail">Details</label> + <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="Please fill in details of the problem." required></textarea> + + <div id="form_category_row"> + <label class="inline" for="form_category">Category</label> + <select name="category" id="form_category" required><option>Loading...</option></select> + </div> + + <div id="add_photo"> + <label>Add a Photo</label> + <input value="Take Photo" type="button" name="photo_button" id="id_photo_button" onclick="takePhoto(navigator.camera.PictureSourceType.CAMERA);" class="green-btn"> Or + <input value="Choose" type="button" name="existing" id="id_existing" onclick="takePhoto(navigator.camera.PictureSourceType.SAVEDPHOTOALBUM);" class="green-btn"> + </div> + + <div id="display_photo" style="display: none"> + <label>Your Photo</label> + <img id="photo" src="" width="200" /> + <input value="Remove Photo" type="button" name="del_photo_button" id="id_del_photo_button" onclick="delPhoto();" class="green-btn"> + </div> + + <input type="hidden" name="photo" id="form_photo" value=""> + <label for="form_email" id="email_label">Your email</label> + <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required> + + <div id="form_sign_in"> + <h3 id="now_submit">Now to submit your report…</h3> + <h2 id="have_password">Do you have a FixMyStreet password?</h2> + + <div id="form_sign_in_yes" class="form-box"> + + <h5><strong>Yes</strong> I have a password</h5> + + <label class="hidden-js n" for="password_sign_in">Yes I have a password</label> + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="Your password" value=""> + <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="Submit"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'> + <label class="n inline" for="remember_me">Keep me signed in on this computer</label> + </div> + </div> + + <div id="form_sign_in_no" class="form-box"> + <h5 id="let_me_confirm"><strong>No</strong> Let me confirm my report by email</h5> + + <label for="form_may_show_nameme">Name</label> + <input type="text" class="form-focus-trigger validName" value="" name="name" id="form_name" placeholder="Your name"> + + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> + <label class="inline" for="form_may_show_name">Show my name publicly</label> + </div> + + <div class="general-sidebar-notes form-focus-hidden"> + <p class="dark">We never show your email address or phone number.</p> + <p id="providing_password">Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p> + </div> + + <label class="form-focus-hidden" for="form_phone">Phone number</label> + <input class="form-focus-hidden" type="text" value="" name="phone" id="form_phone" placeholder="Your phone number (optional)"> + + <div id="password_surround"> + <label class="form-focus-hidden" for="password_register" id="password_label">Password</label> + </div> + + <div class="form-txt-submit-box form-focus-hidden"> + <input type="password" name="password_register" id="password_register" value="" placeholder="Enter a password (optional)"> + <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="Submit"> + </div> + </div> + </div> + </div> + </fieldset> + + <input type="hidden" name="submit_problem" value="1"> </div> - <label class="form-focus-hidden" for="form_phone">Phone number</label> - <input class="form-focus-hidden" type="text" value="" name="phone" id="form_phone" placeholder="Your phone number (optional)"> - - <div id="password_surround"> - <label class="form-focus-hidden" for="password_register" id="password_label">Password</label> - </div> - - <div class="form-txt-submit-box form-focus-hidden"> - <input type="password" name="password_register" id="password_register" value="" placeholder="Enter a password (optional)"> - <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="Submit"> - </div> </div> - </div> - - - </div> - </fieldset> - - - - <input type="hidden" name="submit_problem" value="1"> -</div> - - </div> -</form> - - + </form> </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> - </div> <!-- .wrapper --> </body> </html> diff --git a/phonegap/www/email_sent.html b/phonegap/www/email_sent.html index a2a1bde96..eccd9ecce 100644 --- a/phonegap/www/email_sent.html +++ b/phonegap/www/email_sent.html @@ -10,13 +10,10 @@ <link rel="stylesheet" href="css/mobile.css"> <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)"> -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="js/jquery-1.7.0.min.js"></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> - <title> - Create a report :: - FixMyStreet -</title> + <title> Create a report :: FixMyStreet </title> </head> <body class="fullwidthpage mobile-header"> @@ -29,39 +26,31 @@ </header> <div id="user-meta"> - - <!-- <a href="/auth">Sign in</a> --> - </div> <div class="container"> <div class="content" role="main"> + <h1>Nearly Done! Now check your email...</h1> + <p>The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.</p> -<h1>Nearly Done! Now check your email...</h1> + <p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p> -<p>The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.</p> + <p>You must now click the link in the email we've just sent you — if you do not, your problem will not be posted..</p> -<p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p> + <p>(Don't worry — we'll hang on to your problem report while you're checking your email.)</p> -<p>You must now click the link in the email we've just sent you — if you do not, your problem will not be posted..</p> - -<p>(Don't worry — we'll hang on to your problem report while you're checking your email.)</p> - - - </div><!-- .content role=main --> - </div><!-- .container --> - </div><!-- .table-cell --> + </div> + </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 --> + </div> </body> </html> diff --git a/phonegap/www/index.html b/phonegap/www/index.html index 3ba7dc77a..a9a700a45 100644 --- a/phonegap/www/index.html +++ b/phonegap/www/index.html @@ -2,45 +2,45 @@ <html> <head> <title></title> - + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" /> - <meta charset="utf-8"> + <meta charset="utf-8"> <link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/mobile.css"> <script type="text/javascript" src="js/json2.js"></script> <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" 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 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/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> + <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 id="container" class="frontpage fullwidthpage" ontouchmove="touchmove(event);"> - + <div class="wrapper"> <div class="table-cell"> <header id="site-header" role="banner"> @@ -50,15 +50,15 @@ </header> <div class="container"> - <div class="content" role="main"> + <div class="content" role="main"> <div id="front-main"> <div id="front-main-container"> <form action="" method="get" name="postcodeForm" id="postcodeForm"> <label for="pc">Enter a nearby GB postcode, or street name and area:</label> <div> <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="e.g. ‘B2 4QA’ or ‘Tib St, Manchester’"> - <input type="submit" value="Go" id="submit"> - </div> + <input type="submit" value="Go" id="submit"> + </div> </form> </div> </div> @@ -66,7 +66,7 @@ <div class="tablewrapper"> <div id="front-howto"> <h2>How to report a problem</h2> - + <ol class="big-numbers"> <li>Enter a nearby GB postcode, or street name and area</li> <li>Locate the problem on a map of the area</li> @@ -74,7 +74,7 @@ <li>We send it to the council on your behalf</li> </ol> </div> - + </div> </div><!-- .content role=main --> </div><!-- .container --> diff --git a/phonegap/www/js/fixmystreet.js b/phonegap/www/js/fixmystreet.js index af4ec2e6f..ce7921488 100644 --- a/phonegap/www/js/fixmystreet.js +++ b/phonegap/www/js/fixmystreet.js @@ -310,10 +310,10 @@ $(function(){ //make initial tab active $('.tab-nav a').first().addClass('active'); $('.tab').first().addClass('open'); - + //hide other tabs $('.tab').not('.open').hide(); - + //set up click event $(".tab-nav").on('click', 'a', function(e){ e.preventDefault(); @@ -422,7 +422,7 @@ $.fn.drawer = function(id, ajax) { $('.spinner').remove(); }); } - + // Tall drawer - put after .content for scrolling to work okay. // position over the top of the main .content in precisely the right location d.insertAfter($content).addClass('content').css({ diff --git a/phonegap/www/js/mobile.js b/phonegap/www/js/mobile.js index adf5e86cf..e4393aba0 100644 --- a/phonegap/www/js/mobile.js +++ b/phonegap/www/js/mobile.js @@ -42,7 +42,7 @@ function location_error( msg ) { $('#location_error').remove(); return; } - + alert(msg); if ( !$('#location_error') ) { @@ -109,10 +109,9 @@ function lookup_string(q) { } function locate() { - //location_error(''); $("#multiple").remove(); var pc = $('#pc').val(); - + if (!pc) { location_error( "Please enter your location" ); return false; @@ -183,7 +182,7 @@ function takePhotoFail(message) { function takePhoto(type) { navigator.camera.getPicture(takePhotoSuccess, takePhotoFail, { quality: 50, destinationType: Camera.DestinationType.FILE_URI, sourceType: type }); } - + function check_name( name, msg ) { $('#email_label').hide(); $('#form_email').hide(); @@ -237,7 +236,7 @@ var submit_clicked = null; function postReport(e) { e.preventDefault(); - + // the .stopImmediatePropogation call in invalidHandler should render this // redundant but it doesn't seem to work so belt and braces :( if ( !$('#mapForm').valid() ) { return; } diff --git a/phonegap/www/report_created.html b/phonegap/www/report_created.html index 778394026..2717ce084 100644 --- a/phonegap/www/report_created.html +++ b/phonegap/www/report_created.html @@ -10,25 +10,20 @@ <link rel="stylesheet" href="css/mobile.css"> <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)"> -<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> + <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 type="text/javascript"> - $(function() { - var uri = CONFIG.FMS_URL + 'report/' + localStorage.report; - $('#report_url').html( '<a href="' + uri + '">' + uri + '</a>' ); - }); -</script> - - -<title> - Report Created :: - FixMyStreet -</title> + <script type="text/javascript"> + $(function() { + var uri = CONFIG.FMS_URL + 'report/' + localStorage.report; + $('#report_url').html( '<a href="' + uri + '">' + uri + '</a>' ); + }); + </script> + <title> Report Created :: FixMyStreet </title> </head> <body class="mobile-header" id="container" ontouchmove="touchmove(event);"> @@ -41,15 +36,11 @@ </div> </header> - <div class="container"> <div class="content" role="main"> - - -<h1>Your report has been created</h1> + <h1>Your report has been created</h1> <p>You can view it on the site at <span id="report_url"></span></p> - </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> @@ -58,7 +49,6 @@ <a href="index.html">home</a> Report Created </div> - <div class="mobile-info"> <a href="about.html">i</a> </div> diff --git a/phonegap/www/sign_in.html b/phonegap/www/sign_in.html index 1cbce75b6..ee6c0ed94 100644 --- a/phonegap/www/sign_in.html +++ b/phonegap/www/sign_in.html @@ -11,45 +11,41 @@ <link rel="stylesheet" href="css/mobile.css"> <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)"> -<script type="text/javascript" src="js/config.js"></script> - -<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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 type="text/javascript" src="js/config.js"></script> + + <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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> -<title> - Viewing a location :: FixMyStreet -</title> - - + <title> Viewing a location :: FixMyStreet </title> </head> <body class="mobile-header" id="container" onload="display_signed_out_msg();"> @@ -69,75 +65,32 @@ <div class="container"> <div class="content" role="main"> - -<form action="" method="post" name="signInForm" id="signInForm" enctype="multipart/form-data" class="validate"> - - <div id="form_sign_in_only"> - <div id="form_sign_in_yes" class="form-box"> - - <label for="form_email" id="email_label">Your email</label> - <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required> - - <div class="form-txt-submit-box"> - <input type="password" name="password_sign_in" id="password_sign_in" placeholder="Your password" value=""> - <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="Submit"> - </div> - <div class="checkbox-group"> - <input type="checkbox" id="remember_me" name="remember_me" value='1'> - <label class="n inline" for="remember_me">Keep me signed in on this computer</label> - </div> - </div> - - <!-- - <div id="form_sign_in_no" class="form-box"> - <h5 id="let_me_confirm"><strong>No</strong> Let me confirm my report by email</h5> - - <label for="form_may_show_nameme">Name</label> - - <input type="text" class="form-focus-trigger validName" value="" name="name" id="form_name" placeholder="Your name"> - - - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1" checked> - <label class="inline" for="form_may_show_name">Show my name publicly</label> - </div> - - <div class="general-sidebar-notes form-focus-hidden"> - <p class="dark">We never show your email address or phone number.</p> - <p id="providing_password">Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p> - </div> - - <label class="form-focus-hidden" for="form_phone">Phone number</label> - <input class="form-focus-hidden" type="text" value="" name="phone" id="form_phone" placeholder="Your phone number (optional)"> - - <div id="password_surround"> - <label class="form-focus-hidden" for="password_register" id="password_label">Password</label> - </div> - - <div class="form-txt-submit-box form-focus-hidden"> - <input type="password" name="password_register" id="password_register" value="" placeholder="Enter a password (optional)"> - <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="Submit"> + <form action="" method="post" name="signInForm" id="signInForm" enctype="multipart/form-data" class="validate"> + <div id="form_sign_in_only"> + <div id="form_sign_in_yes" class="form-box"> + + <label for="form_email" id="email_label">Your email</label> + <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required> + + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="Your password" value=""> + <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="Submit"> + </div> + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'> + <label class="n inline" for="remember_me">Keep me signed in on this computer</label> + </div> </div> </div> + </form> </div> - --> - </fieldset> - -</div> - - </div> -</form> - - - </div><!-- .content role=main --> - </div><!-- .container --> + </div> </div><!-- .table-cell --> <div class="big-green-banner mobile-map-banner mobile-nav-banner"> <a href="index.html">home</a> Sign In </div> - </div> <!-- .wrapper --> </body> </html> diff --git a/phonegap/www/signed_in.html b/phonegap/www/signed_in.html index 5c3e626a4..4e2254714 100644 --- a/phonegap/www/signed_in.html +++ b/phonegap/www/signed_in.html @@ -11,49 +11,45 @@ <link rel="stylesheet" href="css/mobile.css"> <link rel="stylesheet" href="css/layout.css" media="(min-width:48em)"> -<script type="text/javascript" src="js/config.js"></script> - -<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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/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> -<script type="text/javascript" src="js/jquery.ba-hashchange.min.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 type="text/javascript" src="js/config.js"></script> + + <script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></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 type="text/javascript" src="js/json2.js"></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/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> + <script type="text/javascript" src="js/jquery.ba-hashchange.min.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> -<title> - Viewing a location :: FixMyStreet -</title> - - + <title> Viewing a location :: FixMyStreet </title> </head> <body class="mobile-header signed-in-page" id="container"> @@ -74,8 +70,6 @@ <div class="container"> <div class="content" role="main"> - - </div><!-- .content role=main --> </div><!-- .container --> </div><!-- .table-cell --> |