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

Merge 760dd06d31 into 17427c88fe

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-06-11 10:18:52 +00:00
commit 6903a0b7c1
11 changed files with 115 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/admin/conference/_photo_fields.html.erb Normal file
View file

@ -0,0 +1,7 @@
<div class="nested-fields">
<%= f.inputs do %>
<%= f.input :picture %>
<%= f.input :description, :input_html => {:rows => 2 } %>
<%= remove_association_link :photo, f %>
<% end %>
</div>

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

@ -17,6 +17,8 @@
= 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'
= dynamic_association :photos, "Photos", f
= f.inputs :name => "Media" do
- if !@conference.logo.blank?
= image_tag @conference.logo(:thumb)