krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust login modal

Browse Source 
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
This commit is contained in:
Blade Barringer
2015-07-02 07:58:11 -05:00
parent 5cb6f0f482
commit 4bcff71859
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/locales/en/settings.json
View File

@@ -82,6 +82,7 @@
"emailChange2": "admin@habitrpg.com", "emailChange2": "admin@habitrpg.com",
"emailChange3": " including both your old and new email address as well as your User ID.", "emailChange3": " including both your old and new email address as well as your User ID.",
"username": "Login Name", "username": "Login Name",
"usernameOrEmail": "Login Name or Email",
"email": "Email", "email": "Email",
"registeredWithFb": "Registered with Facebook", "registeredWithFb": "Registered with Facebook",
"loginNameDescription1": "This is what you use to login to HabitRPG. Go to ", "loginNameDescription1": "This is what you use to login to HabitRPG. Go to ",

2
test/e2e/e2e.js
View File

@@ -34,7 +34,7 @@ describe('front page', function() {
browser.sleep(1000); browser.sleep(1000);
element(by.model('loginUsername')).sendKeys('username'); element(by.model('loginUsername')).sendKeys('username');
element(by.model('loginPassword')).sendKeys('pass'); element(by.model('loginPassword')).sendKeys('pass');
var login = element(by.css("#login-tab input[value='Login']")); var login = element(by.css("#loginForm input[value='Login']"));
login.click(); login.click();
var alertDialog = browser.switchTo().alert(); var alertDialog = browser.switchTo().alert();
expect(alertDialog.getText()).toMatch("Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\"."); expect(alertDialog.getText()).toMatch("Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".");

4
website/public/js/controllers/authCtrl.js
View File

@@ -64,8 +64,8 @@ angular.module('habitrpg')
$scope.auth = function() { $scope.auth = function() {
var data = { var data = {
username: $scope.loginUsername || $('#login-tab input[name="username"]').val(), username: $scope.loginUsername || $('#loginForm input[name="username"]').val(),
password: $scope.loginPassword || $('#login-tab input[name="password"]').val() password: $scope.loginPassword || $('#loginForm input[name="password"]').val()
}; };
$http.post(ApiUrl.get() + "/api/v2/user/auth/local", data) $http.post(ApiUrl.get() + "/api/v2/user/auth/local", data)
.success(function(data, status, headers, config) { .success(function(data, status, headers, config) {

12
website/views/static/login-modal.jade
View File

@@ -14,17 +14,13 @@ script(id='modals/login.html', type='text/ng-template')
hr hr
tabset(justified='true') tabset(justified='true')
tab(heading=env.t('login')) tab(heading=env.t('login'))
form#login-tab(ng-submit='auth()', method='POST') form#loginForm(ng-submit='auth()', method='POST', name='loginForm')
.form-group .form-group
input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('username')+' or Email', name='username', spellcheck='false', required) input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('usernameOrEmail'), name='username', spellcheck='false', required)
.form-group .form-group
input.form-control(type='password', ng-model='loginPassword', placeholder=env.t('password'), name='password', required) input.form-control(type='password', ng-model='loginPassword', placeholder=env.t('password'), name='password', required)
//-.control-group
label.checkbox
input(type='checkbox', ng-click='useUUID = !useUUID')
=env.t('useUUID')
.form-group .form-group
input.btn.btn-primary(type='submit', value=env.t('login')) input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='loginForm.$invalid', value=env.t('login'))
small=env.t('passMan') small=env.t('passMan')
br br
@@ -69,4 +65,4 @@ script(id='modals/login.html', type='text/ng-template')
a(href='/static/privacy' target='_blank')=env.t('privacy') a(href='/static/privacy' target='_blank')=env.t('privacy')
| . | .
.form-group .form-group
input.btn.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register')) input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register'))