consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1899 from xarlybovi/legislation-process-html-fixes

Browse Source 
Legislation process minor html fixes
This commit is contained in:
Raimond Garcia
2018-01-08 16:00:26 +01:00
committed by GitHub
parent c641aee605 dc2e2a0944
commit bce0729a61
4 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/legislation.js.coffee
View File

@@ -1,14 +1,9 @@
App.Legislation = App.Legislation =
initialize: -> initialize: ->
$('#js-toggle-debate').on
click: ->
$('#debate-show').toggle()
$('#js-toggle-small-debate').on $('#js-toggle-small-debate').on
click: -> click: ->
$('#debate-show').toggle() $(this).find($('span')).toggleClass('icon-angle-up')
$('span').toggleClass('icon-angle-up')
$('form#new_legislation_answer input.button').hide() $('form#new_legislation_answer input.button').hide()
$('form#new_legislation_answer input[type=radio]').on $('form#new_legislation_answer input[type=radio]').on
@@ -19,7 +14,3 @@ App.Legislation =
$('form#draft_version_go_to_version select').on $('form#draft_version_go_to_version select').on
change: -> change: ->
$('form#draft_version_go_to_version').submit() $('form#draft_version_go_to_version').submit()
$('#js-toggle-legislation-process-header').on
click: ->
$('[data-target="legislation-header-full"]').toggle()

8
app/assets/stylesheets/legislation_process.scss
View File

@@ -39,10 +39,6 @@ $border-dark: darken($border, 10%);
} }
} }
.legislation-debate-show {
display: none;
}
.debate-add-info { .debate-add-info {
border-top: 1px solid $border-dark; border-top: 1px solid $border-dark;
margin-top: $line-height; margin-top: $line-height;
@@ -357,10 +353,6 @@ $border-dark: darken($border, 10%);
.legislation-allegation { .legislation-allegation {
padding-top: 1rem; padding-top: 1rem;
.legislation-debate-show {
margin-top: 2rem;
}
.headline { .headline {
margin-bottom: 0; margin-bottom: 0;

11
app/views/legislation/processes/_header.html.erb
View File

@@ -1,12 +1,12 @@
<% if header == :small %> <% if header == :small %>
<div class="legislation-hero jumbo grey-heading" data-target="legislation-header-small"> <div class="legislation-hero jumbo grey-heading">
<div class="row headline"> <div class="row headline">
<div class="small-12 medium-8 column"> <div class="small-12 medium-8 column">
<h3 class="headline-small"><%= process.title %></h3> <h3 class="headline-small"><%= process.title %></h3>
</div> </div>
</div> </div>
<div id="debate-show" class="row description legislation-debate-show"> <div id="debate-show" class="row description is-hidden" data-toggler=".is-hidden">
<div class="small-12 column"> <div class="small-12 column">
<% if process.description.present? %> <% if process.description.present? %>
<p class="title"><%= t('legislation.processes.header_full.description') %></p> <p class="title"><%= t('legislation.processes.header_full.description') %></p>
@@ -17,19 +17,18 @@
<div class="small-12 column debate-add-info"> <div class="small-12 column debate-add-info">
<%= markdown process.additional_info if process.additional_info %> <%= markdown process.additional_info if process.additional_info %>
</div> </div>
<% end %> <% end %>
</div> </div>
<% if process.description.present? || process.additional_info.present? %> <% if process.description.present? || process.additional_info.present? %>
<div class="text-center"> <div class="text-center">
<a class="button big text-center button-circle" title="<%= t('.view_process_information') %>" id="js-toggle-small-debate"> <a class="button big text-center button-circle" title="<%= t('.view_process_information') %>" id="js-toggle-small-debate" data-toggle="debate-show">
<span class="icon-angle-down" aria-hidden="true"></span> <span class="icon-angle-down" aria-hidden="true"></span>
</a> </a>
</div> </div>
<% end %> <% end %>
</div> </div>
<%= render 'legislation/processes/header_full', process: @process, hidden: true %>
<% else %> <% else %>
<%= render 'legislation/processes/header_full', process: @process, hidden: false %> <%= render 'legislation/processes/header_full', process: @process %>
<% end %> <% end %>

6
app/views/legislation/processes/_header_full.html.erb
View File

@@ -1,4 +1,4 @@
<div class="legislation-hero jumbo grey-heading" style="display:<%= hidden ? 'none' : 'block' %>" data-target="legislation-header-full"> <div class="legislation-hero jumbo grey-heading">
<div class="row headline"> <div class="row headline">
<div class="small-12 medium-8 column"> <div class="small-12 medium-8 column">
<%= back_link_to legislation_processes_path %> <%= back_link_to legislation_processes_path %>
@@ -16,7 +16,7 @@
<% end %> <% end %>
</div> </div>
<% if process.additional_info.present? %> <% if process.additional_info.present? %>
<div id="debate-show" class="small-12 column debate-add-info legislation-debate-show"> <div id="additional_info" class="small-12 column debate-add-info is-hidden" data-toggler=".is-hidden">
<%= markdown process.additional_info if process.additional_info %> <%= markdown process.additional_info if process.additional_info %>
</div> </div>
<% end %> <% end %>
@@ -24,7 +24,7 @@
<% if process.additional_info.present? %> <% if process.additional_info.present? %>
<div class="text-center"> <div class="text-center">
<a id="js-toggle-debate" class="button big text-center" title="<%= t('.more_info') %>"> <a id="js-toggle-debate" class="button big text-center" title="<%= t('.more_info') %>" data-toggle="additional_info">
<strong><%= t('.more_info') %></strong> <strong><%= t('.more_info') %></strong>
</a> </a>
</div> </div>