diff --git a/app/views/admin/officials/edit.html.erb b/app/views/admin/officials/edit.html.erb index 4696ea4de..5a17d2445 100644 --- a/app/views/admin/officials/edit.html.erb +++ b/app/views/admin/officials/edit.html.erb @@ -1,20 +1,22 @@ -<%= back_link_to %> +<%= back_link_to admin_officials_path %>
-
<%= @user.name %> (<%= @user.email %>)
-

<%= t("admin.officials.edit.title") %>

-
-
+
+ <%= @user.name %>
+ <%= @user.email %> +
+ +
<%= form_for @user, url: admin_official_path(@user) do |f| %> <%= f.text_field :official_position %> <%= f.select :official_level, official_level_options %> + <%= f.submit class: "button" %> <% if @user.official? %> - <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'button hollow alert' %> +
+ <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'delete' %> <% end %> - <%= f.submit class: "button hollow" %> <% end %> -
diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb index 078d5bbbc..f4cbdd06c 100644 --- a/app/views/admin/officials/index.html.erb +++ b/app/views/admin/officials/index.html.erb @@ -2,26 +2,42 @@ <%= render 'admin/shared/user_search', url: search_admin_officials_path %> -

<%= page_entries_info @officials %>

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

<%= page_entries_info @officials %>

- - <% @officials.each do |official| %> - - - - - - <% end %> -
- <%= link_to official.name, edit_admin_official_path(official) %> - - - <%= official.official_position %> - - (<%= t("admin.officials.level_#{official.official_level}") %>) - - <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), - edit_admin_official_path(official), class: "button hollow" %> -
+ + + + + + + + + <% @officials.each do |official| %> + + + + + + + <% end %> + +
<%= t("admin.officials.index.name") %><%= t("admin.officials.index.official_position") %><%= t("admin.officials.index.official_level") %><%= t("admin.shared.actions") %>
+ <%= link_to official.name, edit_admin_official_path(official) %> + + + <%= official.official_position %> + + + <%= t("admin.officials.level_#{official.official_level}") %> + + <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), + edit_admin_official_path(official), class: "button hollow expanded" %> +
-<%= paginate @officials %> + <%= paginate @officials %> +<% else %> +
+ <%= t("admin.officials.index.no_officials") %> +
+<% end %> diff --git a/app/views/admin/officials/search.html.erb b/app/views/admin/officials/search.html.erb index f2d90c143..e2a067c9d 100644 --- a/app/views/admin/officials/search.html.erb +++ b/app/views/admin/officials/search.html.erb @@ -2,24 +2,52 @@ <%= render 'admin/shared/user_search', url: search_admin_officials_path %> -

<%= page_entries_info @users %>

+<% if @users.any? %> - - <% @users.each do |user| %> - - - - - - <% end %> -
- <%= link_to user.name, edit_admin_official_path(user) %> - - - <%= user.official_position %> - - (<%= t("admin.officials.level_#{user.official_level}") %>) - - <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), - edit_admin_official_path(user), class: "button hollow" %> -
+

<%= page_entries_info @users %>

+ + + + + + + + + + <% @users.each do |user| %> + + + + + + + <% end %> + +
<%= t("admin.officials.index.name") %><%= t("admin.officials.index.official_position") %><%= t("admin.officials.index.official_level") %><%= t("admin.shared.actions") %>
+ <%= link_to user.name, edit_admin_official_path(user) %> + + <% if user.official? %> + + <%= user.official_position %> + + <% else %> + <%= t("admin.officials.level_0") %> + <% end %> + + <%= t("admin.officials.level_#{user.official_level}") %> + + <% if user.official? %> + <%= link_to t("admin.officials.search.edit_official"), + edit_admin_official_path(user), + class: "button hollow expanded" %> + <% else %> + <%= link_to t("admin.officials.search.make_official"), + edit_admin_official_path(user), + class: "button expanded" %> + <% end %> +
+<% else %> +
+ <%= t("admin.officials.search.no_results") %> +
+<% end %> \ No newline at end of file diff --git a/app/views/admin/shared/_user_search.html.erb b/app/views/admin/shared/_user_search.html.erb index a964ce549..c553052c2 100644 --- a/app/views/admin/shared/_user_search.html.erb +++ b/app/views/admin/shared/_user_search.html.erb @@ -1,10 +1,10 @@ -<%= form_for(User.new, url: url, as: :user, method: :get) do |f| %> -
-
- <%= text_field_tag :name_or_email, "", placeholder: t("admin.shared.user_search.placeholder") %> +
+ <%= form_for(User.new, url: url, as: :user, method: :get) do |f| %> +
+ <%= text_field_tag :name_or_email, "", placeholder: t("admin.shared.user_search.placeholder") %> +
+ <%= f.submit t("admin.shared.user_search.button"), class: "button" %> +
-
- <%= f.submit t("admin.shared.user_search.button"), class: "button success" %> -
-
-<% end %> \ No newline at end of file + <% end %> +
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e085bc1a9..a6a407a41 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -691,6 +691,10 @@ en: official_updated: Details of official saved index: title: Officials + no_officials: There are no officials. + name: Nombre + official_position: Official position + official_level: Level level_0: Not official level_1: Level 1 level_2: Level 2 @@ -701,6 +705,7 @@ en: edit_official: Edit official make_official: Make official title: 'Official positions: User search' + no_results: Official positions not found. organizations: index: filter: Filter diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index bcd6fe5eb..503cdafc3 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -693,6 +693,10 @@ es: official_updated: Datos del cargo público guardados index: title: Cargos Públicos + no_officials: No hay cargos públicos. + name: Nombre + official_position: Cargo público + official_level: Nivel level_0: No es cargo público level_1: Nivel 1 level_2: Nivel 2 @@ -703,6 +707,7 @@ es: edit_official: Editar cargo público make_official: Convertir en cargo público title: 'Cargos Públicos: Búsqueda de usuarios' + no_results: No se han encontrado cargos públicos. organizations: index: filter: Filtro