change sign in/sign out to be an account page

only use one page for sign in/sign out

5 files changed, 17 insertions, 135 deletions

diff --git a/phonegap/www/sign_in.html b/phonegap/www/account.html
index 77c5d7d5f..f483b7547 100644
--- a/phonegap/www/sign_in.html
+++ b/phonegap/www/account.html
@@ -65,7 +65,7 @@
             <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_only" class="nodisplay">
                         <div id="form_sign_in_yes" class="form-box">
                             <label for="form_email" id="email_label">Email</label>
                             <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required>
@@ -79,7 +79,7 @@
                         </div>
                     </div>
                     </form>
-                    <div id="forget_button" class="form-txt-submit-box">
+                    <div id="forget_button" class="form-txt-submit-box nodisplay">
                         <input class="green-btn" type="button" id="forget" name="forget" value="Forget">
                     </div>
                 </div>
@@ -88,7 +88,7 @@
 
         <div class="big-green-banner mobile-map-banner mobile-nav-banner">
             <a href="index.html">home</a>
-            Sign In
+            Account
         </div>
     </div> <!-- .wrapper -->
     <div class="spinner" id="loadingSpinner">
diff --git a/phonegap/www/css/mobile.css b/phonegap/www/css/mobile.css
index f17f753fd..4b0751f25 100644
--- a/phonegap/www/css/mobile.css
+++ b/phonegap/www/css/mobile.css
@@ -8,13 +8,16 @@
     padding-bottom: 0;
 }
 
+.nodisplay {
+    display: none;
+}
+
 .mobile-nav-banner {
     position: fixed;
     background: black;
 }
 
 .mobile-sign-in-banner {
-    display: none;
     background: none;
 }
 
diff --git a/phonegap/www/index.html b/phonegap/www/index.html
index cc85172b8..40787ac37 100644
--- a/phonegap/www/index.html
+++ b/phonegap/www/index.html
@@ -89,7 +89,7 @@
             </div>
 
             <div class="big-green-banner mobile-map-banner mobile-sign-in-banner">
-                <a id="sign_in" href="sign_in.html">Sign In</a><a id="sign_out" href="#" onclick="sign_out();">Sign Out</a>
+                <a id="account" href="account.html">Account</a>
             </div>
         </div> <!-- .wrapper -->
 
diff --git a/phonegap/www/js/mobile.js b/phonegap/www/js/mobile.js
index e149030f1..4a15cde13 100644
--- a/phonegap/www/js/mobile.js
+++ b/phonegap/www/js/mobile.js
@@ -377,11 +377,10 @@ function sign_in() {
                 localStorage.name = data.name;
                 localStorage.username = $('#form_email').val();
                 localStorage.password = $('#password_sign_in').val();
-                alert( localStorage.name + ', ' + localStorage.username + ', ' + localStorage.password );
                 hideBusy();
-                window.location = 'signed_in.html';
-                $('#sign_out').show();
-                $('#sign_in').hide();
+                $('#user-meta').html('<p>You are signed in as ' + localStorage.username + '.</p>');
+                $('#form_sign_in_only').hide();
+                $('#forget_button').show();
             } else {
                 hideBusy();
                 $('#form_email').before('<div class="form-error">There was a problem with your email/password combination.</div>');
@@ -392,7 +391,6 @@ function sign_in() {
 }
 
 function display_signed_out_msg() {
-    $('#forget_button').hide();
     if ( localStorage.signed_out == 1 ) {
         $('#user-meta').html('<p>You&rsquo;ve been signed out.</p>');
         $('#form_sign_in_only').show();
@@ -402,8 +400,9 @@ function display_signed_out_msg() {
         $('#user-meta').html('<p>You are signed in as ' + localStorage.username + '.</p>');
         $('#form_sign_in_only').hide();
         $('#forget_button').show();
+    } else {
+        $('#form_sign_in_only').show();
     }
-
 }
 
 function sign_out() {
@@ -442,48 +441,12 @@ function sign_out_around() {
     } );
 }
 
-function check_auth() {
-    if ( $('#user-meta').length && localStorage.signed_out != 1 ) {
-        var sign_out_function = sign_out;
-        if ( $('body').hasClass('mappage') ) {
-            sign_out_function = sign_out_around;
-        }
-        jQuery.ajax( {
-            url: CONFIG.FMS_URL + "auth/ajax/check_auth?" + new Date().getTime() ,
-            type: 'GET',
-            statusCode: {
-                200: function(data) {
-                    localStorage.name = data.name;
-                    $('#user-meta').html('<p>Hi ' + localStorage.name + '<a href="#" id="meta_sign_out">Sign out</a></p>');
-                    $('#meta_sign_out').on('click', sign_out_function );
-                    $('.mobile-sign-in-banner').show();
-                    $('#sign_in').hide();
-                    $('#sign_out').show();
-                },
-                401: function() {
-                    $('#user-meta').html('');
-                    localStorage.name = '';
-                    $('.mobile-sign-in-banner').show();
-                    $('#sign_out').hide();
-                    $('#sign_in').show();
-                    $('#user-meta').html('');
-                }
-            }
-        } );
-    }
-}
-
-function signed_in() {
+function account() {
     $('.mobile-sign-in-banner').show();
-    $('#sign_in').show();
+    $('#account').show();
     if ( localStorage.name ) {
         if ( $('body').hasClass('signed-in-page') ) {
-            var sign_out_function = sign_out;
-            if ( $('body').hasClass('mappage') ) {
-                sign_out_function = sign_out_around;
-            }
-            $('#user-meta').html('<p>Hi ' + localStorage.name + '<a href="#" id="meta_sign_out">Sign out</a></p>');
-            $('#meta_sign_out').on('click', sign_out_function );
+            $('#user-meta').html('<p>Hi ' + localStorage.name + '</p>');
         }
 
         if ( $('#form_sign_in').length ) {
@@ -514,8 +477,7 @@ function onDeviceReady() {
     $('#ffo').click(getPosition);
     $('#forget').click(forget);
     $('#mapForm :input[type=submit]').on('click', function() { submit_clicked = $(this); });
-    // check_auth();
-    signed_in();
+    account();
     hideBusy();
 }
 
diff --git a/phonegap/www/signed_in.html b/phonegap/www/signed_in.html
deleted file mode 100644
index 5ba4a8758..000000000
--- a/phonegap/www/signed_in.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="en-gb">
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-
-        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-        <meta name="HandHeldFriendly" content="true">
-        <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)">
-
-        <script type="text/javascript" src="js/config.js"></script>
-
-        <script type="text/javascript" charset="utf-8" src="cordova-independent.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>
-    </head>
-
-    <body class="mobile-header signed-in-page" id="container">
-
-    <div class="wrapper">
-        <div class="table-cell">
-            <header id="site-header" role="banner">
-                <div class="container">
-                    <span id="site-logo"></span>
-                </div>
-            </header>
-
-            <div id="user-meta">
-
-            </div>
-
-            <div class="container">
-                <div class="content" role="main">
-
-                </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>
-            Signed In
-        </div>
-
-    </div> <!-- .wrapper -->
-</body>
-</html>