From d76c21fcf50f5acb1f9306850143e0adc8c62de9 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 14 Dec 2018 16:50:25 +0100 Subject: [PATCH] Register link in the login page --- customize.dist/pages/login.js | 3 ++- customize.dist/src/less2/pages/page-login.less | 10 ++++++++++ www/login/main.js | 3 --- www/register/main.js | 4 +--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/customize.dist/pages/login.js b/customize.dist/pages/login.js index f7b7a43d8..8efdb1f56 100644 --- a/customize.dist/pages/login.js +++ b/customize.dist/pages/login.js @@ -30,7 +30,8 @@ define([ UI.createCheckbox('import-recent', Msg.register_importRecent), ]), h('div.extra', [ - h('button.login.first.btn', Msg.login_login) + h('button.login.first.btn', Msg.login_login), + h('button#register.first.btn', Msg.login_register) ]) ]) ]), diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index c92a08bde..e4b3e96e0 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -61,6 +61,16 @@ transform: scale(1.05); } } + #register { + border-color: @cryptpad_color_blue; + background: #fff; + color: @cryptpad_color_blue; + padding: 10px; + border-radius: 0; + &:hover { + transform: scale(1.05); + } + } } } .cp-container { diff --git a/www/login/main.js b/www/login/main.js index b69a94323..229225ea8 100644 --- a/www/login/main.js +++ b/www/login/main.js @@ -71,9 +71,6 @@ define([ if ($uname.val()) { sessionStorage.login_user = $uname.val(); } - if ($passwd.val()) { - sessionStorage.login_pass = $passwd.val(); - } } window.location.href = '/register/'; }); diff --git a/www/register/main.js b/www/register/main.js index 643fa2462..d93726f9d 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -38,11 +38,9 @@ define([ var $confirm = $('#password-confirm'); if (sessionStorage.login_user) { + delete sessionStorage.login_user; $uname.val(sessionStorage.login_user); } - if (sessionStorage.login_pass) { - $passwd.val(sessionStorage.login_pass); - } [ $uname, $passwd, $confirm] .some(function ($el) { if (!$el.val()) { $el.focus(); return true; } });