Fixed conferences page

app/assets/stylesheets/_application.scss

@@ -3863,6 +3863,7 @@ body.policy .policy-agreement ul {
 .list-view {
     ul {
         list-style: none;
+        padding: 0;
 
         &.break {
             border-top: 0.25em solid $light-gray;
@@ -4714,11 +4715,19 @@ html[data-ontop] {
 
         li {
             display: table-row;
+
+            &.not-public {
+                background-color: lighten($yellow, 33%);
+            }
         }
 
         .info, .img {
             display: table-cell;
         }
+
+        .info {
+            padding-left: 1em;
+        }
     }
 
     .workshop-list {

app/assets/stylesheets/_settings.scss

@@ -20,6 +20,12 @@ $mid-gray: #888;
 // $red: #B24C63;
 $red: #FF5A5F;
 
+$blue: $colour-1;
+$pink: $colour-2;
+$yellow: $colour-3;
+$orange: $colour-4;
+$green: $colour-5;
+
 $link-colour: darken($colour-1, 13%);
 
 @mixin default-box-shadow($direction: top, $distance: 1, $inset: false, $additional-shadow: false) {

app/views/conferences/list.html.haml

@@ -21,11 +21,12 @@
         %h3=_"articles.conferences.headings.types.#{type.to_s}", :t
         %ul
           - list.each do | conference |
-            %li.conference{id: "conference-#{conference.id}", data: {a: conference.city.latitude, o: conference.city.longitude, y: conference.year, t: conference.conferencetype}}
+            %li.conference{id: "conference-#{conference.id}", data: {a: conference.city.latitude, o: conference.city.longitude, y: conference.year, t: conference.conferencetype}, class: conference.is_public ? nil : 'not-public'}
               .info
                 %h4.title= conference.title
                 .conference-details
                   .location=location(conference.city)
+                  - if conference.start_date.present? && conference.end_date.present?
                     .date= date_span(conference.start_date.to_date, conference.end_date.to_date)
                 .actions
                   = link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: ['button', 'conference-link', 'small']

config/routes.rb

@@ -67,7 +67,7 @@ BikeBike::Application.routes.draw do
   get   '/humans.txt' => 'application#humans', as: :humans_txt
 
   # Error pages
-  post  '/js_error' => 'application#js_error'
+  match '/js_error' => 'application#js_error', via: [:get, :post]
   get   '/error_403' => 'application#do_403' unless Rails.env.production?
   get   '/error_404' => 'application#error_404' unless Rails.env.production?
   get   '/error_500' => 'application#error_500' unless Rails.env.production?