gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #261 from gopesht/fix_align_bugs

Browse source 
Splash Page bug fixes
This commit is contained in:
Gopesh Tulsyan 2014-06-26 20:37:44 +05:30
commit f7a12c977b
4 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/views/conference/_call_for_papers.html.haml
View file

@ -17,21 +17,23 @@
- if @conference.call_for_papers.end_date.to_time < Time.now
%p Today is the last day. Hurry Up!
- else
%div.row.col-md-6.col-md-offset-4
%div.col-md-2
%h2#days
%p Days
%div.col-md-2
%h2#hours
%p Hours
%div.col-md-2
%h2#minutes
%p Minutes
%div.col-md-2
%h2#seconds
%p Seconds
%p
= link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank'
.row
.col-md-8.col-md-offset-3
%div.col-md-2
%h2#days
%p Days
%div.col-md-2
%h2#hours
%p Hours
%div.col-md-2
%h2#minutes
%p Minutes
%div.col-md-2
%h2#seconds
%p Seconds
.row
%p
= link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank'
-else
%h3 Deadline has ended

27
app/views/conference/_lodging.html.haml
View file

@ -1,18 +1,19 @@
%div.row.col-md-12.text-center
%div.container.text-center
%h2 Lodgings
-unless @conference.lodging_description.blank?
%p.lead
= @conference.lodging_description
%div.row
- @conference.venue.lodgings.each do |r|
%div.col-md-3.thumbnail
-unless r.photo.blank?
= image_tag r.photo(:large), class: 'img-responsive'
-unless r.name.blank?
%h4.text-center #{ r.name }
-unless r.description.blank?
%p.text-left #{ r.description }
- unless r.website_link.blank?
.text-center
= link_to 'Go to Website', r.website_link
%div.row.text-center
- @conference.venue.lodgings.each do |r|
%div{ class: (@conference.venue.lodgings.count.to_i <= 2 ? "col-md-#{12/@conference.venue.lodgings.count.to_i}" : "col-md-4") }
.div.thumbnail
-unless r.photo.blank?
= image_tag r.photo(:large), class: 'img-responsive'
-unless r.name.blank?
%h4.text-center #{ r.name }
-unless r.description.blank?
%p.text-left #{ r.description }
- unless r.website_link.blank?
.text-center
= link_to 'Go to Website', r.website_link

6
app/views/conference/_sponsor.html.haml
View file

@ -12,12 +12,12 @@
- if !@conference.sponsorship_levels.blank?
- @conference.sponsorship_levels.each do |l|
- if !l.sponsors.blank?
%div.row
%div.row.text-center
%h4 #{l.title}
- l.sponsors.each_with_index do |r,index|
%div.col-md-4
%div.text-center{ class: (l.sponsors.count.to_i <= 2 ? "col-md-#{12/l.sponsors.count.to_i}" : "col-md-4") }
- if !r.logo.blank?
= link_to image_tag(r.logo(:large), class: 'img-responsive', alt: "#{r.name} Logo", title: "#{r.description}"), "http://#{r.website_url}"
= link_to image_tag(r.logo(:large), alt: "#{r.name} Logo", title: "#{r.description}"), "http://#{r.website_url}"
- unless index == 0
- if index%2 == 0
%div.clearfix.visible-md.visible-lg

12
app/views/conference/show.html.haml
View file

@ -5,16 +5,18 @@
%section{ id: 'splash-banner' }
%div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-background' unless @conference.banner_photo.blank?) }
%div.container.text-center.banner-text
.row.col-md-12
.row
%h1
= @conference.title
- if @conference.start_date && @conference.end_date
%h3
= conference_date_string(@conference)
.row
%h3
= conference_date_string(@conference)
- unless @conference.description.blank?
.row-fluid.col-md-12.lead
%p= @conference.description
.row-fluid
.col-md-12.lead
%p= @conference.description
- if @conference.include_program_in_splash?
%section{ id: 'program' }