Revert "Add urls for change_password modal and login modal. (#154) (#155

)" Alternative logic is used in the dev1 branch - so reverting this This allows for the dev1 branch to be merged easily... This reverts commit 0a2cff1.
phenopolis · Jul 30, 2017 · e066314 · e066314
1 parent cf12229
commit e066314
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/static/assets/js/home.js b/static/assets/js/home.js
@@ -49,17 +49,9 @@ if (!PP) {
         PP.submitChangePassword();
     });
 
-    // Open the login modal or the change password modal, if requested by the url.
-    if (window.location.href.indexOf('#login') != -1) {
-        $('#login_modal').modal('open');
-    }
-    else if (window.location.href.indexOf('#change_password') != -1) {
-        $('#login_modal').modal('open');
-        PP.showChangePasswordForm();
-    }
-
-    // Change password modal - check the re-typing of the new password.
-    $("#new_password_1, #new_password_2").keyup(PP.checkPasswordMatch);
+    $(document).ready(function () {
+        $("#new_password_1, #new_password_2").keyup(PP.checkPasswordMatch);
+    });
 
   };
 
@@ -94,7 +86,6 @@ if (!PP) {
     $('#change_password_btn').hide();
     $('#register_btn').hide();
     $('#submit_change_password_btn').hide();
-    $('#search_btn').hide();
 
     $('#login_btn').hide();
     $('#demo_login_btn').hide();
@@ -116,7 +107,6 @@ if (!PP) {
 
       $('#login_btn').hide();
       $('#demo_login_btn').hide();
-      $('#search_btn').hide();
 
       $('#register_content').hide();
       $('#submit_register_btn').hide();
@@ -140,7 +130,6 @@ if (!PP) {
     $('#enter_login_btn').hide();
     $('#submit_register_btn').hide();
     $('#submit_change_password_btn').hide();
-    $('#search_btn').hide();
   };
 
   //
@@ -190,7 +179,6 @@ if (!PP) {
               $('#auth_modal').modal('close');
               $('#change_password_successful').show();
               $("#change_password_successful").text(data.success);
-              $('#search_btn').show();
           },
           error: function (data, msg) {
               $('#auth_modal').modal('close');

diff --git a/templates/components/login_modal.html b/templates/components/login_modal.html
@@ -100,7 +100,6 @@ <h4>Change Password</h4>
         <!-- Right side of footer -->
         <a id="submit_register_btn" href="#!" class="waves-effect waves-green btn-flat" style="display: none;">Submit</a>
         <a id="submit_change_password_btn" href="#!" class="waves-effect waves-green btn-flat" style="display: none;">Change Password</a>
-        <a id="search_btn" href="/search" class="waves-effect waves-green btn-flat" style="display: none;">Search Phenopolis</a>
         <a id="login_btn" href="#!" class="waves-effect waves-green btn-flat">Login</a>
         <a id="demo_login_btn" href="#!" class="waves-effect waves-green btn-flat">Demo Login</a>
     </div>

diff --git a/views/__init__.py b/views/__init__.py
@@ -179,14 +179,6 @@ def login():
         print 'LOGIN SUCCESS'
         return jsonify(success="Authenticated"), 200
 
-# 
-@app.route('/login', methods=['GET'])
-def login_form():
-    if config.LOCAL:
-        return redirect('/#login')
-    else:
-        return redirect('https://uclex.cs.ucl.ac.uk/#login')
-
 # 
 @app.route('/logout')
 def logout():
@@ -218,15 +210,6 @@ def change_password():
         msg = 'Password for username \''+username+'\' changed. You are logged in as \''+username+'\'.' 
         return jsonify(success=msg), 200
 
-#
-@app.route('/change_password', methods=['GET'])
-def change_password_form():
-    if config.LOCAL:
-        return redirect('/#change_password')
-    else:
-        return redirect('https://uclex.cs.ucl.ac.uk/#change_password')
-
-
 @app.route('/set/<query>')
 def set(query):
     value = query