From 524fa2302fdb981827e00a46d63516cdb9cc1b06 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 22 Mar 2012 17:53:35 +0400
Subject: [PATCH] [issue #279] Changed buttons alignment.

---
 app/assets/stylesheets/design/custom.scss |  4 ++++
 app/views/collaborators/edit.html.haml    | 11 ++++-------
 config/locales/en.yml                     |  1 +
 config/locales/ru.yml                     |  1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss
index 15d77c1c3..d8e319fad 100644
--- a/app/assets/stylesheets/design/custom.scss
+++ b/app/assets/stylesheets/design/custom.scss
@@ -626,6 +626,10 @@ div.admin-role {
     padding-right: 10px;
 }
 
+article a.right_floated {
+    float: right;
+}
+
 /* TODO think, how to do it more beautiful */
 ul.ui-autocomplete {
     z-index: 999 !important;
diff --git a/app/views/collaborators/edit.html.haml b/app/views/collaborators/edit.html.haml
index 4432549db..c075b3440 100644
--- a/app/views/collaborators/edit.html.haml
+++ b/app/views/collaborators/edit.html.haml
@@ -40,8 +40,8 @@
               .radio
                 = radio_button_tag "user[#{user.id}]", role, ((@project.relations.exists? :object_id => user.id, :object_type => 'User', :role => role) ? :checked : nil), :class => 'niceRadio'
               .forradio= t("layout.collaborators.role_names.#{ role }")
-  = link_to_function t("layout.delete"), "deleteAdminMember();", :class => 'button'
-  = link_to_function t("layout.save"), "saveAdminMember();", :class => 'button'
+  = link_to_function t("layout.delete_selected"), "deleteAdminMember();", :class => 'button'
+  = link_to_function t("layout.save"), "saveAdminMember();", :class => 'button right_floated'
   .both
 %br
 
@@ -85,11 +85,8 @@
               .radio
                 = radio_button_tag "group[#{group.id}]", role, ((@project.relations.exists? :object_id => group.id, :object_type => 'Group', :role => role) ? :checked : nil), :class => 'niceRadio'
               .forradio= t("layout.collaborators.role_names.#{ role }")
-  = link_to_function t("layout.delete"), "deleteAdminGroup();", :class => 'button'
-  = link_to_function t("layout.save"), "saveAdminGroup();", :class => 'button'
+  = link_to_function t("layout.delete_selected"), "deleteAdminGroup();", :class => 'button'
+  = link_to_function t("layout.save"), "saveAdminGroup();", :class => 'button right_floated'
   .both
-%br
-
-.hr.bottom
 .both
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e226eebed..eefa2d4e0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -24,6 +24,7 @@ en:
     create: Create
     update: Update
     delete: Erase
+    delete_selected: Remove selected
     save: Save
     clone: Clone
     search_by_name: Filter by name
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f516a5995..f9dc78c6b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -24,6 +24,7 @@ ru:
     create: Создать
     update: Обновить
     delete: Удалить
+    delete_selected: Удалить выбранное
     save: Сохранить
     clone: Клонировать
     search_by_name: Фильтр по имени