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

Merge pull request #111 from medialab-prado/99-make-process-texts-optional

Browse Source 
Make process texts optional
This commit is contained in:
Fernando Blat
2017-02-09 14:43:59 +01:00
committed by GitHub
parent beea28493b 08ab7474d0
commit a22cb764ad
3 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/legislation/process.rb
View File

@@ -7,9 +7,6 @@ class Legislation::Process < ActiveRecord::Base
has_many :questions, -> { order(:id) }, class_name: 'Legislation::Question', foreign_key: 'legislation_process_id', dependent: :destroy has_many :questions, -> { order(:id) }, class_name: 'Legislation::Question', foreign_key: 'legislation_process_id', dependent: :destroy
validates :title, presence: true validates :title, presence: true
validates :description, presence: true
validates :target, presence: true
validates :how_to_participate, presence: true
validates :start_date, presence: true validates :start_date, presence: true
validates :end_date, presence: true validates :end_date, presence: true
validates :debate_start_date, presence: true validates :debate_start_date, presence: true

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

@@ -10,29 +10,39 @@
<div id="debate-show" class="row description"> <div id="debate-show" class="row description">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('legislation.processes.header_full.description') %></h4> <% if process.description.present? %>
<%= markdown process.description %> <h4><%= t('legislation.processes.header_full.description') %></h4>
<%= markdown process.description %>
<% end %>
</div> </div>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('legislation.processes.header_full.target') %></h4> <% if process.target.present? %>
<%= markdown process.target %> <h4><%= t('legislation.processes.header_full.target') %></h4>
<%= markdown process.target %>
<% end %>
</div> </div>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('legislation.processes.header_full.how_to_participate') %></h4> <% if process.how_to_participate.present? %>
<%= markdown process.how_to_participate %> <h4><%= t('legislation.processes.header_full.how_to_participate') %></h4>
<%= markdown process.how_to_participate %>
<% end %>
</div> </div>
<div class="small-12 column debate-add-info"> <% if process.additional_info.present? %>
<div class="debate-info-wrapper"> <div class="small-12 column debate-add-info">
<%= markdown process.additional_info if process.additional_info %> <div class="debate-info-wrapper">
<%= markdown process.additional_info if process.additional_info %>
</div>
</div> </div>
</div> <% end %>
</div> </div>
<div class="center half-gradient"> <% if process.description.present? || process.target.present? || process.how_to_participate.present? || process.additional_info.present? %>
<a class="button big center button-circle" title="<%= t('.view_process_information') %>" id="js-toggle-small-debate"> <div class="center half-gradient">
<span class="icon-angle-down" aria-hidden="true"></span> <a class="button big center button-circle" title="<%= t('.view_process_information') %>" id="js-toggle-small-debate">
</a> <span class="icon-angle-down" aria-hidden="true"></span>
</div> </a>
</div>
<% end %>
</div> </div>
<%= render 'legislation/processes/header_full', process: @process, hidden: true %> <%= render 'legislation/processes/header_full', process: @process, hidden: true %>

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

@@ -12,27 +12,37 @@
<div class="row description"> <div class="row description">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('.description') %></h4> <% if process.description.present? %>
<%= markdown process.description %> <h4><%= t('.description') %></h4>
<%= markdown process.description %>
<% end %>
</div> </div>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('.target') %></h4> <% if process.target.present? %>
<%= markdown process.target %> <h4><%= t('.target') %></h4>
<%= markdown process.target %>
<% end %>
</div> </div>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4><%= t('.how_to_participate') %></h4> <% if process.how_to_participate.present? %>
<%= markdown process.how_to_participate %> <h4><%= t('.how_to_participate') %></h4>
<%= markdown process.how_to_participate %>
<% end %>
</div> </div>
<div id="debate-show" class="small-12 column debate-add-info"> <% if process.additional_info.present? %>
<div class="debate-info-wrapper"> <div id="debate-show" class="small-12 column debate-add-info">
<%= markdown process.additional_info if process.additional_info %> <div class="debate-info-wrapper">
<%= markdown process.additional_info if process.additional_info %>
</div>
</div> </div>
</div> <% end %>
</div> </div>
<div class="center half-gradient"> <% if process.additional_info.present? %>
<a id="js-toggle-debate" class="button big center strong" title="Más información y contexto"> <div class="center half-gradient">
<%= t('.more_info') %> <a id="js-toggle-debate" class="button big center strong" title="Más información y contexto">
</a> <%= t('.more_info') %>
</div> </a>
</div>
<% end %>
</div> </div>