Merge pull request #97 from mooreniemi/75-TuneAds1

75-TuneAds1 - centralize ad unit code and ensure it is only on conten…
mooreniemi · Feb 23, 2021 · 4f680f1 · 4f680f1
2 parents 85cbcab + 81993b9
commit 4f680f1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/app/assets/stylesheets/styles.css.scss b/app/assets/stylesheets/styles.css.scss
@@ -54,6 +54,10 @@ $medium: 900px;
   width: 100%;
 }
 
+.mockad {
+  outline: 5px dotted green;
+}
+
 p {
   padding: 5px;
 }

diff --git a/app/views/ads/_test1.html.erb b/app/views/ads/_test1.html.erb
@@ -0,0 +1,21 @@
+<% if Rails.env.production? %>
+  <div class="row padded_nicely">
+    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <!-- test1 -->
+    <ins class="adsbygoogle"
+         style="display:block"
+         data-ad-client="ca-pub-3154444439610781"
+         data-ad-slot="3311943876"
+         data-ad-format="auto"
+         data-full-width-responsive="true"></ins>
+    <script>
+      (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
+  </div>
+<% else %>
+  <div class="row padded_nicely mockad">
+    <center>
+      <h1>on production ad unit "test1"</h1>
+    </center>
+  </div>
+<% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -1,18 +1,3 @@
-<% if Rails.env.production? && !user_signed_in? %>
-<div class="row padded_nicely">
-  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<!-- test1 -->
-<ins class="adsbygoogle"
-     style="display:block"
-     data-ad-client="ca-pub-3154444439610781"
-     data-ad-slot="3311943876"
-     data-ad-format="auto"
-     data-full-width-responsive="true"></ins>
-<script>
-     (adsbygoogle = window.adsbygoogle || []).push({});
-</script>
-</div>
-<% end %>
 <div class="footer navbar-fixed-bottom submission_well">
 <% cache(Date.today.year) do %>
   <small> &nbsp;

diff --git a/app/views/pages/newsfeed.html.erb b/app/views/pages/newsfeed.html.erb
@@ -1,3 +1,4 @@
+<%= render partial: 'ads/test1' %>
 <h2><% title 'Newsfeed' %></h2>
 <div class="center">
   <% for e in @rss do %>

diff --git a/app/views/procedures/index.html.erb b/app/views/procedures/index.html.erb
@@ -1,3 +1,4 @@
+<%= render partial: 'ads/test1' %>
 <% title "Procedures" %>
 <div id="procedures" style="background-color:#ffffff">
   <table class="table table-hover table-bordered" bgcolor="#ffffcc">

diff --git a/app/views/surgeons/index.html.erb b/app/views/surgeons/index.html.erb
@@ -1,3 +1,4 @@
+<%= render partial: 'ads/test1' %>
 <% title "Surgeons" %>
 <div id="surgeons" style="background-color:#ffffff">
   <table class="table table-hover table-bordered" bgcolor="#ffffcc">