Merge branch 'release/0.6.4_patch.2'

ulmic · Mar 7, 2016 · c1fad0d · c1fad0d
2 parents bc0edf0 + dea1a1c
commit c1fad0d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 19 deletions.
diff --git a/app/views/web/sessions/new.html.haml b/app/views/web/sessions/new.html.haml
@@ -17,22 +17,35 @@
         = f.input :email, as: :string
         = f.input :password, required: true
         = f.button :submit, t('helpers.enter'), class: "mic-flat-button"
-      .row
-        .small-3.columns
-          = link_to auth_path(:vkontakte) do
-            %span.icon-vkontakte.min-icon
-            = t('social_networks.vkontakte')
-        .small-3.columns
-          = link_to auth_path(:facebook) do
-            %span.icon-facebook.min-icon
-            = t('social_networks.facebook')
-        .small-3.columns
-          = link_to auth_path(:twitter) do
-            %span.icon-twitter.min-icon
-            = t('social_networks.twitter')
-        .small-3.columns
-          = link_to auth_path(:google) do
-            %span.icon-google.min-icon
-      = link_to t('.register'), new_user_path
-      %br
-      = link_to t('.remind_password'), new_remind_password_path
+      .panel
+        .row
+          .small-12.columns
+            %h5
+              = t('.sign_in_with')
+        .row
+          .small-3.columns
+            = link_to auth_path(:vkontakte) do
+              %span.icon-vkontakte.min-icon
+              = t('social_networks.vkontakte')
+          .small-3.columns
+            = link_to auth_path(:facebook) do
+              %span.icon-facebook.min-icon
+              = t('social_networks.facebook')
+          .small-3.columns
+            = link_to auth_path(:twitter) do
+              %span.icon-twitter.min-icon
+              = t('social_networks.twitter')
+          .small-3.columns
+            = link_to auth_path(:google) do
+              %span.icon-google.min-icon
+              = t('social_networks.google')
+      .panel
+        .row
+          .small-6.columns
+            = link_to new_user_path do
+              = fa_icon 'user-plus'
+              = t('.register')
+          .small-6.columns
+            = link_to new_remind_password_path do
+              = fa_icon 'unlock-alt'
+              = t('.remind_password')
diff --git a/config/locales/ru/ru.yml b/config/locales/ru/ru.yml
@@ -159,6 +159,7 @@ ru:
         wrong_email_or_password: 'Неверный e-mail или пароль'
         may_be_you_have_auth_via_social_network: Возможно вы авторизовывались через социальные сети
         remind_password_notification_sended: Вам было отправлено письмо с инструкциями для восстановления пароля
+        sign_in_with: Авторизуйтесь через социальную сеть
     remind_password:
       new:
         title: Восстановление пароля