Revert "add is_keynote attribute to event_types"

This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740.

Conflicts:
	app/models/conference.rb
This commit is contained in:
Stella Rouzi 2014-12-08 16:11:38 +02:00
parent c787190571
commit c9615f1880
9 changed files with 11 additions and 25 deletions

View file

@ -13,7 +13,6 @@
= f.input :length, :input_html => {:size => 3}
= f.input :minimum_abstract_length, :input_html => {:size => 3}
= f.input :maximum_abstract_length, :input_html => {:size => 3}
= f.input :is_keynote
= f.input :color, :input_html => { :size => 6, :type => 'color' }
%p.text-right
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

View file

@ -11,7 +11,6 @@
%th Title
%th Length
%th Abstract Length
%th Keynote
%th Color
%th Actions
%tbody
@ -25,7 +24,6 @@
%td
= "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
Words
%td= event_type.is_keynote
%td
%span.label{style: "background-color: #{event_type.color};"}
= event_type.color

View file

@ -1 +1 @@
= render 'proposal/form'
= render 'proposal/form'