diff --git a/src/footer.html b/src/footer.html index 6a02f495..6b5642ac 100644 --- a/src/footer.html +++ b/src/footer.html @@ -146,441 +146,6 @@

Comment Examples

- - -
diff --git a/src/js/app/profile-builder/js/controllers/controllers-profile-builder.js b/src/js/app/profile-builder/js/controllers/controllers-profile-builder.js index 265afa56..54a5d272 100644 --- a/src/js/app/profile-builder/js/controllers/controllers-profile-builder.js +++ b/src/js/app/profile-builder/js/controllers/controllers-profile-builder.js @@ -79,7 +79,7 @@ vm.userSkills = response; }); } else { - showModal('#login'); + window.location.href = "/login?next=/account/integrations"; } vm.unLink = unLink; diff --git a/src/js/init-header.js b/src/js/init-header.js index ff712c79..c9a3944b 100644 --- a/src/js/init-header.js +++ b/src/js/init-header.js @@ -340,19 +340,12 @@ if (!loginState) { }); $('.btnRegister').on('click', function () { - if ($('.mainStream #register').length>0) return; - //document.getElementById("registerForm").reset(); - showModal('#register'); + window.location.href = "/register"; }); $('.actionLogin').on('click', function () { - if ($('.mainStream #login').length>0) return; - document.getElementById("loginForm").reset(); - $('#loginForm .btnSubmit').html('Login'); - $(".pwd, .confirm, .strength").parents(".row").show(); - $("#register a.btnSubmit").removeClass("socialRegister"); - showModal('#login'); + window.location.href = "/login"; }); $('.closeModal,#bgModal').not('.redirectOnConfirm').on('click', function () { @@ -1089,8 +1082,7 @@ if (!loginState) { }); $('.switch-to-register').click(function() { - $('#login').hide(); - showModal('#register'); + window.location.href = "/register"; }); /*check if on registration complete page and add challenge detail link - currently only way to this since @@ -1270,11 +1262,7 @@ function initMemberDetails(pagePersisted){ $('.headerTopRightMenuLink.logIn a').unbind('click'); $('.headerTopRightMenuLink.logIn a').text("Log In").removeClass("actionLogout").addClass("actionLogin"); $('.actionLogin').on('click', function() { - document.getElementById("loginForm").reset(); - $('#loginForm .btnSubmit').html('Login'); - $(".pwd, .confirm, .strength").parents(".row").show(); - $("#register a.btnSubmit").removeClass("socialRegister"); - showModal('#login'); + window.location.href = "/login"; }); $('.loginLink, .linkLogin, .btnRegister, .signUp a.btn').addClass('show').show(); $('.btnRegister').parent('.sign-up').show(); diff --git a/wp/wp-content/themes/tcs-responsive/footer.php b/wp/wp-content/themes/tcs-responsive/footer.php index f4012a81..d3bbbbbf 100644 --- a/wp/wp-content/themes/tcs-responsive/footer.php +++ b/wp/wp-content/themes/tcs-responsive/footer.php @@ -164,446 +164,6 @@ function FeedBlitz_9feab01d431311e39e69002590771423s(v) {
- - -