diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index a1c29c0c..cb3b567c 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -9,12 +9,12 @@ } section:nth-child(even) { - background: none repeat scroll 0 0 #e0e0e0; - color: #555; + background: none repeat scroll 0 0 #eee; + color: #333; } section:nth-child(odd) { background: none repeat scroll 0 0 #ffffff; - color: #7b7b7b; + color: #333; .thumbnail { background: none repeat scroll 0 0 #e0e0e0; } @@ -32,11 +32,16 @@ padding-top: 100px; padding-bottom: 100px; .container { - #header { + #header-no-image { background-color: rgba(224, 224, 224,.80); padding-top: 20px; padding-bottom: 20px; } + + #header-image { + color: #FFF; + // text-shadow: 1px 1px 3px #ddd; + } } } @@ -93,6 +98,14 @@ } } + #tickets { + a { + &:hover, &:focus { + text-decoration: none; + } + } + } + #sponsors { .img-sponsor { max-height: 100px; diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss index 55632cec..65598add 100644 --- a/app/assets/stylesheets/osem.scss +++ b/app/assets/stylesheets/osem.scss @@ -14,7 +14,7 @@ body { } #content { - padding-bottom: 45px; + padding-bottom: 60px; } #footer { diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 035ab366..21c5045f 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -54,7 +54,7 @@ class ConferencesController < ApplicationController @tickets = @conference.tickets.order('price_cents') end if splashpage.include_lodgings - @lodgings = @conference.lodgings.order('name') + @lodgings = @conference.lodgings.order('id') end if splashpage.include_sponsors @sponsorship_levels = @conference.sponsorship_levels.eager_load( diff --git a/app/views/conferences/_header.haml b/app/views/conferences/_header.haml index cb45bb5e..71c63490 100644 --- a/app/views/conferences/_header.haml +++ b/app/views/conferences/_header.haml @@ -2,7 +2,7 @@ #banner{ style: ("background-image: url(#{conference.picture_url})" if conference.picture_url) } .container .row - .col-md-6.col-md-offset-3#header + .col-md-6.col-md-offset-3{id: (conference.picture? ? "header-image" : "header-no-image")} .row -# - if conference.picture? -# .col-md-4 diff --git a/app/views/conferences/_lodging.haml b/app/views/conferences/_lodging.haml index 7306b962..cac56ec4 100644 --- a/app/views/conferences/_lodging.haml +++ b/app/views/conferences/_lodging.haml @@ -16,12 +16,12 @@ We recommend the following accommodations for your visit. .row.row-centered - - lodgings.order(created_at: :asc).each do |lodging| + - lodgings.each do |lodging| .col-md-6.col-sm-4.col-centered.col-top .thumbnail - if lodging.picture? - if lodging.website_link.present? - = link_to(lodging.website_link, class: 'thumbnail') do + = link_to(lodging.website_link) do = image_tag lodging.picture.large.url, class: 'img-responsive img-lodging' - else @@ -30,7 +30,7 @@ - else %p.text-center - if lodging.website_link.present? - = link_to(lodging.website_link, class: 'thumbnail') do + = link_to(lodging.website_link) do %i.fa.fa-home.fa-5x - else %i.fa.fa-home.fa-5x diff --git a/app/views/conferences/_tickets.haml b/app/views/conferences/_tickets.haml index 5f0da517..2b364afc 100644 --- a/app/views/conferences/_tickets.haml +++ b/app/views/conferences/_tickets.haml @@ -7,9 +7,11 @@ .container .row .col-md-12.text-center - %h2 - Support - = conference.title + %h2 Sign Up for Campus Housing + %br + -# %h2 + -# Support + -# = conference.title .row.row-centered - tickets.each do |ticket| .col-md-3.col-sm-3.col-centered.col-top diff --git a/app/views/physical_tickets/index.html.haml b/app/views/physical_tickets/index.html.haml index 2ded8115..e8adbc80 100644 --- a/app/views/physical_tickets/index.html.haml +++ b/app/views/physical_tickets/index.html.haml @@ -16,6 +16,7 @@ %th ID %th Type %th User + %th Registration? %th Actions %tbody - @physical_tickets.each do |physical_ticket| @@ -23,6 +24,7 @@ %td= physical_ticket.id %td= physical_ticket.ticket.title %td= physical_ticket.user.name + %td= physical_ticket.ticket.registration_ticket? ? 'Yes' : 'No' %td .btn-group = link_to 'Show', diff --git a/app/views/tickets/_ticket.html.haml b/app/views/tickets/_ticket.html.haml index 501e4151..052bc9e9 100644 --- a/app/views/tickets/_ticket.html.haml +++ b/app/views/tickets/_ticket.html.haml @@ -3,9 +3,9 @@ .media .media-body %h4.media-heading= ticket.title - %h5.media-heading= markdown(ticket.description) - - if @conference.tickets.for_registration.any? - %td.col-sm-1.col-md-2.text-center + .media-heading= markdown(ticket.description) + %td.col-sm-1.col-md-2 + %span.text-center = ticket.registration_ticket? ? 'Yes' : 'No' %td.col-sm-1.col-md-1 :ruby diff --git a/app/views/tickets/index.html.haml b/app/views/tickets/index.html.haml index e157d75e..a7e4a03c 100644 --- a/app/views/tickets/index.html.haml +++ b/app/views/tickets/index.html.haml @@ -13,8 +13,7 @@ %thead %tr %th Ticket - - if @conference.tickets.for_registration.any? - %th Registration Ticket + %th Registration? %th Quantity %th Price %th Total @@ -23,8 +22,7 @@ = render 'ticket', f: f, ticket: ticket %tr %td - - if @conference.tickets.for_registration.any? - %td + %td %td %td.col-sm-1.col-md-1.text-center %h4