made bsa load on every page at least once, fixed formatting, removed dead code

mdeiters · mdeiters · commit c024c02da0e7 · 2016-06-08T13:25:10.000-07:00
diff --git a/app/assets/javascripts/bsa.js.coffee b/app/assets/javascripts/bsa.js.coffee
@@ -1,11 +1,10 @@
 jQuery ->
-  if $('.bsarocks').length > 0
-    console.log('Loading BSA')
-    e = document.createElement('script')
-    e.type = 'text/javascript'
-    e.async = !0
-    e.src = document.location.protocol + '//s3.buysellads.com/ac/bsa.js'
-    (document.getElementsByTagName('head')[0] or document.getElementsByTagName('body')[0]).appendChild(e)
+  console.log('Loading BSA')
+  e = document.createElement('script')
+  e.type = 'text/javascript'
+  e.async = !0
+  e.src = document.location.protocol + '//s3.buysellads.com/ac/bsa.js'
+  (document.getElementsByTagName('head')[0] or document.getElementsByTagName('body')[0]).appendChild(e)
 
 
   $(document).on 'page:change', ->
diff --git a/app/views/pages/faq.html.haml b/app/views/pages/faq.html.haml
@@ -1,6 +1,6 @@
 - title "FAQ"
 
-.container
+.container.clearfix
   %h1 FAQ
 
   .clearfix.sm-col.sm-col-6
diff --git a/app/views/protips/index.html.haml b/app/views/protips/index.html.haml
@@ -87,6 +87,4 @@
 
         -if show_ads?
           .clearfix.ml3.mt3
-            #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1
-            -if Rails.env.development?
-              %img{src: 'http://placehold.it/350x200'}
+            #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1            
diff --git a/app/views/protips/show.html.haml b/app/views/protips/show.html.haml
@@ -115,9 +115,7 @@
 
       -if show_ads?
         .clearfix.ml3.mt3
-          #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1
-          -if Rails.env.development?
-            %img{src: 'http://placehold.it/350x200'}
+          #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1          
 
 
 %script{ src: "https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js" }
diff --git a/app/views/streams/show.html.haml b/app/views/streams/show.html.haml
@@ -85,9 +85,6 @@
 
       -if show_ads?
         .clearfix.ml3.mt4
-          -if Rails.env.production?
-            #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1
-          -elsif Rails.env.development?
-            %img{src: 'http://placehold.it/350x200'}
+          #bsap_1305410.bsarocks.bsap_74f50e679004d8f4d62fec4b0f74ccf1          
 
 = render 'chat'
diff --git a/config/routes.rb b/config/routes.rb
@@ -20,7 +20,7 @@
   get    "/signin"     => "clearance/sessions#new",                as: :sign_in
   delete "/signout"    => "clearance/sessions#destroy",            as: :sign_out
   get    "/signup"     => "clearance/users#new",                   as: :sign_up
-  get    'faq'         => 'pages#show',          page: 'faq',      as: :faq
+  get    '/faq'        => 'pages#show',          page: 'faq',      as: :faq
   get    '/tos'        => 'pages#show',          page: 'tos',      as: :tos
   get    '/privacy_policy' => 'pages#show',    page: 'privacy',  as: :privacy
   get    '/404'            => "pages#show",    page: 'not_found'
