Merge pull request #555 from plural/no-more-ads

Remove ads.
NetrunnerDB · Sep 28, 2021 · c65ab52 · c65ab52
2 parents 63847fd + ba25e96
commit c65ab52
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 23 deletions.
diff --git a/app/Resources/views/Activity/activity.html.twig b/app/Resources/views/Activity/activity.html.twig
@@ -36,7 +36,6 @@ $(function () { NRDB.user.data.unchecked_activity = 0; });
         {% endif %}
     </div>
     <div class="col-md-4">
-      {% include '/Default/google_adaptable_ad.html.twig' %}
     </div>
   </div>
 </div> <!-- .container -->

diff --git a/app/Resources/views/Decklist/decklist.html.twig b/app/Resources/views/Decklist/decklist.html.twig
@@ -275,9 +275,6 @@ NRDB.user.params.decklist_id = Decklist.id;
 
 </div><!-- /#tools -->
 </div>
-
-{% include '/Default/google_adaptable_ad.html.twig' %}
-
 </div>
 <!-- Left-side Column -->
 

diff --git a/app/Resources/views/Decklist/decklists.html.twig b/app/Resources/views/Decklist/decklists.html.twig
@@ -23,8 +23,6 @@
 {% set linkurl = path('decklists_searchform') %}<li class="{% if url == linkurl %}active{% endif %}"><a href="{{ linkurl }}"><span class="glyphicon glyphicon-search"></span> Search</a></li>
 </ul>
 
-{% include '/Default/google_adaptable_ad.html.twig' %}
-
 </div>
 
 <div class="col-md-9">
@@ -84,4 +82,4 @@
 </div>
 </div>
 
-{% endblock %}
+{% endblock %}
diff --git a/app/Resources/views/Default/donators.html.twig b/app/Resources/views/Default/donators.html.twig
@@ -7,7 +7,7 @@
         <div class="col-md-12">
             <h1>The Gracious Donators</h1>
             <p class="lead">NetrunnerDB wouldn't be the same without them. Many, many thanks.</p>
-            <p>To show our appreciation, the content of the site is free of ads for Donators.</p>
+            <p>This website is ad-free due to the generous donations of our generous Patreon supporters. Thank you all! We are working on new supporter perks as of October 2021, so please stay tuned!</p>
             <p>To become a Donator and help run the site, you can use <a href="https://paypal.me/niseiproject">Paypal</a> or join the Project NISEI <a href="https://www.patreon.com/NISEI">Patreon</a>.</p>
             <ul>
                 {% for donator in donators %}

diff --git a/app/Resources/views/Default/google_adaptable_ad.html.twig b/app/Resources/views/Default/google_adaptable_ad.html.twig
diff --git a/app/Resources/views/Default/index.html.twig b/app/Resources/views/Default/index.html.twig
@@ -36,7 +36,6 @@ var Identity = null,
     </div>
     <div class="col-md-4">
       {% include '/Default/recent_decklists.html.twig' %}
-      {% include '/Default/google_adaptable_ad.html.twig' %}
     </div>
   </div>
 </div> <!-- .container -->

diff --git a/app/Resources/views/Search/advanced-search.html.twig b/app/Resources/views/Search/advanced-search.html.twig
@@ -301,8 +301,6 @@
                 </fieldset>
             </form>
 
-            {% include '/Default/google_adaptable_ad.html.twig' %}
-
         </div>
 
     </div>

diff --git a/app/Resources/views/Search/display-full.html.twig b/app/Resources/views/Search/display-full.html.twig
@@ -62,7 +62,6 @@
         </div>
     </div>
     <div class="col-md-3">
-        {% include '/Default/google_adaptable_ad.html.twig' %}
     </div>
 </div>
 

diff --git a/app/Resources/views/layout.html.twig b/app/Resources/views/layout.html.twig
@@ -246,9 +246,6 @@
 
       </div>
     </footer>
-    {% if app.environment == 'prod' %}
-    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    {% endif %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lazysizes/5.2.0/lazysizes.min.js" async></script>
   </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -275,9 +275,6 @@ NRDB.user.params.decklist_id = Decklist.id; @@
     </div><!-- /#tools -->
     </div>
-    {% include '/Default/google_adaptable_ad.html.twig' %}
     </div>
     <!-- Left-side Column -->
@@ Expand Down @@