ember-flexberry-account 0.1.0-beta.1 → 0.1.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -124,8 +124,8 @@ export default Ember.Component.extend({
124
124
  Ember.getOwner(this).lookup('router:main').transitionTo('pwd-reset');
125
125
  },
126
126
 
127
- onKeyPress(e) {
128
- if (e.keyCode === 13) {
127
+ onKeyPress: function(e) {
128
+ if (e.keyCode === 13 && !this.get('allowToLogin')) {
129
129
  this.send('login');
130
130
  }
131
131
  },
@@ -25,9 +25,9 @@ export default {
25
25
  },
26
26
  components: {
27
27
  login: {
28
- 'username-label': 'User name (E-mail):',
29
- 'password-label': 'Password:',
30
- 'remember-label': 'Remember:',
28
+ 'username-label': 'User name (E-mail)',
29
+ 'password-label': 'Password',
30
+ 'remember-label': 'Remember',
31
31
  'login-button-title': 'Log in to the system using login and password',
32
32
  'login-button-text': 'Login',
33
33
  'login-with-label': 'Login with:',
@@ -27,9 +27,9 @@ export default {
27
27
 
28
28
  components: {
29
29
  login: {
30
- 'username-label': 'Логин (E-mail):',
31
- 'password-label': 'Пароль:',
32
- 'remember-label': 'Запомнить:',
30
+ 'username-label': 'Логин (E-mail)',
31
+ 'password-label': 'Пароль',
32
+ 'remember-label': 'Запомнить',
33
33
  'login-button-title': 'Выполнить вход в систему по логину и паролю',
34
34
  'login-button-text': 'Войти',
35
35
  'login-with-label': 'Войти с помощью:',
@@ -1,13 +1,28 @@
1
1
  <div class="username-div">
2
- {{t "components.login.username-label"}}<br/>
3
- {{input type="text" keyPress=(action "onKeyPress") value=username}}
2
+ <label for="username">{{t "components.login.username-label"}}</label>
3
+ {{input
4
+ type="text"
5
+ id="username"
6
+ keyPress=(action "onKeyPress")
7
+ value=username
8
+ placeholder="Введите логин"}}
4
9
  </div>
5
10
  <div class="password-div">
6
- {{t "components.login.password-label"}}<br/>
7
- {{input type="password" keyPress=(action "onKeyPress") value=password}}
11
+ <label for="password">{{t "components.login.password-label"}}</label>
12
+ {{input
13
+ type="password"
14
+ id="password"
15
+ keyPress=(action "onKeyPress")
16
+ value=password
17
+ placeholder="Введите пароль"}}
18
+ </div>
19
+ <div class="remember-div">
20
+ <div class="ui checkbox">
21
+ {{input type="checkbox" id="remember" checked=remember}}
22
+ <label for="remember">{{t "components.login.remember-label"}}</label>
23
+ </div>
8
24
  </div>
9
25
  <div class="login-div">
10
- {{t "components.login.remember-label"}} {{input type="checkbox" checked=remember}}
11
26
  <button
12
27
  class="ui login-button button"
13
28
  title={{t "components.login.login-button-title"}}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ember-flexberry-account",
3
- "version": "0.1.0-beta.1",
3
+ "version": "0.1.0-beta.2",
4
4
  "description": "User account management addon.",
5
5
  "directories": {
6
6
  "doc": "doc",