Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page

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

@@ -39,7 +39,7 @@
       }
     }
   }
-  
+
   #program {
     h3 {
       padding-left: 5px;
@@ -51,7 +51,7 @@
       background-color: #F0FFFF;
     }
   }
-  
+
   #callforpapers {
     .timer-box{
       width: 130px;
@@ -60,7 +60,7 @@
       border:4px solid #989797;
     }
   }
-  
+
   #venue {
     padding-top: 0px;
     padding-bottom: 0px;
@@ -134,7 +134,7 @@
       }
     }
   }
-  
+
   .scroll-top-wrapper {
     position: fixed;
     opacity: 0;
@@ -170,4 +170,19 @@
       color: white;
     }
   }
-}
+}
+
+/* Venue icon styles */
+.icon-container {
+  position: relative;
+  height: 60%;
+  .icon-inner {
+    position:absolute;
+    top:50%;
+    left: 50%;
+    transform:translate(-50%,-50%);
+    .fa-university {
+      font-size: 10em;
+    }
+  }
+}

app/views/conference/_venue.html.haml

@@ -11,7 +11,15 @@
           .thumbnail
             .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"}
               = render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial }
-    
+      - elsif @conference.venue.picture.present?
+        .col-md-5
+          .thumbnail
+            = image_tag @conference.venue.picture.url, alt: @conference.venue.name, class:"img-responsive"
+      - else
+        .col-md-5
+          .thumbnail.icon-container
+            .icon-inner
+              = fa_icon "university"
       .col-md-6
         %h2.text-center
           = "#{@conference.venue.city} / #{@conference.venue.country_name}"