Skip to content

Commit eec91b3

Browse files
committed
closes manno#72: add do not record flag and free text license field to admin/cfp interface and schedule export
1 parent 11d5745 commit eec91b3

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

app/views/cfp/events/_form.html.haml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
= f.input :abstract, :input_html => {:rows => 4}, :hint => t("cfp.event_abstract_hint")
1212
= f.input :description, :hint => t("cfp.event_description_hint")
1313
= f.input :submission_note, :hint => "visible for admins and users, contains additional information."
14+
= 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?"
15+
= f.input :recording_license, hint: "If the conference allows speakers to choose the talks recordings license, which license should apply?"
1416
= dynamic_association :links, t("cfp.links"), f
1517
= dynamic_association :event_attachments, t("cfp.uploaded_files"), f
1618
= f.buttons do

app/views/events/_form.html.haml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
= f.inputs :name => "Notes" do
2323
= f.input :note, :input_html => {:rows => 2}, :hint => "visibility: admin only."
2424
= f.input :submission_note, :input_html => {:rows => 2}, :hint => "visibiliy: admin and user; additional information."
25-
= dynamic_association :links, "Links", f
26-
= dynamic_association :event_attachments, "Uploaded files", f
25+
= f.inputs :name => "Additional Resources" do
26+
= f.input :do_not_record, :as => :boolean, :hint => "Will this event be recorded?"
27+
= f.input :recording_license, hint: "Recording license for this talk"
28+
= dynamic_association :links, "Links", f
29+
= dynamic_association :event_attachments, "Uploaded files", f
2730
= f.buttons do
2831
= f.commit_button :button_html => {:class => "primary"}

app/views/public/schedule/index.xml.haml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
%duration= format_time_slots(event.time_slots)
2121
%room= room.name
2222
%slug= event.slug
23+
%recording
24+
%license= event.recording_license
25+
%optout= event.do_not_record
26+
%slug= event.slug
2327
%title= event.title
2428
%subtitle= event.subtitle
2529
%track= event.track.try(:name)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
class AddVideoPublishingInfoToEvent < ActiveRecord::Migration
2+
def change
3+
add_column :events, :do_not_record, :boolean, default: false
4+
add_column :events, :recording_license, :string
5+
end
6+
end

db/schema.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# It's strongly recommended to check this file into your version control system.
1313

14-
ActiveRecord::Schema.define(:version => 20131013145045) do
14+
ActiveRecord::Schema.define(:version => 20131013164530) do
1515

1616
create_table "availabilities", :force => true do |t|
1717
t.integer "person_id"
@@ -160,6 +160,8 @@
160160
t.integer "event_feedbacks_count", :default => 0
161161
t.float "average_feedback"
162162
t.string "guid"
163+
t.boolean "do_not_record", :default => false
164+
t.string "recording_license"
163165
end
164166

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

0 commit comments

Comments
 (0)