diff --git a/app/controllers/management/conferences_controller.rb b/app/controllers/management/conferences_controller.rb index f9ae547..9dc5a8c 100644 --- a/app/controllers/management/conferences_controller.rb +++ b/app/controllers/management/conferences_controller.rb @@ -56,7 +56,7 @@ module Management event_types_attributes: [:id, :name, :description, :maximum_length, :minimum_length, :_destroy], tracks_attributes: [:id, :name, :color, :css_class, :description, - :css_style, :_destroy], + :css_style, :foreground_color, :_destroy], halls_attributes: [:id, :name, :_destroy], volunteer_teams_attributes: [:id, :name, :description, :color, :_destroy] ) diff --git a/app/views/management/conferences/_form_tracks.html.slim b/app/views/management/conferences/_form_tracks.html.slim index 8929aea..ce0e34d 100644 --- a/app/views/management/conferences/_form_tracks.html.slim +++ b/app/views/management/conferences/_form_tracks.html.slim @@ -10,6 +10,7 @@ div#tracks .panel-body = ff.input :name = ff.input :color, as: :color + = ff.input :foreground_color, as: :color = ff.input :css_class = ff.input :css_style = ff.input :description diff --git a/db/migrate/20151018105933_add_foreground_color_to_tracks.rb b/db/migrate/20151018105933_add_foreground_color_to_tracks.rb new file mode 100644 index 0000000..241cfbe --- /dev/null +++ b/db/migrate/20151018105933_add_foreground_color_to_tracks.rb @@ -0,0 +1,5 @@ +class AddForegroundColorToTracks < ActiveRecord::Migration + def change + add_column :tracks, :foreground_color, :string + end +end