From b1043b093ca08454cdcebf0556819447fd82185f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 23 Nov 2014 15:08:52 -0500 Subject: [PATCH] update naming project --- dashboard-ui/login.html | 5 ++++- dashboard-ui/scripts/connectlogin.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html index a7397f8b4b..2889ecf909 100644 --- a/dashboard-ui/login.html +++ b/dashboard-ui/login.html @@ -40,7 +40,10 @@ -

${ButtonManualLogin}

+

+ ${ButtonForgotPassword} + ${ButtonManualLogin} +

diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 17665e02c2..b715605db8 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -2,7 +2,9 @@ function onLoggedIn() { - window.location = 'selectserver.html'; + // Need to switch from https to http + + window.location = getWindowUrl().replace(/https/gi, 'http').replace(/connectlogin/gi, 'selectserver'); } function login(page, username, password) {