The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2270' of github.com:Tarantula471/cryptpad into Tarantula471-2270

Browse Source
This commit is contained in:
yflory 2026-08-07 14:40:42 +02:00
commit e347d998f0
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/pages/login.js
View File

@ -27,7 +27,7 @@ define([
h('div.row.cp-page-title', h('h1', Msg.login_login)),
h('div.row', [
h('div.col-md-3'+ssoEnforced),
h('div#userForm.form-group.col-md-6'+ssoEnforced, [
h('form#userForm.form-group.col-md-6'+ssoEnforced, [
h('div.cp-login-instance', Msg._getKey('login_instance', [ Pages.Instance.name ])),
h('div.big-container', [
h('div.input-container', [
@ -63,7 +63,7 @@ define([
href: "/register/",
}, Msg.login_register)
),
h('button.login', Msg.login_login),
h('button.login', {type: 'submit'}, Msg.login_login),
]),
]),
h('div.col-md-3'+ssoEnforced),

9
www/login/main.js
View File

@ -82,15 +82,10 @@ define([
var $uname = $('#name').focus();
var $passwd = $('#password')
// background loading of login assets
// enter key while on password field clicks signup
.on('keydown', function (e) {
if (e.which !== 13) { return; } // enter
$('button.login').click();
});
//var test;
$('button.login').click(function () {
$('#userForm').on('submit', function (e) {
e.preventDefault();
var shouldImport = $checkImport[0].checked;
var uname = $uname.val();
var passwd = $passwd.val();