added description field to cfps

closes #1650

done some changes

minor changes

added markdown format to cfp#show

fixed description text  position in proposals

fixed truncated description text in show action

minor changes on non-admin side

app/controllers/admin/cfps_controller.rb

@@ -55,7 +55,7 @@ module Admin
     private
 
     def cfp_params
-      params.require(:cfp).permit(:start_date, :end_date, :cfp_type)
+      params.require(:cfp).permit(:start_date, :end_date, :description, :cfp_type)
     end
   end
 end

app/views/admin/cfps/_booths_cfp.html.haml

@@ -11,6 +11,10 @@
 %dd
   = @cfp.end_date.strftime('%A, %B %e. %Y')
 %dt
-  Days Left:
+  Description
+%dd
+  = markdown(@cfp.description)
+%dt
+  Days Left
 %dd
   = pluralize(@cfp.remaining_days, 'day')

app/views/admin/cfps/_events_cfp.html.haml

@@ -10,6 +10,10 @@
   End Date:
 %dd#end_date
   = @cfp.end_date.strftime('%A, %B %-d. %Y')
+%dt
+  Description:
+%dd#description
+  = markdown(@cfp.description)
 %dt
   Days Left:
 %dd

app/views/admin/cfps/_form.html.haml

@@ -8,5 +8,6 @@
       = f.input :start_date, as: :string, input_html: { id: 'registration-period-start-datepicker', start_date: @conference.start_date, end_date: @conference.end_date, readonly: 'readonly' }
       = f.input :end_date, as: :string, input_html: { id: 'registration-period-end-datepicker', readonly: 'readonly' }
       = f.input :cfp_type, as: :select, collection: (@cfp.new_record? ? @program.remaining_cfp_types : [@cfp.cfp_type] + @program.remaining_cfp_types).map {|type| ["#{type.capitalize}", type]}, include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
+      = f.input :description, input_html: {rows: 2, data: { provide: 'markdown-editable' } }, hint: markdown_hint
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

app/views/admin/cfps/_tracks_cfp.html.haml

@@ -10,6 +10,10 @@
   End Date:
 %dd#end_date
   = @cfp.end_date.strftime('%A, %B %-d. %Y')
+%dt
+  Description:
+%dd#description
+  = markdown(@cfp.description)
 %dt
   Days Left:
 %dd

app/views/admin/cfps/index.html.haml

@@ -12,6 +12,7 @@
           %th Type
           %th Start Date
           %th End Date
+          %th Description
           %th Days Left
           %th Actions
         %tbody
@@ -24,6 +25,9 @@
                 = cfp.start_date.strftime('%A, %B %-d. %Y')
               %td
                 = cfp.end_date.strftime('%A, %B %-d. %Y')
+              %td
+                %p
+                  = markdown(truncate(cfp.description))
               %td
                 = pluralize(cfp.remaining_days, 'day')
               %td

app/views/proposals/index.html.haml

@@ -6,6 +6,14 @@
         %span.notranslate
           = @conference.title
 
+
+  - if @program.cfp_open?
+    - if @program.cfp.description.present?
+      .row
+        .col-md-12
+          = markdown(@program.cfp.description)
+
+
   .row
     .col-md-12
       = render partial: 'encouragement_text'

app/views/proposals/new.html.haml

@@ -3,6 +3,11 @@
     .col-md-12
       .page-header
         %h1 New Proposal
+  - if @program.cfp_open?
+    - if @program.cfp.description.present?
+      .row
+        .col-md-12
+          = markdown(@program.cfp.description)
   .row
     .col-md-12
       = render partial: 'encouragement_text'

db/migrate/20170905110034_add_description_to_cfps.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCfps < ActiveRecord::Migration
+  def change
+    add_column :cfps, :description, :text
+  end
+end

db/schema.rb

@@ -68,12 +68,13 @@ ActiveRecord::Schema.define(version: 20170924190528) do
   end
 
   create_table "cfps", force: :cascade do |t|
-    t.date     "start_date", null: false
+    t.date     "start_date",  null: false
-    t.date     "end_date",   null: false
+    t.date     "end_date",    null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "program_id"
     t.string   "cfp_type"
+    t.text     "description"
   end
 
   create_table "comments", force: :cascade do |t|

spec/factories/cfps.rb

@@ -5,7 +5,7 @@ FactoryGirl.define do
     start_date { 1.day.ago }
     end_date { 2.days.from_now }
     cfp_type 'events'
-
+    description 'This is a test description'
     program
   end
 end