Add image to legislation processes and banner colors
This commit is contained in:
@@ -1,5 +1,13 @@
|
|||||||
App.LegislationAdmin =
|
App.LegislationAdmin =
|
||||||
|
|
||||||
|
update_background_color: (selector, text_selector, background_color) ->
|
||||||
|
$(selector).css('background-color', background_color);
|
||||||
|
$(text_selector).val(background_color);
|
||||||
|
|
||||||
|
update_font_color: (selector, text_selector, font_color) ->
|
||||||
|
$(selector).css('color', font_color);
|
||||||
|
$(text_selector).val(font_color);
|
||||||
|
|
||||||
initialize: ->
|
initialize: ->
|
||||||
$("input[type='checkbox'][data-disable-date]").on
|
$("input[type='checkbox'][data-disable-date]").on
|
||||||
change: ->
|
change: ->
|
||||||
@@ -14,3 +22,23 @@ App.LegislationAdmin =
|
|||||||
|
|
||||||
$("#nested_question_options").on "cocoon:after-insert", ->
|
$("#nested_question_options").on "cocoon:after-insert", ->
|
||||||
App.Globalize.refresh_visible_translations()
|
App.Globalize.refresh_visible_translations()
|
||||||
|
|
||||||
|
#banner colors for proccess header
|
||||||
|
|
||||||
|
$("#legislation_process_background_color_picker").on
|
||||||
|
change: ->
|
||||||
|
App.LegislationAdmin.update_background_color("#js-legislation_process-background", "#legislation_process_background_color", $(this).val());
|
||||||
|
|
||||||
|
$("#legislation_process_background_color").on
|
||||||
|
change: ->
|
||||||
|
App.LegislationAdmin.update_background_color("#js-legislation_process-background", "#legislation_process_background_color_picker", $(this).val());
|
||||||
|
|
||||||
|
$("#legislation_process_font_color_picker").on
|
||||||
|
change: ->
|
||||||
|
App.LegislationAdmin.update_font_color("#js-legislation_process-title", "#legislation_process_font_color", $(this).val());
|
||||||
|
App.LegislationAdmin.update_font_color("#js-legislation_process-description", "#legislation_process_font_color", $(this).val());
|
||||||
|
|
||||||
|
$("#legislation_process_font_color").on
|
||||||
|
change: ->
|
||||||
|
App.LegislationAdmin.update_font_color("#js-legislation_process-title", "#legislation_process_font_color_picker", $(this).val());
|
||||||
|
App.LegislationAdmin.update_font_color("#js-legislation_process-description", "#legislation_process_font_color_picker", $(this).val());
|
||||||
|
|||||||
@@ -30,6 +30,22 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.jumboAlt {
|
||||||
|
background: $highlight;
|
||||||
|
margin-bottom: $line-height;
|
||||||
|
margin-top: rem-calc(-24);
|
||||||
|
padding-bottom: $line-height;
|
||||||
|
padding-top: $line-height;
|
||||||
|
|
||||||
|
@include breakpoint(medium) {
|
||||||
|
padding: rem-calc(24) 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.light {
|
||||||
|
background: #ecf0f1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.lead {
|
.lead {
|
||||||
font-size: rem-calc(24);
|
font-size: rem-calc(24);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,8 +66,11 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
|
|||||||
:result_publication_enabled,
|
:result_publication_enabled,
|
||||||
:published,
|
:published,
|
||||||
:custom_list,
|
:custom_list,
|
||||||
|
:background_color,
|
||||||
|
:font_color,
|
||||||
translation_params(::Legislation::Process),
|
translation_params(::Legislation::Process),
|
||||||
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy],
|
||||||
|
image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ class Legislation::Process < ActiveRecord::Base
|
|||||||
include ActsAsParanoidAliases
|
include ActsAsParanoidAliases
|
||||||
include Taggable
|
include Taggable
|
||||||
include Milestoneable
|
include Milestoneable
|
||||||
|
include Imageable
|
||||||
include Documentable
|
include Documentable
|
||||||
documentable max_documents_allowed: 3,
|
documentable max_documents_allowed: 3,
|
||||||
max_file_size: 3.megabytes,
|
max_file_size: 3.megabytes,
|
||||||
|
|||||||
@@ -201,6 +201,35 @@
|
|||||||
<hr>
|
<hr>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="images small-12 column">
|
||||||
|
<%= render 'images/nested_image', imageable: @process, f: f %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 column">
|
||||||
|
<hr>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 column">
|
||||||
|
<h4>Process banner color</h4>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="small-3 column">
|
||||||
|
<%= f.label :sections, "Background color" %>
|
||||||
|
<%= color_field(:process, :background_color, id: 'legislation_process_background_color_picker') %>
|
||||||
|
<%= f.text_field :background_color, label: false %>
|
||||||
|
</div>
|
||||||
|
<div class="small-3 column end">
|
||||||
|
<%= f.label :sections, "Font color" %>
|
||||||
|
<%= color_field(:process, :font_color, id: 'legislation_process_font_color_picker') %>
|
||||||
|
<%= f.text_field :font_color, label: false %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 column">
|
||||||
|
<hr>
|
||||||
|
</div>
|
||||||
|
|
||||||
<%= f.translatable_fields do |translations_form| %>
|
<%= f.translatable_fields do |translations_form| %>
|
||||||
<div class="small-12 medium-9 column">
|
<div class="small-12 medium-9 column">
|
||||||
<%= translations_form.text_field :title,
|
<%= translations_form.text_field :title,
|
||||||
|
|||||||
@@ -1,7 +1,19 @@
|
|||||||
<div class="legislation-hero jumbo">
|
<div <% if process.background_color.present? && process.font_color.present? %>
|
||||||
|
class="legislation-hero jumboAlt" style="background:<%= process.background_color %>; color:<%= process.font_color %>;"
|
||||||
|
<% else %>
|
||||||
|
class="legislation-hero jumbo"
|
||||||
|
<% end %>>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="small-12 medium-9 column">
|
<div class="small-12 medium-9 column">
|
||||||
<%= back_link_to legislation_processes_path %>
|
|
||||||
|
<% if process.background_color.present? && process.font_color.present? %>
|
||||||
|
<%= link_to content_tag(:span, nil, class: "icon-angle-left",
|
||||||
|
style: "color:#{process.font_color};") + t("shared.back"),
|
||||||
|
legislation_processes_path, class: 'back', style: 'color:#FFFFFF !important;'%>
|
||||||
|
<% else %>
|
||||||
|
<%= back_link_to legislation_processes_path %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<h2><%= @process.title %></h2>
|
<h2><%= @process.title %></h2>
|
||||||
|
|
||||||
<% if header == :small %>
|
<% if header == :small %>
|
||||||
@@ -35,6 +47,11 @@
|
|||||||
description: @process.title
|
description: @process.title
|
||||||
} %>
|
} %>
|
||||||
|
|
||||||
|
<% if @process.image.present? %>
|
||||||
|
<hr>
|
||||||
|
<%= image_tag(@process.image_url(:large), alt: @process.title, id:'image') %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% if process.draft_publication.enabled? %>
|
<% if process.draft_publication.enabled? %>
|
||||||
<div class="sidebar-divider"></div>
|
<div class="sidebar-divider"></div>
|
||||||
<p class="sidebar-title">
|
<p class="sidebar-title">
|
||||||
|
|||||||
@@ -10,7 +10,10 @@
|
|||||||
<%= markdown @process.additional_info if @process.additional_info %>
|
<%= markdown @process.additional_info if @process.additional_info %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a class="button" data-toggle="additional_info">
|
<a class="button" data-toggle="additional_info"
|
||||||
|
<% if process.background_color.present? && process.font_color.present? %>
|
||||||
|
style="background:<%= process.font_color %>; color:<%= process.background_color %>;"
|
||||||
|
<% end %>>
|
||||||
<%= t("legislation.processes.header.additional_info") %>
|
<%= t("legislation.processes.header.additional_info") %>
|
||||||
</a>
|
</a>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
class AddHeaderColorSettingsToLegislationProcesses < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :legislation_processes, :background_color, :text
|
||||||
|
add_column :legislation_processes, :font_color, :text
|
||||||
|
end
|
||||||
|
end
|
||||||
140
db/schema.rb
140
db/schema.rb
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20181206153510) do
|
ActiveRecord::Schema.define(version: 20181220163447) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@@ -504,6 +504,46 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
add_index "geozones_polls", ["geozone_id"], name: "index_geozones_polls_on_geozone_id", using: :btree
|
add_index "geozones_polls", ["geozone_id"], name: "index_geozones_polls_on_geozone_id", using: :btree
|
||||||
add_index "geozones_polls", ["poll_id"], name: "index_geozones_polls_on_poll_id", using: :btree
|
add_index "geozones_polls", ["poll_id"], name: "index_geozones_polls_on_poll_id", using: :btree
|
||||||
|
|
||||||
|
create_table "house_images", force: :cascade do |t|
|
||||||
|
t.integer "house_id"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "house_news", force: :cascade do |t|
|
||||||
|
t.string "title"
|
||||||
|
t.string "photo"
|
||||||
|
t.string "link"
|
||||||
|
t.string "house_id"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "houses", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.string "address"
|
||||||
|
t.string "schedule"
|
||||||
|
t.string "phone"
|
||||||
|
t.string "email"
|
||||||
|
t.string "photo"
|
||||||
|
t.boolean "disability_access"
|
||||||
|
t.integer "zonal_administration_id"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "houses_administrators", force: :cascade do |t|
|
||||||
|
t.integer "user_id"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "houses_age_ranges", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "i18n_content_translations", force: :cascade do |t|
|
create_table "i18n_content_translations", force: :cascade do |t|
|
||||||
t.integer "i18n_content_id", null: false
|
t.integer "i18n_content_id", null: false
|
||||||
t.string "locale", null: false
|
t.string "locale", null: false
|
||||||
@@ -666,6 +706,8 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
t.date "draft_end_date"
|
t.date "draft_end_date"
|
||||||
t.boolean "draft_phase_enabled", default: false
|
t.boolean "draft_phase_enabled", default: false
|
||||||
t.boolean "homepage_enabled", default: false
|
t.boolean "homepage_enabled", default: false
|
||||||
|
t.text "background_color"
|
||||||
|
t.text "font_color"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree
|
add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree
|
||||||
@@ -792,6 +834,7 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
t.integer "zoom"
|
t.integer "zoom"
|
||||||
t.integer "proposal_id"
|
t.integer "proposal_id"
|
||||||
t.integer "investment_id"
|
t.integer "investment_id"
|
||||||
|
t.integer "house_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "map_locations", ["investment_id"], name: "index_map_locations_on_investment_id", using: :btree
|
add_index "map_locations", ["investment_id"], name: "index_map_locations_on_investment_id", using: :btree
|
||||||
@@ -838,6 +881,13 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
|
|
||||||
add_index "moderators", ["user_id"], name: "index_moderators_on_user_id", using: :btree
|
add_index "moderators", ["user_id"], name: "index_moderators_on_user_id", using: :btree
|
||||||
|
|
||||||
|
create_table "neighborhoods", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.integer "id_parish"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "newsletters", force: :cascade do |t|
|
create_table "newsletters", force: :cascade do |t|
|
||||||
t.string "subject"
|
t.string "subject"
|
||||||
t.string "segment_recipient", null: false
|
t.string "segment_recipient", null: false
|
||||||
@@ -870,6 +920,12 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
|
|
||||||
add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
|
add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
|
||||||
|
|
||||||
|
create_table "parishes", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "poll_answers", force: :cascade do |t|
|
create_table "poll_answers", force: :cascade do |t|
|
||||||
t.integer "question_id"
|
t.integer "question_id"
|
||||||
t.integer "author_id"
|
t.integer "author_id"
|
||||||
@@ -1379,6 +1435,11 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
t.integer "failed_email_digests_count", default: 0
|
t.integer "failed_email_digests_count", default: 0
|
||||||
t.text "former_users_data_log", default: ""
|
t.text "former_users_data_log", default: ""
|
||||||
t.boolean "public_interests", default: false
|
t.boolean "public_interests", default: false
|
||||||
|
t.string "userlastname"
|
||||||
|
t.integer "user_parish"
|
||||||
|
t.integer "user_neighborhood"
|
||||||
|
t.string "ethnic_group"
|
||||||
|
t.string "studies_level"
|
||||||
t.boolean "recommended_debates", default: true
|
t.boolean "recommended_debates", default: true
|
||||||
t.boolean "recommended_proposals", default: true
|
t.boolean "recommended_proposals", default: true
|
||||||
end
|
end
|
||||||
@@ -1457,6 +1518,39 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
add_index "visits", ["started_at"], name: "index_visits_on_started_at", using: :btree
|
add_index "visits", ["started_at"], name: "index_visits_on_started_at", using: :btree
|
||||||
add_index "visits", ["user_id"], name: "index_visits_on_user_id", using: :btree
|
add_index "visits", ["user_id"], name: "index_visits_on_user_id", using: :btree
|
||||||
|
|
||||||
|
create_table "volunt_categories", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "volunt_programs", force: :cascade do |t|
|
||||||
|
t.string "title"
|
||||||
|
t.text "photo"
|
||||||
|
t.string "schedule"
|
||||||
|
t.integer "quota"
|
||||||
|
t.string "short_description"
|
||||||
|
t.text "long_description"
|
||||||
|
t.integer "volunt_category_id"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
t.string "phone"
|
||||||
|
t.string "email"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "volunt_users", force: :cascade do |t|
|
||||||
|
t.integer "id_user"
|
||||||
|
t.integer "volunt_program_id"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "volunteerings_administrators", force: :cascade do |t|
|
||||||
|
t.integer "user_id"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
end
|
||||||
|
|
||||||
create_table "votes", force: :cascade do |t|
|
create_table "votes", force: :cascade do |t|
|
||||||
t.integer "votable_id"
|
t.integer "votable_id"
|
||||||
t.string "votable_type"
|
t.string "votable_type"
|
||||||
@@ -1500,11 +1594,14 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
t.string "link_text"
|
t.string "link_text"
|
||||||
t.string "link_url"
|
t.string "link_url"
|
||||||
t.string "label"
|
t.string "label"
|
||||||
t.boolean "header", default: false
|
t.boolean "header", default: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
|
t.integer "site_customization_page_id", default: 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
add_index "widget_cards", ["site_customization_page_id"], name: "index_widget_cards_on_site_customization_page_id", using: :btree
|
||||||
|
|
||||||
create_table "widget_feeds", force: :cascade do |t|
|
create_table "widget_feeds", force: :cascade do |t|
|
||||||
t.string "kind"
|
t.string "kind"
|
||||||
t.integer "limit", default: 3
|
t.integer "limit", default: 3
|
||||||
@@ -1512,6 +1609,41 @@ ActiveRecord::Schema.define(version: 20181206153510) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "workshop_images", force: :cascade do |t|
|
||||||
|
t.integer "workshop_id"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "workshop_users", force: :cascade do |t|
|
||||||
|
t.integer "id_user"
|
||||||
|
t.integer "workshop_id"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
t.integer "status"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "workshops", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.string "teacher"
|
||||||
|
t.string "schedule"
|
||||||
|
t.integer "quota"
|
||||||
|
t.string "short_description"
|
||||||
|
t.text "long_description"
|
||||||
|
t.string "photo"
|
||||||
|
t.integer "house_id"
|
||||||
|
t.integer "id_age_range"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
t.string "status"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "zonal_administrations", force: :cascade do |t|
|
||||||
|
t.string "name"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.datetime "updated_at"
|
||||||
|
end
|
||||||
|
|
||||||
add_foreign_key "administrators", "users"
|
add_foreign_key "administrators", "users"
|
||||||
add_foreign_key "annotations", "legacy_legislations"
|
add_foreign_key "annotations", "legacy_legislations"
|
||||||
add_foreign_key "annotations", "users"
|
add_foreign_key "annotations", "users"
|
||||||
|
|||||||
Reference in New Issue
Block a user