From ae206648a6f5a7e996ff7f07a035cbc52b6fa9e4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 16:37:44 +0200 Subject: [PATCH] improves styles for admin administrators views --- .../administrators/_administrator.html.erb | 55 ++++++------ app/views/admin/administrators/index.html.erb | 84 +++++++++++-------- .../administrators/user_not_found.js.erb | 2 +- config/locales/en/admin.yml | 5 +- config/locales/es/admin.yml | 5 +- 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/app/views/admin/administrators/_administrator.html.erb b/app/views/admin/administrators/_administrator.html.erb index d948e1eed..de480597d 100644 --- a/app/views/admin/administrators/_administrator.html.erb +++ b/app/views/admin/administrators/_administrator.html.erb @@ -1,26 +1,29 @@ -
- - - - - - - - -
- <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'),{ controller: "admin/administrators", action: :create, user_id: administrator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
-
+ + + + + + + + + + + + + +
<%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
+ <%= administrator.name %> + + <%= administrator.email %> + + <% if administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(administrator), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'),{ controller: "admin/administrators", action: :create, user_id: administrator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
diff --git a/app/views/admin/administrators/index.html.erb b/app/views/admin/administrators/index.html.erb index 1cfbf5079..a98d46618 100644 --- a/app/views/admin/administrators/index.html.erb +++ b/app/views/admin/administrators/index.html.erb @@ -1,46 +1,58 @@ -

<%= t("admin.administrators.index.title") %>

+

<%= t("admin.administrators.index.title") %>

-
+
<%= form_tag search_admin_administrators_path, method: :get, remote: true do %> -
+
<%= text_field_tag :email, '', placeholder: t('admin.administrators.search.email_placeholder') %> -
-
- <%= submit_tag t('admin.administrators.search.search'), class: 'button' %> + +
+ <%= submit_tag t('admin.administrators.search.search'), class: 'button' %> +
<% end %>
-
+
-

<%= page_entries_info @administrators %>

+<% if @administrators.any? %> +

<%= page_entries_info @administrators %>

- - <% @administrators.each do |administrator| %> - - - - - - <% end %> -
- <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'), - { controller: "admin/administrators", action: :create, - user_id: administrator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
+ + + + + + + <% @administrators.each do |administrator| %> + + + + + + <% end %> +
<%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
+ <%= administrator.name %> + + <%= administrator.email %> + + <% if administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(administrator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'), + { controller: "admin/administrators", action: :create, + user_id: administrator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
-<%= paginate @administrators %> + <%= paginate @administrators %> +<% else %> +
+ <%= t("admin.administrators.index.no_administrators") %> +
+<% end %> diff --git a/app/views/admin/administrators/user_not_found.js.erb b/app/views/admin/administrators/user_not_found.js.erb index ba707fc9d..8e979e667 100644 --- a/app/views/admin/administrators/user_not_found.js.erb +++ b/app/views/admin/administrators/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
<%= j t('admin.administrators.search.user_not_found') %>
"); +$("#search-result").html("
<%= j t('admin.administrators.search.user_not_found') %>
"); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 38abe6f56..c0111dea9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -432,6 +432,9 @@ en: administrators: index: title: Administrators + name: Name + email: Email + no_administrators: There are no administrators. administrator: add: Add delete: Delete @@ -439,7 +442,7 @@ en: search: email_placeholder: Search user by email search: Search - user_not_found: User not found + user_not_found: User not found. moderators: index: title: Moderators diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3336cdc5b..5cb7badff 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -382,6 +382,9 @@ es: administrators: index: title: Administradores + name: Nombre + email: Email + no_administrators: No hay administradores. administrator: add: Añadir como Administrador delete: Borrar @@ -389,7 +392,7 @@ es: search: email_placeholder: Buscar usuario por email search: Buscar - user_not_found: Usuario no encontrado + user_not_found: Usuario no encontrado. managers: index: title: Gestores