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

package/addon/components/flexberry-login.js

@@ -124,8 +124,8 @@ export default Ember.Component.extend({
       Ember.getOwner(this).lookup('router:main').transitionTo('pwd-reset');
     },
 
-    onKeyPress(e) {
-      if (e.keyCode === 13) {
+    onKeyPress: function(e) {
+      if (e.keyCode === 13 && !this.get('allowToLogin')) {
         this.send('login');
       }
     },

package/addon/locales/en/translations.js

@@ -25,9 +25,9 @@ export default {
   },
   components: {
     login: {
-      'username-label': 'User name (E-mail):',
-      'password-label': 'Password:',
-      'remember-label': 'Remember:',
+      'username-label': 'User name (E-mail)',
+      'password-label': 'Password',
+      'remember-label': 'Remember',
       'login-button-title': 'Log in to the system using login and password',
       'login-button-text': 'Login',
       'login-with-label': 'Login with:',

package/addon/locales/ru/translations.js

@@ -27,9 +27,9 @@ export default {
 
   components: {
     login: {
-      'username-label': 'Логин (E-mail):',
-      'password-label': 'Пароль:',
-      'remember-label': 'Запомнить:',
+      'username-label': 'Логин (E-mail)',
+      'password-label': 'Пароль',
+      'remember-label': 'Запомнить',
       'login-button-title': 'Выполнить вход в систему по логину и паролю',
       'login-button-text': 'Войти',
       'login-with-label': 'Войти с помощью:',

package/app/templates/components/flexberry-login.hbs

@@ -1,13 +1,28 @@
 <div class="username-div">
-  {{t "components.login.username-label"}}<br/>
-  {{input type="text" keyPress=(action "onKeyPress") value=username}}
+  <label for="username">{{t "components.login.username-label"}}</label>
+  {{input
+    type="text"
+    id="username"
+    keyPress=(action "onKeyPress")
+    value=username
+    placeholder="Введите логин"}}
 </div>
 <div class="password-div">
-  {{t "components.login.password-label"}}<br/>
-  {{input type="password" keyPress=(action "onKeyPress") value=password}}
+  <label for="password">{{t "components.login.password-label"}}</label>
+  {{input 
+    type="password"
+    id="password"
+    keyPress=(action "onKeyPress")
+    value=password
+    placeholder="Введите пароль"}}
+</div>
+<div class="remember-div">
+  <div class="ui checkbox">
+    {{input type="checkbox" id="remember" checked=remember}}
+    <label for="remember">{{t "components.login.remember-label"}}</label>
+  </div>
 </div>
 <div class="login-div">
-  {{t "components.login.remember-label"}} {{input type="checkbox" checked=remember}}
   <button
     class="ui login-button button"
     title={{t "components.login.login-button-title"}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-flexberry-account",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.2",
   "description": "User account management addon.",
   "directories": {
     "doc": "doc",