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

code reviewed

Browse Source
This commit is contained in:
dperez
2018-12-13 22:43:36 +01:00
parent bef404c443
commit ff9a32c0a5
4 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/admin/legislation/homepages/_form.html.erb
View File

@@ -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? %>
<div id="error_explanation" data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<strong>
<%= @process.errors.count %>
<%= t("admin.legislation.processes.errors.form.error", count: @process.errors.count) %>
</strong>
</div>
<% end %>
<%= render "shared/errors", resource: @process %>
<div class="small-12 column margin-top">
<%= f.check_box :homepage_enabled, checked: @process.homepage_enabled?, label: t("admin.legislation.processes.form.homepage_enabled") %>
</div>
<div class="ckeditor small-12 column">
<label><%= t("admin.legislation.processes.form.homepage") %></label>
<p class="help-text"><%= t("admin.legislation.processes.form.homepage_description") %></p>
<%= f.cktext_area :homepage,
label: false,
ckeditor: { language: I18n.locale, height: 500, toolbar: 'admin' } %>
</div>
<div class="small-12 column">
<hr>
<%= f.check_box :homepage_enabled, label: t("admin.legislation.processes.form.homepage_enabled") %>
</div>
<%= f.translatable_fields do |translations_form| %>
<div class="small-12 column end">
<%= translations_form.cktext_area :homepage,
ckeditor: { height: 500, toolbar: 'admin' },
hint: t("admin.legislation.processes.form.use_markdown") %>
<div class="ckeditor">
<%= 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") %>
</div>
</div>
<% end %>

2
app/views/legislation/processes/show.html.erb
View File

@@ -8,6 +8,6 @@
<div class="row">
<div class="small-12 medium-9 column">
<%= @process.homepage.html_safe %>
<%= AdminWYSIWYGSanitizer.new.sanitize(@process.homepage) %>
</div>
</div>

1
db/migrate/20181206153510_add_home_page_to_legislation_processes.rb
View File

@@ -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|

1
db/schema.rb
View File

@@ -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