From 350371f79d07600cc1efe2d83cee50f0c0cf83c3 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Tue, 7 Jan 2020 23:58:25 -0800 Subject: [PATCH 1/5] Tweak CSS, fix loding order --- app/assets/stylesheets/osem-splash.scss | 14 +++++++++++--- app/assets/stylesheets/osem.scss | 2 +- app/controllers/conferences_controller.rb | 2 +- app/views/conferences/_lodging.haml | 2 +- app/views/conferences/_tickets.haml | 7 ++++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index a1c29c0c..40b4b5c1 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; } @@ -93,6 +93,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/_lodging.haml b/app/views/conferences/_lodging.haml index 7306b962..4253b2e1 100644 --- a/app/views/conferences/_lodging.haml +++ b/app/views/conferences/_lodging.haml @@ -16,7 +16,7 @@ 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? diff --git a/app/views/conferences/_tickets.haml b/app/views/conferences/_tickets.haml index 5f0da517..d1900f1e 100644 --- a/app/views/conferences/_tickets.haml +++ b/app/views/conferences/_tickets.haml @@ -7,9 +7,10 @@ .container .row .col-md-12.text-center - %h2 - Support - = conference.title + %h3 Sign Up for Campus Housing + -# %h2 + -# Support + -# = conference.title .row.row-centered - tickets.each do |ticket| .col-md-3.col-sm-3.col-centered.col-top From 0b512b13858f1a061a4498afc4dc37bb49c4af3f Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 8 Jan 2020 00:07:25 -0800 Subject: [PATCH 2/5] Show reg status for tickets. --- app/views/physical_tickets/index.html.haml | 2 ++ app/views/tickets/_ticket.html.haml | 6 +++--- app/views/tickets/index.html.haml | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 From e9b1086f13927f9b9593198ce12ed6e3bbc006c2 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 8 Jan 2020 01:20:18 -0800 Subject: [PATCH 3/5] Tidy up the look of lodging panels --- app/views/conferences/_lodging.haml | 4 ++-- app/views/conferences/_tickets.haml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/conferences/_lodging.haml b/app/views/conferences/_lodging.haml index 4253b2e1..cac56ec4 100644 --- a/app/views/conferences/_lodging.haml +++ b/app/views/conferences/_lodging.haml @@ -21,7 +21,7 @@ .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 d1900f1e..2b364afc 100644 --- a/app/views/conferences/_tickets.haml +++ b/app/views/conferences/_tickets.haml @@ -7,7 +7,8 @@ .container .row .col-md-12.text-center - %h3 Sign Up for Campus Housing + %h2 Sign Up for Campus Housing + %br -# %h2 -# Support -# = conference.title From 843bd60026b1c8dc9add85d894ddbf3fb7c6a570 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 8 Jan 2020 01:47:27 -0800 Subject: [PATCH 4/5] Text with drop shadow for now --- app/assets/stylesheets/osem-splash.scss | 7 ++++++- app/views/conferences/_header.haml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index 40b4b5c1..56df6f51 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -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; + } } } 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 From debefc307afa8004e0edac284c48a5bf3fc1d063 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 8 Jan 2020 02:01:43 -0800 Subject: [PATCH 5/5] No dropshadow --- app/assets/stylesheets/osem-splash.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index 56df6f51..cb3b567c 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -40,7 +40,7 @@ #header-image { color: #FFF; - text-shadow: 1px 1px 3px #ddd; + // text-shadow: 1px 1px 3px #ddd; } } }