From 910b0d0e4cf46be133b1ce5d2a1564eaa4ef5cea Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 17 Nov 2016 11:45:18 -0500 Subject: [PATCH] FIX: showing ads on mobile when mobile ad units are not defined --- .../discourse-adplugin.hbs | 28 +++++++++---- .../post-bottom/discourse-adplugin.hbs | 42 +++++++++++++++---- .../discourse-adplugin.hbs | 28 +++++++++---- .../discourse-adplugin.hbs | 28 +++++++++---- 4 files changed, 93 insertions(+), 33 deletions(-) diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs index 0400350..c89417d 100644 --- a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs +++ b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs @@ -1,9 +1,21 @@ -{{#if siteSettings.adsense_topic_list_top_code}} - {{google-adsense placement="topic-list-top"}} -{{/if}} -{{#if siteSettings.dfp_topic_list_top_code}} - {{google-dfp-ad placement="topic-list-top" refreshOnChange=loading category=category.slug}} -{{/if}} -{{#if siteSettings.amazon_topic_list_top_src_code}} - {{amazon-product-links placement="topic-list-top"}} +{{#if site.mobileView}} + {{#if siteSettings.adsense_mobile_topic_list_top_code}} + {{google-adsense placement="topic-list-top"}} + {{/if}} + {{#if siteSettings.dfp_mobile_topic_list_top_code}} + {{google-dfp-ad placement="topic-list-top" refreshOnChange=loading category=category.slug}} + {{/if}} + {{#if siteSettings.amazon_mobile_topic_list_top_src_code}} + {{amazon-product-links placement="topic-list-top"}} + {{/if}} +{{else}} + {{#if siteSettings.adsense_topic_list_top_code}} + {{google-adsense placement="topic-list-top"}} + {{/if}} + {{#if siteSettings.dfp_topic_list_top_code}} + {{google-dfp-ad placement="topic-list-top" refreshOnChange=loading category=category.slug}} + {{/if}} + {{#if siteSettings.amazon_topic_list_top_src_code}} + {{amazon-product-links placement="topic-list-top"}} + {{/if}} {{/if}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs index b922b5a..4eababf 100644 --- a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs +++ b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs @@ -1,9 +1,33 @@ -{{#if postSpecificCountAdsense}} - {{google-adsense placement="post-bottom" postNumber=post_number}} -{{/if}} -{{#if postSpecificCountDFP}} - {{google-dfp-ad placement="post-bottom" category=topic.category.slug postNumber=post_number}} -{{/if}} -{{#if postSpecificCountAmazon}} - {{amazon-product-links placement="post-bottom" postNumber=post_number}} -{{/if}} +{{#if site.mobileView}} + {{#if postSpecificCountAdsense}} + {{#if siteSettings.adsense_mobile_post_bottom_code}} + {{google-adsense placement="post-bottom" postNumber=post_number}} + {{/if}} + {{/if}} + {{#if postSpecificCountDFP}} + {{#if siteSettings.dfp_mobile_post_bottom_code}} + {{google-dfp-ad placement="post-bottom" category=topic.category.slug postNumber=post_number}} + {{/if}} + {{/if}} + {{#if postSpecificCountAmazon}} + {{#if siteSettings.amazon_mobile_post_bottom_src_code}} + {{amazon-product-links placement="post-bottom" postNumber=post_number}} + {{/if}} + {{/if}} +{{else}} + {{#if postSpecificCountAdsense}} + {{#if siteSettings.adsense_post_bottom_code}} + {{google-adsense placement="post-bottom" postNumber=post_number}} + {{/if}} + {{/if}} + {{#if postSpecificCountDFP}} + {{#if siteSettings.dfp_post_bottom_code}} + {{google-dfp-ad placement="post-bottom" category=topic.category.slug postNumber=post_number}} + {{/if}} + {{/if}} + {{#if postSpecificCountAmazon}} + {{#if siteSettings.amazon_post_bottom_src_code}} + {{amazon-product-links placement="post-bottom" postNumber=post_number}} + {{/if}} + {{/if}} +{{/if}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs index 2928caf..ed36964 100644 --- a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs +++ b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs @@ -1,9 +1,21 @@ -{{#if siteSettings.adsense_topic_above_post_stream_code}} - {{google-adsense placement="topic-above-post-stream"}} -{{/if}} -{{#if siteSettings.dfp_topic_above_post_stream_code}} - {{google-dfp-ad placement="topic-above-post-stream" refreshOnChange=model.id category=model.category.slug}} -{{/if}} -{{#if siteSettings.amazon_topic_above_post_stream_src_code}} - {{amazon-product-links placement="topic-above-post-stream"}} +{{#if site.mobileView}} + {{#if siteSettings.adsense_mobile_topic_above_post_stream_code}} + {{google-adsense placement="topic-above-post-stream"}} + {{/if}} + {{#if siteSettings.dfp_mobile_topic_above_post_stream_code}} + {{google-dfp-ad placement="topic-above-post-stream" refreshOnChange=model.id category=model.category.slug}} + {{/if}} + {{#if siteSettings.amazon_mobile_topic_above_post_stream_src_code}} + {{amazon-product-links placement="topic-above-post-stream"}} + {{/if}} +{{else}} + {{#if siteSettings.adsense_topic_above_post_stream_code}} + {{google-adsense placement="topic-above-post-stream"}} + {{/if}} + {{#if siteSettings.dfp_topic_above_post_stream_code}} + {{google-dfp-ad placement="topic-above-post-stream" refreshOnChange=model.id category=model.category.slug}} + {{/if}} + {{#if siteSettings.amazon_topic_above_post_stream_src_code}} + {{amazon-product-links placement="topic-above-post-stream"}} + {{/if}} {{/if}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs index 8f17b29..8e3f62c 100644 --- a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs +++ b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs @@ -1,9 +1,21 @@ -{{#if siteSettings.adsense_topic_above_suggested_code}} - {{google-adsense placement="topic-above-suggested"}} -{{/if}} -{{#if siteSettings.dfp_topic_above_suggested_code}} - {{google-dfp-ad placement="topic-above-suggested" refreshOnChange=model.id category=model.category.slug}} -{{/if}} -{{#if siteSettings.amazon_topic_above_suggested_src_code}} - {{amazon-product-links placement="topic-above-suggested"}} +{{#if site.mobileView}} + {{#if siteSettings.adsense_mobile_topic_above_suggested_code}} + {{google-adsense placement="topic-above-suggested"}} + {{/if}} + {{#if siteSettings.dfp_mobile_topic_above_suggested_code}} + {{google-dfp-ad placement="topic-above-suggested" refreshOnChange=model.id category=model.category.slug}} + {{/if}} + {{#if siteSettings.amazon_mobile_topic_above_suggested_src_code}} + {{amazon-product-links placement="topic-above-suggested"}} + {{/if}} +{{else}} + {{#if siteSettings.adsense_topic_above_suggested_code}} + {{google-adsense placement="topic-above-suggested"}} + {{/if}} + {{#if siteSettings.dfp_topic_above_suggested_code}} + {{google-dfp-ad placement="topic-above-suggested" refreshOnChange=model.id category=model.category.slug}} + {{/if}} + {{#if siteSettings.amazon_topic_above_suggested_src_code}} + {{amazon-product-links placement="topic-above-suggested"}} + {{/if}} {{/if}} \ No newline at end of file