twitter gem and a partial added to embed tweets about a conference and new layout added for conference info screen

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

@@ -0,0 +1,8 @@
+.container
+  .row
+    .col-md-12.text-center
+      %h2 Conference Tweets
+      - @tweets.each do |tweet|
+        %div#tweet
+          = tweet.user.name
+          = tweet.text 

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

@@ -1,9 +1,13 @@
-.text-center
-  %h2 Upcoming Events
-  - @current_events.each do |event|
-    %div
-      %h3
-        = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
-        %h4
-          presented by
-          = event.speaker_names
+.container
+  .row
+    .col-md-12.text-center
+      %h2 Current Events
+      - @current_events.each do |event|
+        %div
+          %h3
+            = event.title
+          %h4
+            presented by
+            = event.speaker_names
+            in
+            = event.room.name

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

@@ -0,0 +1,11 @@
+.container
+  .row
+    .col-md-12.text-center
+      %h2 Sponsors
+      - @conference.sponsorship_levels.each do |sponsorship_level|
+        -if sponsorship_level.sponsors.any?
+          - sponsorship_level.sponsors.each_slice(3) do |slice|
+            .row.row-centered
+              - slice.each do |sponsor|
+                .col-md-4.col-sm-4.col-centered.col-top
+                  = image_tag get_logo(sponsor), class: "img-responsive img-sponsor img-sponsor-#{sponsorship_level.position}"

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

@@ -1,15 +1,21 @@
-.container
-- if @conference.present?
-  .row
-    .col-md-12
-    - if @program.present?
-      %section#program#current-events
-        = render 'current_events'
-  .row
-    .col-md-12.text-center
-      %h2 Tweets About Conference
-  .row
-    .col-md-12
-    - if @sponsors.any?
-      %section#sponsors
-        = render 'conference/sponsors'
+#main-display
+  - if @conference.present?
+    %section#main-heading
+      .container
+        .row
+          .col-md-12.text-center
+            %h1
+              = @conference.title
+            - if @conference.description.present?
+              %h3
+                = @conference.description
+  - if @program.present?
+    %section#event-display
+      = render 'current_events'
+  - if @conference.contact.social_tag.present?
+    %section#tweets-display
+      - if @tweets.present?
+        = render 'conference_tweets'
+  - if @sponsors.any?
+    %section#sponsor-display
+      = render 'sponsors'