gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 00727c190a into fa55224163

Browse source
This commit is contained in:
Ankush Malik 2017-12-25 20:14:54 +00:00 • committed by GitHub
commit 3c68ebf04d
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conferences/_call_for_papers.haml
View file

@ -23,5 +23,5 @@
left! left!
%p.cta-button %p.cta-button
= link_to "Submit your proposal now", = link_to "Submit your proposal now",
conference_program_proposals_path(conference_id), new_conference_program_proposal_path(conference_id),
class: 'btn btn-success btn-lg text-center' class: 'btn btn-success btn-lg text-center'

2
app/views/conferences/_call_for_tracks.haml
View file

@ -15,5 +15,5 @@
left! left!
%p.cta-button %p.cta-button
= link_to("Submit your request for track", = link_to("Submit your request for track",
conference_program_tracks_path(conference_id), new_conference_program_track_path(conference_id),
class: 'btn btn-success btn-lg text-center') class: 'btn btn-success btn-lg text-center')

2
app/views/conferences/show.html.haml
View file

@ -29,7 +29,7 @@
- if @conference.registration_open? - if @conference.registration_open?
= render 'registration', conference: @conference, = render 'registration', conference: @conference,
registration_period: @conference.registration_period, registration_period: @conference.registration_period,
tickets: @tickets, conference_id: @conference_id.short_title tickets: @tickets, conference_id: @conference.short_title
- if @conference.splashpage.include_tickets && @conference.tickets.any? - if @conference.splashpage.include_tickets && @conference.tickets.any?
= render 'tickets', conference: @conference, tickets: @tickets = render 'tickets', conference: @conference, tickets: @tickets

4
db/schema.rb
View file

@ -215,8 +215,8 @@ ActiveRecord::Schema.define(version: 20171130172334) do
t.integer "schedule_id" t.integer "schedule_id"
t.integer "room_id" t.integer "room_id"
t.datetime "start_time" t.datetime "start_time"
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.boolean "enabled", default: true t.boolean "enabled", default: true
t.index ["event_id", "schedule_id"], name: "index_event_schedules_on_event_id_and_schedule_id", unique: true t.index ["event_id", "schedule_id"], name: "index_event_schedules_on_event_id_and_schedule_id", unique: true
t.index ["event_id"], name: "index_event_schedules_on_event_id" t.index ["event_id"], name: "index_event_schedules_on_event_id"