Move Conference contact details to Contact

app/views/admin/conference/edit.html.haml

@@ -6,8 +6,6 @@
       = f.input :include_program_in_splash, hint: 'On setting this true you will enable the program component to be displayed on the splash page.This component includes tracks, keynote speakers and the schedule'
       = f.input :title, :hint => "The full name of the conference, such as 'OpenSUSE Conference 2013'"
       = f.input :short_title, :hint => "A short title, such as 'osc2013', to be used in URLs"
-      = f.input :social_tag, :hint => "The hashtag you'll use on Twitter and Google+.  Don't include the '#' sign!'"
-      = f.input :contact_email, :hint => "Contact email address for your conference. Will be used as reply-to address in emails sent out by the system."
       = f.input :color, :hint => "The color will be used eg for the dashboard.", :input_html => {:size => 6, :type => "color"}
       = f.inputs name: 'Banner for Splash' do
         = f.input :include_banner_in_splash, hint: 'This enable the Banner Photo with description to be displayed on the splash'
@@ -33,7 +31,6 @@
       = f.inputs :name => 'Social Media' do
         - if !@conference.logo.blank?
           = image_tag @conference.logo(:thumb)
-        = f.input :include_social_media_in_splash, hint: 'On setting this true you will enable the social media links to be displayed on the splash page'
         = f.input :logo, :label => "Conference Logo", :hint => "This will be displayed on the front page."
         = f.input :media_type, :as => :select, :label => "Conference Promo Media Type", :class=>"form-control", :collection => Conference.media_types.values, :include_blank => false, :hint => "This media-item will be used to represent this conference at various places in OSEM."
         = f.input :media_id, :label => "Conference Promo Media ID", :as => :string
@@ -43,8 +40,4 @@
         %p{:class => "help-block media-type", :id => "vimeo-help", :style => "display:none"} Go to your vimeo video, click on "share" and copy everything behind http://vimeo.com/
         %p{:class => "help-block media-type", :id => "speakerdeck-help", :style => "display:none"} Go to your SpeakerDeck, click on "share" -> "embed" and copy the data-id
         %p{:class => "help-block media-type", :id => "instagram-help", :style => "display:none"} Go to your Instagram photo page and copy everything behind instagram.com/p/ (without trailing /# hash symbol)
-        = f.input :facebook_url, hint: 'This will appear in the social media section as link to the Facebook page of your Conference'
-        = f.input :google_url, label: 'Google+ Url', hint: 'This will appear in the social media section as the link to the Google+ Page of your Conference'
-        = f.input :twitter_url, hint: 'This will appear in the social media section as the link to   the Twitter Page of your Conference'
-        = f.input :instagram_url, hint: 'This will appear in the social media section as the link to   the Instagram Page of your Conference'
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/conference/new.html.haml

@@ -6,9 +6,6 @@
                           input_html: { required: 'required' }
         = f.input :short_title, hint: "A short and unique handle for your conference, using only lower-case letters, numbers and underscores. This will be used to identify your conference in URLs etc. Example: 'froscon2011'",
                                 input_html: { required: 'required' }
-        = f.input :social_tag, hint: "The hashtag you'll use on Twitter and Google+.  Don't include the '#' sign!'",
-                                input_html: { required: 'required' }
-        = f.input :contact_email, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.'
       = f.inputs 'Scheduling' do
         = f.input :timezone, as: :time_zone, hint: 'Please select in what time zone your conference will take place.'
         = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' }

app/views/conference/_social_media.html.haml

@@ -4,19 +4,19 @@
 
 %div.container#social-media.text-center
   %div.row
-    - unless @conference.facebook_url.blank?
+    - unless @conference.contact.facebook.blank?
       %div.col-md-3
-        = link_to "#{ @conference.facebook_url }" do
+        = link_to "#{ @conference.contact.facebook }" do
           %i.fa.fa-facebook-square.fa-4x
-    - unless @conference.twitter_url.blank?
+    - unless @conference.contact.twitter.blank?
       %div.col-md-3
-        = link_to "#{ @conference.twitter_url }" do
+        = link_to "#{ @conference.contact.twitter }" do
           %i.fa.fa-twitter.fa-4x
-    - unless @conference.instagram_url.blank?
+    - unless @conference.contact.instagram.blank?
       %div.col-md-3
-        = link_to "#{ @conference.instagram_url }" do
+        = link_to "#{ @conference.contact.instagram }" do
           %i.fa.fa-instagram.fa-4x
-    - unless @conference.google_url.blank?
+    - unless @conference.contact.googleplus.blank?
       %div.col-md-3
-        = link_to "#{ @conference.google_url }" do
+        = link_to "#{ @conference.contact.googleplus }" do
           %i.fa.fa-google-plus-square.fa-4x

app/views/conference/show.html.haml

@@ -52,7 +52,7 @@
       .pad
         = render 'sponsor'
 
-  - if @conference.include_social_media_in_splash?
+  - if @conference.contact.public?
     %section{ id: 'social-media' }
       .pad
         = render 'social_media'