From 7100156b2849fdab5c733e8b08f81a24922fe345 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 5 Jan 2017 10:55:53 +0100 Subject: [PATCH] Show full header when click on expand button --- app/assets/javascripts/legislation.js.coffee | 7 ++++++ .../draft_versions/_process_header.html.erb | 19 -------------- .../draft_versions/changes.html.erb | 2 +- .../legislation/draft_versions/show.html.erb | 2 +- .../legislation/processes/_header.html.erb | 25 +++++++++++++++++++ .../processes/_header_full.html.erb | 2 +- .../processes/phase_empty.html.erb | 2 +- .../processes/phase_not_open.html.erb | 2 +- app/views/legislation/processes/show.html.erb | 2 +- 9 files changed, 38 insertions(+), 25 deletions(-) delete mode 100644 app/views/legislation/draft_versions/_process_header.html.erb create mode 100644 app/views/legislation/processes/_header.html.erb diff --git a/app/assets/javascripts/legislation.js.coffee b/app/assets/javascripts/legislation.js.coffee index 8ed109482..26c0185c1 100644 --- a/app/assets/javascripts/legislation.js.coffee +++ b/app/assets/javascripts/legislation.js.coffee @@ -14,3 +14,10 @@ App.Legislation = $('form#draft_version_go_to_version select').on change: -> $('form#draft_version_go_to_version').submit() + + $('#js-toggle-legislation-process-header').on + click: -> + $('[data-target="legislation-header-small"]').toggle() + $('[data-target="legislation-header-full"]').toggle() + + diff --git a/app/views/legislation/draft_versions/_process_header.html.erb b/app/views/legislation/draft_versions/_process_header.html.erb deleted file mode 100644 index 3c0c94d3f..000000000 --- a/app/views/legislation/draft_versions/_process_header.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
-

<%= process.title %>

-
-
- - -

Suscrito

- -
-
- -
- - - -
-
diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb index 0f2015cda..c158b9540 100644 --- a/app/views/legislation/draft_versions/changes.html.erb +++ b/app/views/legislation/draft_versions/changes.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= "#{@draft_version.title} - #{t('.title')} - #{@process.title}" %><% end %> -<%= render 'process_header', process: @process %> +<%= render 'legislation/processes/header', process: @process, header: :small %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %> diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb index 8ab20eea9..a1a1c15a2 100644 --- a/app/views/legislation/draft_versions/show.html.erb +++ b/app/views/legislation/draft_versions/show.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= "#{@draft_version.title} - #{@process.title}" %><% end %> -<%= render 'process_header', process: @process %> +<%= render 'legislation/processes/header', process: @process, header: :small %>
<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %> diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb new file mode 100644 index 000000000..ecbd17dcd --- /dev/null +++ b/app/views/legislation/processes/_header.html.erb @@ -0,0 +1,25 @@ +<% if header == :small %> +
+
+
+

<%= process.title %>

+
+
+ + +

Suscrito

+ +
+
+ +
+ + + +
+
+ + <%= render 'legislation/processes/header_full', process: @process, hidden: true %> +<% else %> + <%= render 'legislation/processes/header_full', process: @process, hidden: false %> +<% end %> diff --git a/app/views/legislation/processes/_header_full.html.erb b/app/views/legislation/processes/_header_full.html.erb index d631f8de5..e3f3420cf 100644 --- a/app/views/legislation/processes/_header_full.html.erb +++ b/app/views/legislation/processes/_header_full.html.erb @@ -1,4 +1,4 @@ -
+

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

diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb index 427339b82..6fb588faf 100644 --- a/app/views/legislation/processes/phase_empty.html.erb +++ b/app/views/legislation/processes/phase_empty.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= @process.title %><% end %> -<%= render 'legislation/processes/header_full', process: @process %> +<%= render 'legislation/processes/header', process: @process, header: :full %>
<%= render 'legislation/processes/key_dates', process: @process, phase: @phase %> diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb index 6bd82c969..0b3b90f01 100644 --- a/app/views/legislation/processes/phase_not_open.html.erb +++ b/app/views/legislation/processes/phase_not_open.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= @process.title %><% end %> -<%= render 'legislation/processes/header_full', process: @process %> +<%= render 'legislation/processes/header', process: @process, header: :full %>
<%= render 'legislation/processes/key_dates', process: @process, phase: @phase %> diff --git a/app/views/legislation/processes/show.html.erb b/app/views/legislation/processes/show.html.erb index b24f7668b..410068831 100644 --- a/app/views/legislation/processes/show.html.erb +++ b/app/views/legislation/processes/show.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= @process.title %><% end %> -<%= render 'header_full', process: @process %> +<%= render 'legislation/processes/header', process: @process, header: :full %>
<%= render 'key_dates', process: @process, phase: :debate %>