Merge branch 'arun1595-venue-splash-page'

app/assets/stylesheets/osem-splash.css.scss

@@ -64,6 +64,9 @@
   #venue {
     padding-top: 0px;
     padding-bottom: 0px;
+    #venue-pic {
+      margin-top: 20px;
+    }
   }
 
   #lodging {

app/views/admin/venues/_form.html.haml

@@ -16,9 +16,6 @@
           = f.inputs :name, :website
           = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
           = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude
-          - if @venue.picture?
-            = image_tag @venue.picture.thumb.url
-          = f.input :picture
           = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
 
     #commercials-content.tab-pane

app/views/conference/_venue.html.haml

@@ -6,24 +6,25 @@
 -else
   .container
     .row
+      .col-md-6
+        .thumbnail#venue-pic
           - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted?
-        .col-md-5
-          .thumbnail
             .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"}
               = render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial }
-    
+          - elsif @conference.venue.picture?
-      .col-md-6
+            = image_tag @conference.venue.picture.url, alt: @conference.venue.name, class:"img-responsive"
-        %h2.text-center
+          - else
-          = "#{@conference.venue.city} / #{@conference.venue.country_name}"
+            %p.text-center
-      .col-md-6
+              %span.fa.fa-university.fa-5x
-        .thumbnail
           .caption
+            %h3.text-center
+              = @conference.venue.name
             - unless @conference.venue.description.blank?
               = markdown(@conference.venue.description)
       .col-md-6
+        %h2
+          = "#{@conference.venue.city} / #{@conference.venue.country_name}"
         %address
-          %h1
-            = @conference.venue.name
           = @conference.venue.street
           %br
           = "#{@conference.venue.postalcode}, #{@conference.venue.city}"