From a45e112e654c59bc6284d5f67c89d2c53c2e9dc4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 25 Apr 2016 11:12:52 +0200 Subject: [PATCH] Adds styles to admin spending proposals summary --- app/assets/stylesheets/admin.scss | 12 ++++++++++++ app/views/admin/spending_proposals/index.html.erb | 8 +++++--- app/views/admin/spending_proposals/summary.html.erb | 11 ++++++++--- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 1ccd7c880..7f05b47f8 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -354,6 +354,18 @@ body.admin { .investment-projects-list.medium-9 { width: 100%; } + + .investment-projects-summary { + + th { + text-align: center; + width: 33%; + + &:first-child { + text-align: left; + } + } + } } .admin-content .select-geozone { diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index 86dad6bbd..cd30f121d 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -1,4 +1,8 @@ -

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

+<%= link_to t("admin.spending_proposals.index.summary_link"), + summary_admin_spending_proposals_path, + class: "button float-right" %> + +

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

<%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %> @@ -36,8 +40,6 @@
<%= render 'shared/filter_subnav', i18n_namespace: "admin.spending_proposals.index" %> -<%= link_to t("admin.spending_proposals.index.summary_link"), - summary_admin_spending_proposals_path %>

<%= page_entries_info @spending_proposals %>

diff --git a/app/views/admin/spending_proposals/summary.html.erb b/app/views/admin/spending_proposals/summary.html.erb index 825b30983..64b07e0ea 100644 --- a/app/views/admin/spending_proposals/summary.html.erb +++ b/app/views/admin/spending_proposals/summary.html.erb @@ -1,6 +1,11 @@ +<%= link_to admin_spending_proposals_path, class: "back" do %> + + <%= t("shared.back") %> +<% end %> +

<%= t("admin.spending_proposals.summary.title") %>

- +
@@ -8,8 +13,8 @@ <% @spending_proposals.each do |geozone, price| %> - - + + <% end %>
<%= t("admin.spending_proposals.summary.geozone_name") %> <%= t("admin.spending_proposals.summary.count_for_geozone") %> <%= t("admin.spending_proposals.summary.cost_for_geozone") %>
<%= geozone.present? ? geozone.name : t("geozones.none") %><%= spending_proposal_count_for_geozone(geozone) %><%= number_to_currency(price) %><%= spending_proposal_count_for_geozone(geozone) %><%= number_to_currency(price) %>
\ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index b5899e63a..441c0048e 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -361,6 +361,7 @@ en: to: 'To' author_info: author_deleted: User deleted + back: Back check: Select check_all: All check_none: None diff --git a/config/locales/es.yml b/config/locales/es.yml index f1241bb15..02da179b1 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -361,6 +361,7 @@ es: to: 'Hasta' author_info: author_deleted: Usuario eliminado + back: Volver check: Seleccionar check_all: Todos check_none: Ninguno