Merge 59d1e2c723 into 17427c88fe

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

@@ -24,9 +24,12 @@
         = 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
         %p{:class => "help-block media-type", :id => "youtube-help"} Go to your YouTube video, click on "share" and copy everything behind http://youtu.be/"
-        %p{:class => "help-block media-type", :id => "slideshare-help", :style => "display:none"} Go to your SlideShare, click on "share" -> "embed" and copy the id
+        %p{:class => "help-block media-type", :id => "slideshare-help", :style => "display:none"} Go to your SlideShare, click on "share" -> "link" and copy the link
         %p{:class => "help-block media-type", :id => "flickr-help", :style => "display:none"} Go to your flickr image, click on "Grab the link" -> "Show short url" and copy everything behind https://flic.kr/p/
         %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 => "speakerdeck-help", :style => "display:none"} Go to your SpeakerDeck, click on "share" -> "link" and copy the link
         %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.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/conference/_registration.html.haml

@@ -3,7 +3,7 @@
     %a{ href: '#registration' } Registration
 %div.container.text-center
   %div.row
-    %h2 Registration
+    %h1 Registration
   - if !@conference.registration_description.blank?
     %p
       = @conference.registration_description

app/views/conference/_social_media.html.haml

@@ -0,0 +1,36 @@
+= content_for :splash_nav do
+  %li
+    %a{ href: '#social-media' } Social Media
+
+%div.container#social-media.text-center
+  %h1 We are Social
+  %div.row
+    - if !@conference.facebook_url.blank?
+      %div.col-md-3
+        = link_to image_tag('fb-logo-blue.png', class: 'img-responsive'),
+         "#{ @conference.facebook_url }"
+    - if !@conference.twitter_url.blank?
+      %div.col-md-3
+        = link_to image_tag('twitter-logo-blue.png', class: 'img-responsive'), "#{ @conference.twitter_url }"
+    - if !@conference.media_type.blank? && !@conference.media_id.blank?
+      %div.col-md-3
+        -if @conference.media_type == 'YouTube'
+          = link_to image_tag('youtube-color-logo.png', class: 'img-responsive'),
+           "http://youtu.be/#{ @conference.media_id}"
+        -if @conference.media_type == 'SlideShare'
+          = link_to image_tag('slideshare.png', class: 'img-responsive'), "#{ @conference.media_id}"
+        -if @conference.media_type == 'Instagram'
+          = link_to image_tag('instagram.png', class: 'img-responsive'),
+           "http://instagram.com/p/#{ @conference.media_id}"
+        -if @conference.media_type == 'Vimeo'
+          = link_to image_tag('vimeo-logo-dark.png', class: 'img-responsive'),
+           "http://vimeo.com/#{ @conference.media_id}"
+        -if @conference.media_type == 'Speakerdeck'
+          = link_to image_tag('speakerdeck.png', class: 'img-responsive'),"#{ @conference.media_id}"
+        -if @conference.media_type == 'Flickr'
+          = link_to image_tag('flickr.png', class: 'img-responsive'),
+           "https://flic.kr/p/#{ @conference.media_id}"
+    - if !@conference.google_url.blank?
+      %div.col-md-3
+        = link_to image_tag('google-logo.png', class: 'img-responsive'),
+         "#{ @conference.google_url }"

app/views/conference/_tickets.html.haml

@@ -1,5 +1,5 @@
 %div.row
-  %h3 Tickets
+  %h2 Tickets
   -if !@conference.ticket_description.blank?
     %p #{ @conference.ticket_description }
     - @conference.supporter_levels.each do |s|

app/views/conference/show.html.haml

@@ -1,9 +1,13 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
+
 %div#program
   = render 'program'
 %div#registration
   = render 'registration'
 %div#callforpapers
   = render 'call_for_papers'
+%div#social-media
+  = render 'social_media'
+