diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 5c4fc391b..489dccffb 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -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 validates :title, presence: true - validates :description, presence: true - validates :target, presence: true - validates :how_to_participate, presence: true validates :start_date, presence: true validates :end_date, presence: true validates :debate_start_date, presence: true diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb index 546f238d1..ce9c6eeee 100644 --- a/app/views/legislation/processes/_header.html.erb +++ b/app/views/legislation/processes/_header.html.erb @@ -10,29 +10,39 @@
-

<%= t('legislation.processes.header_full.description') %>

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

<%= t('legislation.processes.header_full.description') %>

+ <%= markdown process.description %> + <% end %>
-

<%= t('legislation.processes.header_full.target') %>

- <%= markdown process.target %> + <% if process.target.present? %> +

<%= t('legislation.processes.header_full.target') %>

+ <%= markdown process.target %> + <% end %>
-

<%= t('legislation.processes.header_full.how_to_participate') %>

- <%= markdown process.how_to_participate %> + <% if process.how_to_participate.present? %> +

<%= t('legislation.processes.header_full.how_to_participate') %>

+ <%= markdown process.how_to_participate %> + <% end %>
-
-
- <%= markdown process.additional_info if process.additional_info %> + <% if process.additional_info.present? %> +
+
+ <%= markdown process.additional_info if process.additional_info %> +
-
+ <% end %>
-
- - - -
+ <% if process.description.present? || process.target.present? || process.how_to_participate.present? || process.additional_info.present? %> +
+ + + +
+ <% end %>
<%= render 'legislation/processes/header_full', process: @process, hidden: true %> diff --git a/app/views/legislation/processes/_header_full.html.erb b/app/views/legislation/processes/_header_full.html.erb index dfa9bffdd..88e2f2861 100644 --- a/app/views/legislation/processes/_header_full.html.erb +++ b/app/views/legislation/processes/_header_full.html.erb @@ -12,27 +12,37 @@
-

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

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

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

+ <%= markdown process.description %> + <% end %>
-

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

- <%= markdown process.target %> + <% if process.target.present? %> +

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

+ <%= markdown process.target %> + <% end %>
-

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

- <%= markdown process.how_to_participate %> + <% if process.how_to_participate.present? %> +

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

+ <%= markdown process.how_to_participate %> + <% end %>
-
-
- <%= markdown process.additional_info if process.additional_info %> + <% if process.additional_info.present? %> +
+
+ <%= markdown process.additional_info if process.additional_info %> +
-
+ <% end %>
-
- - <%= t('.more_info') %> - -
+ <% if process.additional_info.present? %> +
+ + <%= t('.more_info') %> + +
+ <% end %>