From cc3802746be61dd665b4b0ac1e69d6586a59816f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Salvador=20P=C3=A9rez=20Garc=C3=ADa?= Date: Thu, 28 Jun 2018 08:58:11 +0200 Subject: [PATCH] Added totals counter Added totals counter to dashboard header --- app/assets/stylesheets/proposal.scss | 50 +++++++++++++++++++ .../dashboard/_proposal_totals.html.erb | 26 ++++++++++ .../layouts/proposals_dashboard.html.erb | 1 + config/locales/en/general.yml | 4 ++ config/locales/es/general.yml | 4 ++ 5 files changed, 85 insertions(+) create mode 100644 app/views/layouts/dashboard/_proposal_totals.html.erb diff --git a/app/assets/stylesheets/proposal.scss b/app/assets/stylesheets/proposal.scss index 465d63659..6591dedb7 100644 --- a/app/assets/stylesheets/proposal.scss +++ b/app/assets/stylesheets/proposal.scss @@ -106,6 +106,56 @@ } } + .proposal-totals { + padding: 0; + + .column { + padding: 1.5rem; + + } + + .column:first-child { + border-right: 1px solid lightgray; + display: flex; + align-items: stretch; + justify-content: center; + } + + .counter { + flex-grow: 1; + padding-left: 10pt; + padding-right: 10pt; + + .counter-value { + font-size: 1.2rem; + font-weight: bold; + text-align: center; + } + + .counter-label { + color: #c5c5c5; + font-weight: bold; + text-align: center; + } + } + + .counter:first-child { + padding-left: 0; + + .counter-value { + color: #ffac38; + } + + .counter-label { + color: #ffac38; + } + } + + .counter:not(:last-child) { + border-right: 1px solid lightgray; + } + } + .proposal-title { display: flex; align-items: flex-start; diff --git a/app/views/layouts/dashboard/_proposal_totals.html.erb b/app/views/layouts/dashboard/_proposal_totals.html.erb new file mode 100644 index 000000000..da37b5bd4 --- /dev/null +++ b/app/views/layouts/dashboard/_proposal_totals.html.erb @@ -0,0 +1,26 @@ +
+
+
+
+
<%= proposal.votes_for.size %>
+
<%= t('.supports') %>
+
+ +
+
+ <%= ProposalDashboardAction.active.resources.active_for(proposal).count %> + / + <%= ProposalDashboardAction.active.resources.count %> +
+
<%= t('.active_resources') %>
+
+ +
+
0
+
<%= t('.community') %>
+
+
+
+
+
+
diff --git a/app/views/layouts/proposals_dashboard.html.erb b/app/views/layouts/proposals_dashboard.html.erb index 7c37691fb..c9d7b8669 100644 --- a/app/views/layouts/proposals_dashboard.html.erb +++ b/app/views/layouts/proposals_dashboard.html.erb @@ -57,6 +57,7 @@
<%= render partial: 'layouts/flash' %> + <%= render partial: 'layouts/dashboard/proposal_totals' %> <%= render partial: 'layouts/dashboard/proposal_header' %> <%= yield %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 0f8b93488..32a5dfa03 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -207,6 +207,10 @@ en: published: Published draft: Draft retired: Retired + proposal_totals: + supports: Supports + active_resources: Active resources + community: Community footer: accessibility: Accessibility conditions: Terms and conditions of use diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 6c7d5a5b4..79ac50a72 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -207,6 +207,10 @@ es: published: Publicada draft: Borrador retired: Retirada + proposal_totals: + supports: Apoyos + active_resources: Recursos activos + community: Comunidad footer: accessibility: Accesibilidad conditions: Condiciones de uso