diff --git a/app/views/admin/legislation/homepages/_form.html.erb b/app/views/admin/legislation/homepages/_form.html.erb index 133d30f69..e6b7cf2f4 100644 --- a/app/views/admin/legislation/homepages/_form.html.erb +++ b/app/views/admin/legislation/homepages/_form.html.erb @@ -1,43 +1,24 @@ -<%= render "admin/shared/globalize_locales", resource: @process %> +<%= render "admin/shared/globalize_tabs", + resource: @process, + display_style: lambda { |locale| enable_translation_style(@process, locale) } %> <%= translatable_form_for [:admin, @process], url: url, html: {data: {watch_changes: true}} do |f| %> - <% if @process.errors.any? %> - -
- - - - <%= @process.errors.count %> - <%= t("admin.legislation.processes.errors.form.error", count: @process.errors.count) %> - -
- - <% end %> + <%= render "shared/errors", resource: @process %>
- <%= f.check_box :homepage_enabled, checked: @process.homepage_enabled?, label: t("admin.legislation.processes.form.homepage_enabled") %> -
- -
- -

<%= t("admin.legislation.processes.form.homepage_description") %>

- <%= f.cktext_area :homepage, - label: false, - ckeditor: { language: I18n.locale, height: 500, toolbar: 'admin' } %> -
- -
-
+ <%= f.check_box :homepage_enabled, label: t("admin.legislation.processes.form.homepage_enabled") %>
<%= f.translatable_fields do |translations_form| %>
- <%= translations_form.cktext_area :homepage, - ckeditor: { height: 500, toolbar: 'admin' }, - hint: t("admin.legislation.processes.form.use_markdown") %> +
+ <%= translations_form.cktext_area :homepage, + language: I18n.locale, + label: t("admin.legislation.processes.form.homepage"), + ckeditor: { height: 500, toolbar: 'admin' }, + hint: t("admin.legislation.processes.form.homepage_description") %> +
<% end %> diff --git a/app/views/legislation/processes/show.html.erb b/app/views/legislation/processes/show.html.erb index 0c5efc8a4..fa4c54e97 100644 --- a/app/views/legislation/processes/show.html.erb +++ b/app/views/legislation/processes/show.html.erb @@ -8,6 +8,6 @@
- <%= @process.homepage.html_safe %> + <%= AdminWYSIWYGSanitizer.new.sanitize(@process.homepage) %>
diff --git a/db/migrate/20181206153510_add_home_page_to_legislation_processes.rb b/db/migrate/20181206153510_add_home_page_to_legislation_processes.rb index 47d95df93..f0b513f6d 100644 --- a/db/migrate/20181206153510_add_home_page_to_legislation_processes.rb +++ b/db/migrate/20181206153510_add_home_page_to_legislation_processes.rb @@ -1,6 +1,5 @@ class AddHomePageToLegislationProcesses < ActiveRecord::Migration def change - add_column :legislation_processes, :homepage, :text add_column :legislation_processes, :homepage_enabled, :boolean, default: false reversible do |dir| diff --git a/db/schema.rb b/db/schema.rb index ca61e096b..e3241fd8d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -665,7 +665,6 @@ ActiveRecord::Schema.define(version: 20181206153510) do t.date "draft_start_date" t.date "draft_end_date" t.boolean "draft_phase_enabled", default: false - t.text "homepage" t.boolean "homepage_enabled", default: false end