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

Merge f0788c1e50 into 2180e6197c

Browse source
This commit is contained in:
StavyVen 2017-12-16 14:36:16 +00:00 • committed by GitHub
commit 93fabaffd6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -216,7 +216,7 @@ class User < ApplicationRecord
end end
def proposals(conference) def proposals(conference)
events.where('program_id = ? AND (event_users.event_role=? OR event_users.event_role=?)', conference.program.id, 'submitter', 'speaker') events.where('program_id = ? AND (event_users.event_role = ? OR event_users.event_role = ?)', conference.program.id, 'submitter', 'speaker')
end end
def proposal_count(conference) def proposal_count(conference)

10
app/views/conferences/_lodging.html.haml
View file

@ -13,19 +13,19 @@
%p.lead %p.lead
We recommend these affordable lodging accommodations for your visit. We recommend these affordable lodging accommodations for your visit.
.row.row-centered{ style:"display: flex; flex-wrap: wrap" } .row.row-centered{ style:'display: flex; flex-wrap: wrap' }
- @conference.lodgings.each do |lodging| - @conference.lodgings.each do |lodging|
.col-md-4.col-sm-4.col-centered.col-top{ style:"display:flex;" } .col-md-4.col-sm-4.col-centered.col-top{ style:'display:flex;' }
.thumbnail .thumbnail
- if lodging.picture? - if lodging.picture?
-if lodging.website_link.present? - if lodging.website_link.present?
= link_to(lodging.website_link, class: 'thumbnail') do = link_to(lodging.website_link, class: 'thumbnail') do
= image_tag lodging.picture.large.url, class: 'img-responsive img-lodging' = image_tag lodging.picture.large.url, class: 'img-responsive img-lodging'
- else - else
= image_tag lodging.picture.large.url, class: 'img-responsive img-lodging' = image_tag lodging.picture.large.url, class: 'img-responsive img-lodging'
- else - else
%p.text-center %p.text-center
-if lodging.website_link.present? - if lodging.website_link.present?
= link_to(lodging.website_link, class: 'thumbnail') do = link_to(lodging.website_link, class: 'thumbnail') do
%i.fa.fa-home.fa-5x %i.fa.fa-home.fa-5x
- else - else
@ -33,5 +33,5 @@
.caption .caption
%h3.text-center %h3.text-center
= lodging.name = lodging.name
-if lodging.description.present? - if lodging.description.present?
= markdown(lodging.description) = markdown(lodging.description)