design fix

nastachku · Feb 6, 2013 · 5c8ee8a · 5c8ee8a
1 parent 63995de
commit 5c8ee8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/app/views/layouts/web/application.html.haml b/app/views/layouts/web/application.html.haml
@@ -18,4 +18,4 @@
         = yield
 
       %br/
-      = render "layouts/web/shared/footer"
+    = render "layouts/web/shared/footer"
diff --git a/app/views/layouts/web/shared/_navigation.html.haml b/app/views/layouts/web/shared/_navigation.html.haml
@@ -9,7 +9,7 @@
           - unless signed_in?
             %li= link_to t(".i_will_go"), new_user_path
 
-          %li= navbar_link t(".participants"), users_path, with: User.shown_as_participants.count
+          / %li= navbar_link t(".participants"), users_path, with: User.shown_as_participants.count
 
           - if signed_in?
             %li= link_to current_user.full_name, edit_account_account_path(current_user)

diff --git a/app/views/web/welcome/index.html.haml b/app/views/web/welcome/index.html.haml
@@ -1,12 +1,3 @@
-.hero-unit
-  %h1!= t '.hero_unit_title'
-  .lead
-    %p
-      != t '.hero_unit_content'
-
-  - unless signed_in?
-    = link_to t('.join'), new_user_path, class: 'btn btn-large'
-
 = render "themes"
 .border
 = render "want_to_do"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -211,6 +211,12 @@ ru:
             body:
               blank: 'Тело новости не может быть пустым'
 
+          users: 
+            attributes:
+              email:
+                blank: 'Поле не может быть пустым'
+                taken: 'Такой email уже есть, выберите другой'
+
   simple_form:
     labels:
       user: