diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 268ef35c1..06adf6370 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -38,7 +38,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :summary, :description, :target, - :how_to_participate, :additional_info, :start_date, :end_date, diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index 75c47aa39..ff0132e53 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -203,19 +203,6 @@ -
-
- <%= f.label :how_to_participate %> - <%= t('admin.legislation.processes.form.use_markdown') %> -
-
- <%= f.text_area :how_to_participate, - label: false, - rows: 5, - placeholder: t('admin.legislation.processes.form.how_to_participate_placeholder') %> -
-
-
<%= f.label :additional_info %> diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb index 14fe5e565..18dd34d88 100644 --- a/app/views/legislation/processes/_header.html.erb +++ b/app/views/legislation/processes/_header.html.erb @@ -19,12 +19,6 @@ <%= markdown process.target %> <% end %>
-
- <% if process.how_to_participate.present? %> -

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

- <%= markdown process.how_to_participate %> - <% end %> -
<% if process.additional_info.present? %>
@@ -34,7 +28,7 @@ <% end %>
- <% if process.description.present? || process.target.present? || process.how_to_participate.present? || process.additional_info.present? %> + <% if process.description.present? || process.target.present? || process.additional_info.present? %> -
- <% if process.how_to_participate.present? %> -

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

- <%= markdown process.how_to_participate %> - <% end %> -
<% if process.additional_info.present? %>
diff --git a/app/views/sandbox/admin_legislation_info.html.erb b/app/views/sandbox/admin_legislation_info.html.erb index eca094564..82db31ed8 100644 --- a/app/views/sandbox/admin_legislation_info.html.erb +++ b/app/views/sandbox/admin_legislation_info.html.erb @@ -36,8 +36,8 @@
- - + +
@@ -53,7 +53,7 @@
- +
@@ -69,7 +69,7 @@
- +
@@ -109,17 +109,6 @@
-
-
- -
-
- -
-
-
@@ -151,7 +140,7 @@
- +
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index f2ea427f8..f764e053d 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -168,7 +168,6 @@ en: title: Process Title description: Description target: Target - how_to_participate: How to participate additional_info: Additional info start_date: Start date end_date: End date diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index 1fe3319bc..fe310b973 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -163,7 +163,6 @@ es: title: Título del proceso description: En qué consiste target: A quién afecta - how_to_participate: Cómo participar additional_info: Información adicional start_date: Fecha de inicio del proceso end_date: Fecha de fin del proceso diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 3385d3178..9e3a23118 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -222,7 +222,6 @@ en: summary_placeholder: Short summary of the description description_placeholder: Add a description of the process target_placeholder: Describe who is the target of the process - how_to_participate_placeholder: Describe how to participate additional_info_placeholder: Add an additional information you consider useful index: create: New process diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 3aefaa20c..ad48015a4 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -222,7 +222,6 @@ es: summary_placeholder: Resumen corto de la descripción description_placeholder: Añade una descripción del proceso target_placeholder: Describe a quién va dirigido - how_to_participate_placeholder: Describe cómo participar additional_info_placeholder: Añade cualquier información adicional que pueda ser de interés index: create: Nuevo proceso diff --git a/config/locales/legislation.en.yml b/config/locales/legislation.en.yml index 72f319448..10146d80c 100644 --- a/config/locales/legislation.en.yml +++ b/config/locales/legislation.en.yml @@ -56,7 +56,6 @@ en: title: Participate description: Description target: Target - how_to_participate: How to participate more_info: More information and context index: filters: diff --git a/config/locales/legislation.es.yml b/config/locales/legislation.es.yml index e4c1c0f34..063dd5169 100644 --- a/config/locales/legislation.es.yml +++ b/config/locales/legislation.es.yml @@ -56,7 +56,6 @@ es: title: Colabora en la elaboración de la normativa sobre description: En qué consiste target: A quién va dirigido - how_to_participate: Cómo puedes participar more_info: Más información y contexto index: filters: diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index a787edbde..ccae0b74b 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -636,7 +636,6 @@ print "Creating legislation processes" description: Faker::Lorem.paragraphs.join("\n\n"), summary: Faker::Lorem.paragraph, target: Faker::Lorem.paragraphs.join("\n\n"), - how_to_participate: Faker::Lorem.paragraphs.join("\n\n"), additional_info: Faker::Lorem.paragraphs.join("\n\n"), start_date: Date.current - 3.days, end_date: Date.current + 3.days, diff --git a/spec/factories.rb b/spec/factories.rb index ed89ec154..26e3a1abf 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -605,7 +605,6 @@ FactoryGirl.define do description "Description of the process" summary "Summary of the process" target "Who will affected by this law?" - how_to_participate "You can participate by answering some questions" start_date Date.current - 5.days end_date Date.current + 5.days debate_start_date Date.current - 5.days diff --git a/spec/features/admin/legislation/processes_spec.rb b/spec/features/admin/legislation/processes_spec.rb index f34e93d3d..9973ba357 100644 --- a/spec/features/admin/legislation/processes_spec.rb +++ b/spec/features/admin/legislation/processes_spec.rb @@ -42,7 +42,6 @@ feature 'Admin legislation processes' do fill_in 'legislation_process_summary', with: 'Summary of the process' fill_in 'legislation_process_description', with: 'Describing the process' fill_in 'legislation_process_target', with: 'This thing affects people' - fill_in 'legislation_process_how_to_participate', with: 'You can partipate in this thing by doing...' base_date = Date.current fill_in 'legislation_process[start_date]', with: base_date.strftime("%d/%m/%Y")