From 8a35bb377efd1bc3f7f7902a4f0f82ad9ea1197d Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Thu, 19 Dec 2019 02:36:42 -0800
Subject: [PATCH] Minor HTML cleanup

---
 .../conferences/_conference_details.html.haml |  2 +-
 app/views/conferences/_footer.haml            | 26 +++++++++----------
 app/views/conferences/show.html.haml          |  2 +-
 app/views/layouts/application.html.haml       |  4 +--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/views/conferences/_conference_details.html.haml b/app/views/conferences/_conference_details.html.haml
index 08b73023..02e54c29 100644
--- a/app/views/conferences/_conference_details.html.haml
+++ b/app/views/conferences/_conference_details.html.haml
@@ -6,7 +6,7 @@
           = image_tag(conference.picture_url, class: 'img-responsive') if conference.picture?
         .col-md-6
           %h3
-            = conference.title
+            = conference.title.html_safe
             %small
               %b
               = date_string(conference.start_date, conference.end_date)
diff --git a/app/views/conferences/_footer.haml b/app/views/conferences/_footer.haml
index 5b24fd92..6b66478a 100644
--- a/app/views/conferences/_footer.haml
+++ b/app/views/conferences/_footer.haml
@@ -1,14 +1,14 @@
-.scroll-top-wrapper
-  = link_to "#banner", class: "smoothscroll" do
-    %i.fa.fa-2x.fa-arrow-circle-up
+-# .scroll-top-wrapper
+-#   = link_to "#banner", class: "smoothscroll" do
+-#     %i.fa.fa-2x.fa-arrow-circle-up
 
-:javascript
-  $(function(){
-    $(document).on( 'scroll', function(){
-      if ($(window).scrollTop() > 100) {
-          $('.scroll-top-wrapper').addClass('show');
-      } else {
-          $('.scroll-top-wrapper').removeClass('show');
-      }
-    });
-  });
+-# :javascript
+-#   $(function(){
+-#     $(document).on( 'scroll', function(){
+-#       if ($(window).scrollTop() > 100) {
+-#           $('.scroll-top-wrapper').addClass('show');
+-#       } else {
+-#           $('.scroll-top-wrapper').removeClass('show');
+-#       }
+-#     });
+-#   });
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index d8d53f40..c478a8a2 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -63,7 +63,7 @@
     - if @conference.contact.has_social_media?
       = render 'social_media', contact: @conference.contact
   = render 'footer'
-)
+
 
 -# - content_for :script_head do
 -#   :javascript
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d333a54d..86eafac9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
   %head
     %meta{charset: 'utf-8'}
     %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
-    %title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
+    %title= content_for?(:title) ? strip_tags( yield(:title) ) : (ENV['OSEM_NAME'] || 'OSEM')
     %meta{content: 'Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley.', name: 'description'}
     %meta{content: 'Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock', name: 'author'}
     = stylesheet_link_tag "application", media: 'all'
@@ -26,7 +26,7 @@
     -# Admin area
     - if controller.class.name.split("::").first=="Admin"
       = render 'layouts/admin'
-    -else
+    - else
       #messages
         .container
           = render 'layouts/messages'