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

Merge pull request #220 from gopesht/adds_carousel_dashboard

Browse source 
Adds admin component for conference photos
This commit is contained in:
Gopesh Tulsyan 2014-06-19 23:18:25 +05:30
commit 0ec673b582
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/conference.rb
View file

@ -19,8 +19,8 @@ class Conference < ActiveRecord::Base
:lodging_description, :include_registrations_in_splash, :lodging_description, :include_registrations_in_splash,
:include_sponsors_in_splash, :include_tracks_in_splash, :include_sponsors_in_splash, :include_tracks_in_splash,
:include_tickets_in_splash, :include_social_media_in_splash, :include_tickets_in_splash, :include_social_media_in_splash,
:include_program_in_splash, :make_conference_public :include_program_in_splash, :make_conference_public,
:photos_attributes
has_paper_trail has_paper_trail
@ -60,6 +60,7 @@ class Conference < ActiveRecord::Base
accepts_nested_attributes_for :questions, :allow_destroy => true accepts_nested_attributes_for :questions, :allow_destroy => true
accepts_nested_attributes_for :vdays, :allow_destroy => true accepts_nested_attributes_for :vdays, :allow_destroy => true
accepts_nested_attributes_for :vpositions, :allow_destroy => true accepts_nested_attributes_for :vpositions, :allow_destroy => true
accepts_nested_attributes_for :photos, allow_destroy: true
has_attached_file :logo, has_attached_file :logo,
:styles => {:thumb => "100x100>", :large => "300x300>" } :styles => {:thumb => "100x100>", :large => "300x300>" }

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

@ -0,0 +1,10 @@
<div class="nested-fields">
<%= f.inputs do %>
<%= image_tag(f.object.picture(:thumb)) unless f.object.picture.blank? %>
<%= f.input :picture, hint: 'This photo will appear in the gallery of the splash
so please give photos of banner sizes' %>
<%= f.input :description, :input_html => {:rows => 2 }, hint: 'This description will appear
at the bottom of each photo' %>
<%= remove_association_link :photo, f %>
<% end %>
</div>

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

@ -25,6 +25,8 @@
= f.input :sponsor_email, hint: 'This will appear in the sponsor segment of the splash for the sponsors to contact to the organizers' = f.input :sponsor_email, hint: 'This will appear in the sponsor segment of the splash for the sponsors to contact to the organizers'
= f.input :lodging_description, hint: 'This will appear in the lodging segment of the splash' = f.input :lodging_description, hint: 'This will appear in the lodging segment of the splash'
= dynamic_association :photos, "Photos", f
= f.inputs :name => 'Social Media' do = f.inputs :name => 'Social Media' do
- if !@conference.logo.blank? - if !@conference.logo.blank?
= image_tag @conference.logo(:thumb) = image_tag @conference.logo(:thumb)