Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

stylings for main menu and login form

  • Loading branch information...
commit 3fa64d0bea29a5e21ad489c56a43d5099dbc15e6 1 parent 1b27937
@ck3g authored
View
6 app/assets/stylesheets/app_bootstrap.css.scss
@@ -37,5 +37,11 @@ $baseLineHeight: 18px;
width: 70px;
}
+form.top-login {
+ input[type=email], input[type=password] {
+ margin-top: 5px;
+ }
+}
+
@import "twitter/bootstrap";
@import "twitter/bootstrap-responsive";
View
9 app/views/shared/_top_nav_bar.html.haml
@@ -29,6 +29,9 @@
%li= link_to t("users.logout"), :destroy_user_session, method: :delete
- else
= form_for "user", url: user_session_path, html: {action: user_session, class: "form-inline pull-right top-login"} do |f|
- = f.email_field :email, placeholder: "email", class: "input-small"
- = f.password_field :password, placeholder: "Пароль", class: "input-small"
- = f.submit "Войти", class: "btn"
+ = f.email_field :email, placeholder: User.human_attribute_name(:email), class: "input-small"
+ = f.password_field :password, placeholder: User.human_attribute_name(:password), class: "input-small"
+ = f.submit t(:do_sign_in), class: "btn"
+ %ul.nav.pull-right
+ = link_to_nav t(:sign_up), new_user_registration_path
+ %li.divider-vertical
View
8 config/locales/models/user.ru.yml
@@ -0,0 +1,8 @@
+
+ru:
+ activerecord:
+ attributes:
+ user:
+ email: Email
+ password: Пароль
+ password_confirmation: Подтверждение пароля
View
4 config/locales/ru.yml
@@ -95,4 +95,8 @@ ru:
create_page: Создать страницу
pages: Страницы
articles_title: Новости
+ sign_up: Регистрация
+ sign_in: Вход
+ do_sign_up: Зарегистрироваться
+ do_sign_in: Войти
Please sign in to comment.
Something went wrong with that request. Please try again.