diff --git a/app/assets/stylesheets/proposal.scss b/app/assets/stylesheets/proposal.scss index e0d89157d..465d63659 100644 --- a/app/assets/stylesheets/proposal.scss +++ b/app/assets/stylesheets/proposal.scss @@ -106,6 +106,26 @@ } } + .proposal-title { + display: flex; + align-items: flex-start; + + .label { + color: #fefefe; + margin-left: 10pt; + } + } + + .action-title { + margin-top: 5pt; + margin-bottom: 10pt; + + hr { + max-width: 100%; + margin: 0; + } + } + .columns { padding: 0; } diff --git a/app/views/dashboard/polls/edit.html.erb b/app/views/dashboard/polls/edit.html.erb index f7bd93212..9f9605fac 100644 --- a/app/views/dashboard/polls/edit.html.erb +++ b/app/views/dashboard/polls/edit.html.erb @@ -1,6 +1,6 @@ -<%= back_link_to %> +<% content_for :action_title, t("admin.polls.edit.title") %> -

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

+<%= back_link_to %>
<%= render "form" %> diff --git a/app/views/dashboard/polls/index.html.erb b/app/views/dashboard/polls/index.html.erb index 3796b4fbd..51d8e1a3f 100644 --- a/app/views/dashboard/polls/index.html.erb +++ b/app/views/dashboard/polls/index.html.erb @@ -1,4 +1,4 @@ -

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

+<% content_for :action_title, t("admin.polls.index.title") %> <%= link_to t("admin.polls.index.create"), new_proposal_dashboard_poll_path(proposal), diff --git a/app/views/dashboard/polls/new.html.erb b/app/views/dashboard/polls/new.html.erb index ac3ba5a4d..95f745453 100644 --- a/app/views/dashboard/polls/new.html.erb +++ b/app/views/dashboard/polls/new.html.erb @@ -1,7 +1,6 @@ +<% content_for :action_title, t("admin.polls.new.title") %> <%= back_link_to %> -

<%= t("admin.polls.new.title") %>

-
<%= render "form" %>
diff --git a/app/views/dashboard/polls/show.html.erb b/app/views/dashboard/polls/show.html.erb index be45eeb31..636e6dfe5 100644 --- a/app/views/dashboard/polls/show.html.erb +++ b/app/views/dashboard/polls/show.html.erb @@ -1,3 +1,5 @@ +<% content_for :action_title, t(".title") %> + <%= render "poll_header" %>
diff --git a/app/views/layouts/dashboard/_proposal_header.html.erb b/app/views/layouts/dashboard/_proposal_header.html.erb new file mode 100644 index 000000000..59e0f8f9d --- /dev/null +++ b/app/views/layouts/dashboard/_proposal_header.html.erb @@ -0,0 +1,17 @@ +
+

<%= proposal.title %>

+ <% if proposal.retired? %> +
<%= t('.retired') %>
+ <% elsif proposal.published? %> +
<%= t('.published') %>
+ <% else %> +
<%= t('.draft') %>
+ <% end %> +
+ +<% if content_for?(:action_title) %> +
+
<%= yield(:action_title) %>
+
+
+<% end %> diff --git a/app/views/layouts/proposals_dashboard.html.erb b/app/views/layouts/proposals_dashboard.html.erb index 9f8e732e4..7c37691fb 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_header' %> <%= yield %>
diff --git a/app/views/proposals_dashboard/index.html.erb b/app/views/proposals_dashboard/index.html.erb index 81d0d5545..9f6e118af 100644 --- a/app/views/proposals_dashboard/index.html.erb +++ b/app/views/proposals_dashboard/index.html.erb @@ -1,3 +1,5 @@ +<% content_for :action_title, t('.title') %> + <% proposed_actions.each do |action| %> diff --git a/app/views/proposals_dashboard/new_request.html.erb b/app/views/proposals_dashboard/new_request.html.erb index 1290e4699..e52a2aa2d 100644 --- a/app/views/proposals_dashboard/new_request.html.erb +++ b/app/views/proposals_dashboard/new_request.html.erb @@ -1,3 +1,5 @@ +<% content_for :action_title, t('.title') %> +
diff --git a/app/views/proposals_dashboard/stats.html.erb b/app/views/proposals_dashboard/stats.html.erb index 214092cea..f386c9041 100644 --- a/app/views/proposals_dashboard/stats.html.erb +++ b/app/views/proposals_dashboard/stats.html.erb @@ -1,3 +1,5 @@ +<% content_for :action_title, t('.title') %> +
<%= link_to t('.group_by_year'), stats_proposal_dashboard_index_path(proposal, group_by: 'year'), class: 'button' %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 8e365bbd8..0f8b93488 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -202,8 +202,11 @@ en: firefox: Firefox ie: We have detected that you are browsing with Internet Explorer. For an enhanced experience, we recommend using %{firefox} or %{chrome}. ie_title: This website is not optimised for your browser - proposals_dashboard: - title: Proposal dashboard + dashboard: + proposal_header: + published: Published + draft: Draft + retired: Retired footer: accessibility: Accessibility conditions: Terms and conditions of use @@ -509,12 +512,17 @@ en: create_request: success: The request for the administrator has been successfully sent. stats: + title: Graphic group_by_year: Group by year group_by_month: Group by month group_by_week: Group by week group_by_date: Group by date progress: Acumulated progress supports: Supports + index: + title: Edition + new_request: + title: Administrator request dashboard: polls: form: @@ -524,6 +532,8 @@ en: add_answer: Add answer question_answer_fields: remove_answer: Remove answer + show: + title: Configure poll polls: all: "All" no_dates: "no date assigned" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index a630a2f6d..6c7d5a5b4 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -202,8 +202,11 @@ es: firefox: Firefox ie: Hemos detectado que estás navegando desde Internet Explorer. Para una mejor experiencia te recomendamos utilizar %{firefox} o %{chrome}. ie_title: Esta web no está optimizada para tu navegador - proposals_dashboard: - title: Dashboard de propuesta + dashboard: + proposal_header: + published: Publicada + draft: Borrador + retired: Retirada footer: accessibility: Accesibilidad conditions: Condiciones de uso @@ -509,12 +512,17 @@ es: create_request: success: La petición ha sido correctamente enviada al administrador. stats: + title: Gráfico group_by_year: Agrupar por año group_by_month: Agrupar por meses group_by_week: Agrupar por semanas group_by_date: Agrupar por fechas progress: Progreso acumulado supports: Apoyos + index: + title: Edición + new_request: + title: Petición al administrador dashboard: polls: form: @@ -524,6 +532,8 @@ es: add_answer: Añadir respuesta question_answer_fields: remove_answer: Borrar respuesta + show: + title: Configurar encuesta polls: all: "Todas" no_dates: "sin fecha asignada"
<%= t('proposals_dashboard.menu.actions') %>