Add logo for booths

This commit is contained in:
nasia 2017-06-27 17:23:37 +03:00
parent 5734c90d1e
commit 3e97200a29
5 changed files with 7 additions and 5 deletions

View file

@ -84,7 +84,7 @@ module Admin
end end
def booth_params def booth_params
params.require(:booth).permit(:title, :description, :reasoning, :state, :logo_link, :conference_id) params.require(:booth).permit(:title, :description, :reasoning, :state, :picture, :conference_id)
end end
end end
end end

View file

@ -6,7 +6,6 @@ module Admin
def show def show
end end
def new def new
@call_for_booths = CallForBooth.new(conference: @conference) @call_for_booths = CallForBooth.new(conference: @conference)
end end

View file

@ -23,6 +23,8 @@ class Booth < ActiveRecord::Base
presence: true presence: true
mount_uploader :picture, PictureUploader, mount_on: :logo_link
state_machine initial: :submitted do state_machine initial: :submitted do
state :submitted state :submitted
state :withdrawn state :withdrawn

View file

@ -9,8 +9,9 @@
= f.input :description, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true = f.input :description, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true
= f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true = f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true
= responsibles_selector_input f = responsibles_selector_input f
= f.input :logo_link, as: :string, required: true = image_tag f.object.picture.thumb.url if f.object.picture?
= f.input :picture
%p.text-right %p.text-right
- if @booth.new_record? - if @booth.new_record?
= f.submit 'Create Booth Request', class: 'btn btn-success' = f.submit 'Create Booth Request', class: 'btn btn-success'

View file

@ -1,7 +1,7 @@
.row .row
.col-md-12 .col-md-12
%h3 %h3
= image_tag(@booth.gravatar_url(size: '48')) = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
= @booth.title = @booth.title
.btn-group.pull-right .btn-group.pull-right
= link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary' = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'