From a69571deae6ea788edca58238cee521800a7ef7d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 4 Aug 2016 22:23:09 +0300 Subject: Rename remember me button --- web/app/view/Login.js | 4 ++-- web/app/view/LoginController.js | 2 +- web/l10n/en.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web') diff --git a/web/app/view/Login.js b/web/app/view/Login.js index 259086854..db3c55261 100644 --- a/web/app/view/Login.js +++ b/web/app/view/Login.js @@ -77,8 +77,8 @@ Ext.define('Traccar.view.Login', { inputAttrTpl: ['autocomplete="on"'] }, { xtype: 'checkboxfield', - reference: 'rememberMeField', - fieldLabel: Strings.rememberMe + reference: 'rememberField', + fieldLabel: Strings.userRemember }, { xtype: 'component', html: '' diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js index f78b1e560..1a04ae974 100644 --- a/web/app/view/LoginController.js +++ b/web/app/view/LoginController.js @@ -47,7 +47,7 @@ Ext.define('Traccar.view.LoginController', { callback: function (options, success, response) { Ext.getBody().unmask(); if (success) { - if (this.lookupReference('rememberMeField').getValue()) { + if (this.lookupReference('rememberField').getValue()) { Ext.util.Cookies.set('user', this.lookupReference('userField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); Ext.util.Cookies.set('pass', this.lookupReference('passwordField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); } diff --git a/web/l10n/en.json b/web/l10n/en.json index c64d06b45..37e4537f2 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -30,7 +30,7 @@ "userEmail": "Email", "userPassword": "Password", "userAdmin": "Admin", - "rememberMe": "Remember Me", + "userRemember": "Remember", "loginTitle": "Login", "loginLanguage": "Language", "loginRegister": "Register", -- cgit v1.2.3 From 656690d02dd5bbc5962bec63fb94ea7728b42327 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 4 Aug 2016 22:27:09 +0300 Subject: Rename pass to password --- web/app/view/LoginController.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'web') diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js index 1a04ae974..7a78a6fb1 100644 --- a/web/app/view/LoginController.js +++ b/web/app/view/LoginController.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,10 +27,10 @@ Ext.define('Traccar.view.LoginController', { !Traccar.app.getServer().get('registration')); this.lookupReference('languageField').setValue(Locale.language); var user = Ext.util.Cookies.get('user'); - var pass = Ext.util.Cookies.get('pass'); - if (user && pass) { + var password = Ext.util.Cookies.get('password'); + if (user && password) { this.lookupReference('userField').setValue(user); - this.lookupReference('passwordField').setValue(pass); + this.lookupReference('passwordField').setValue(password); this.login(); } }, @@ -49,7 +49,7 @@ Ext.define('Traccar.view.LoginController', { if (success) { if (this.lookupReference('rememberField').getValue()) { Ext.util.Cookies.set('user', this.lookupReference('userField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); - Ext.util.Cookies.set('pass', this.lookupReference('passwordField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); + Ext.util.Cookies.set('password', this.lookupReference('passwordField').getValue(), Ext.Date.add(new Date(), Ext.Date.YEAR, 1)); } Traccar.app.setUser(Ext.decode(response.responseText)); this.fireViewEvent('login'); @@ -63,7 +63,7 @@ Ext.define('Traccar.view.LoginController', { logout: function () { Ext.util.Cookies.clear('user'); - Ext.util.Cookies.clear('pass'); + Ext.util.Cookies.clear('password'); Ext.Ajax.request({ scope: this, method: 'DELETE', -- cgit v1.2.3