Skip to content

Commit

Permalink
closes manno#72: add do not record flag and free text license field t…
Browse files Browse the repository at this point in the history
…o admin/cfp interface and schedule export
  • Loading branch information
manno committed Oct 13, 2013
1 parent 11d5745 commit eec91b3
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions app/views/cfp/events/_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
= f.input :abstract, :input_html => {:rows => 4}, :hint => t("cfp.event_abstract_hint")
= f.input :description, :hint => t("cfp.event_description_hint")
= f.input :submission_note, :hint => "visible for admins and users, contains additional information."
= f.input :do_not_record, :as => :boolean, :hint => "If the conference records talks and there is an opt-out: do you want your talk recorded?"
= f.input :recording_license, hint: "If the conference allows speakers to choose the talks recordings license, which license should apply?"
= dynamic_association :links, t("cfp.links"), f
= dynamic_association :event_attachments, t("cfp.uploaded_files"), f
= f.buttons do
Expand Down
7 changes: 5 additions & 2 deletions app/views/events/_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
= f.inputs :name => "Notes" do
= f.input :note, :input_html => {:rows => 2}, :hint => "visibility: admin only."
= f.input :submission_note, :input_html => {:rows => 2}, :hint => "visibiliy: admin and user; additional information."
= dynamic_association :links, "Links", f
= dynamic_association :event_attachments, "Uploaded files", f
= f.inputs :name => "Additional Resources" do
= f.input :do_not_record, :as => :boolean, :hint => "Will this event be recorded?"
= f.input :recording_license, hint: "Recording license for this talk"
= dynamic_association :links, "Links", f
= dynamic_association :event_attachments, "Uploaded files", f
= f.buttons do
= f.commit_button :button_html => {:class => "primary"}
4 changes: 4 additions & 0 deletions app/views/public/schedule/index.xml.haml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
%duration= format_time_slots(event.time_slots)
%room= room.name
%slug= event.slug
%recording
%license= event.recording_license
%optout= event.do_not_record
%slug= event.slug
%title= event.title
%subtitle= event.subtitle
%track= event.track.try(:name)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class AddVideoPublishingInfoToEvent < ActiveRecord::Migration
def change
add_column :events, :do_not_record, :boolean, default: false
add_column :events, :recording_license, :string
end
end
4 changes: 3 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.

ActiveRecord::Schema.define(:version => 20131013145045) do
ActiveRecord::Schema.define(:version => 20131013164530) do

create_table "availabilities", :force => true do |t|
t.integer "person_id"
Expand Down Expand Up @@ -160,6 +160,8 @@
t.integer "event_feedbacks_count", :default => 0
t.float "average_feedback"
t.string "guid"
t.boolean "do_not_record", :default => false
t.string "recording_license"
end

add_index "events", ["conference_id"], :name => "index_events_on_conference_id"
Expand Down

0 comments on commit eec91b3

Please sign in to comment.