From 995449d73308bfcc52c29e57cf3c321bdca0beb0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 16 Feb 2018 13:28:30 +0100 Subject: [PATCH] Adds share buttons and refactors processes header --- .../legislation/processes/_header.html.erb | 59 ++++++++++--------- .../processes/_header_full.html.erb | 44 +++++--------- config/locales/en/legislation.yml | 7 +-- config/locales/es/legislation.yml | 7 +-- 4 files changed, 51 insertions(+), 66 deletions(-) diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb index d228673de..3c0d358f9 100644 --- a/app/views/legislation/processes/_header.html.erb +++ b/app/views/legislation/processes/_header.html.erb @@ -1,34 +1,37 @@ -<% if header == :small %> -
-
-
-

<%= process.title %>

-
-
+
+
+
+ <%= back_link_to legislation_processes_path %> +

<%= @process.title %>

- - -<% else %> - <%= render 'legislation/processes/header_full', process: @process %> -<% end %> +
diff --git a/app/views/legislation/processes/_header_full.html.erb b/app/views/legislation/processes/_header_full.html.erb index 4505a9ba5..c1d490331 100644 --- a/app/views/legislation/processes/_header_full.html.erb +++ b/app/views/legislation/processes/_header_full.html.erb @@ -1,32 +1,16 @@ -
-
-
- <%= back_link_to legislation_processes_path %> -

- <%= process.title %> -

-
+<% if @process.description.present? %> +

<%= t("legislation.processes.header.description") %>

+ <%= markdown @process.description %> +<% end %> + +<% if @process.additional_info.present? %> + -
-
- <% if process.description.present? %> -

<%= t('.description') %>

- <%= markdown process.description %> - <% end %> -
- <% if process.additional_info.present? %> - - <% end %> -
- - <% if process.additional_info.present? %> - - <% end %> -
+ + <%= t("legislation.processes.header.additional_info") %> + +<% end %> diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 00f2263f4..b0f387997 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -47,15 +47,14 @@ en: text_comments: Comments processes: header: - view_process_information: View process information + additional_info: Additional information + description: Description + more_info: More information and context proposals: empty_proposals: There are no proposals debate: empty_questions: There aren't any questions participate: Participate in the debate - header_full: - description: Description - more_info: More information and context index: filter: Filter filters: diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 9249abe01..e4654f6a6 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -47,15 +47,14 @@ es: text_comments: Comentarios processes: header: - view_process_information: Ver información del proceso + additional_info: Información adicional + description: En qué consiste + more_info: Más información y contexto proposals: empty_proposals: No hay propuestas debate: empty_questions: No hay preguntas participate: Realiza tus aportaciones al debate previo participando en los siguientes temas. - header_full: - description: En qué consiste - more_info: Más información y contexto index: filter: Filtro filters: