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

Merge c1063645da into 17427c88fe

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-06-11 10:34:56 +00:00
commit 78d5bd670d
28 changed files with 333 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/conference/edit.html.haml
View file

@ -16,7 +16,7 @@
= f.input :registration_end_date, :as => :string, :input_html => { :id => "conference-reg-end-datepicker", :readonly => "readonly" }
= f.input :registration_description, hint: 'This description will appear in registration segment of the splash'
= f.input :ticket_description, hint: 'This will appear in the Tickets segment of the splash'
= f.input :lodging_description, hint: 'This will appear in the lodging segement of the splash'
= f.inputs :name => "Media" do
- if !@conference.logo.blank?
= image_tag @conference.logo(:thumb)