gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'arun1595-venue-splash-page'

Browse source
This commit is contained in:
Henne Vogelsang 2016-06-30 17:31:46 +02:00
commit 8c27a3dbac
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/osem-splash.css.scss
View file

@ -39,7 +39,7 @@
} }
} }
} }
#program { #program {
h3 { h3 {
padding-left: 5px; padding-left: 5px;
@ -51,7 +51,7 @@
background-color: #F0FFFF; background-color: #F0FFFF;
} }
} }
#callforpapers { #callforpapers {
.timer-box{ .timer-box{
width: 130px; width: 130px;
@ -60,10 +60,13 @@
border:4px solid #989797; border:4px solid #989797;
} }
} }
#venue { #venue {
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; padding-bottom: 0px;
#venue-pic {
margin-top: 20px;
}
} }
#lodging { #lodging {
@ -134,7 +137,7 @@
} }
} }
} }
.scroll-top-wrapper { .scroll-top-wrapper {
position: fixed; position: fixed;
opacity: 0; opacity: 0;
@ -170,4 +173,4 @@
color: white; color: white;
} }
} }
} }

3
app/views/admin/venues/_form.html.haml
View file

@ -16,9 +16,6 @@
= f.inputs :name, :website = f.inputs :name, :website
= f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
= f.inputs :street, :postalcode, :city, :country, :latitude, :longitude = 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' } = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
#commercials-content.tab-pane #commercials-content.tab-pane

23
app/views/conference/_venue.html.haml
View file

@ -6,24 +6,25 @@
-else -else
.container .container
.row .row
- if @conference.venue.commercial.present? and @conference.venue.commercial.persisted? .col-md-6
.col-md-5 .thumbnail#venue-pic
.thumbnail - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted?
.flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"} .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"}
= render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial } = 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 .caption
%h3.text-center
= @conference.venue.name
- unless @conference.venue.description.blank? - unless @conference.venue.description.blank?
= markdown(@conference.venue.description) = markdown(@conference.venue.description)
.col-md-6 .col-md-6
%h2
= "#{@conference.venue.city} / #{@conference.venue.country_name}"
%address %address
%h1
= @conference.venue.name
= @conference.venue.street = @conference.venue.street
%br %br
= "#{@conference.venue.postalcode}, #{@conference.venue.city}" = "#{@conference.venue.postalcode}, #{@conference.venue.city}"