fix: in-article ads

qiwihui · qiwihui · commit 6ab8ad1ba4ef · 2020-05-24T12:10:59.000+08:00
diff --git a/_config.yml b/_config.yml
@@ -7,7 +7,7 @@ url: "https://pyweekly.qiwihui.com" # change this to the base hostname & protoco
 permalink: /:title
 
 google_analytics: "UA-46660488-11"
-# google_adsense: "ca-pub-8935595858652656"
+google_adsense: "ca-pub-8935595858652656"
 
 # cayman-blog date format
 # refer to http://shopify.github.io/liquid/filters/date/ if you want to customize this
diff --git a/_includes/analytics.html b/_includes/analytics.html
@@ -0,0 +1,9 @@
+{% if site.google_analytics %}
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+<script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', '{{ site.google_analytics }}');
+</script>
+{% endif %}
diff --git a/_includes/auto-ads.html b/_includes/auto-ads.html
@@ -1,4 +1,21 @@
+<!--
 {% if site.google_adsense %}
 <script data-ad-client="{{ site.google_adsense }}" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js">
 </script>
+{% endif %}
+-->
+
+{% if page.layout == 'post' %}
+    {% if site.google_adsense %}
+    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <ins class="adsbygoogle"
+        style="display:block; text-align:center;"
+        data-ad-layout="in-article"
+        data-ad-format="fluid"
+        data-ad-client="{{ site.google_adsense }}"
+        data-ad-slot="2654019047"></ins>
+    <script>
+        (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
+    {% endif %}
 {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -2,16 +2,8 @@
 <html lang="{{ page.lang | default: site.lang | default: "en" }}">
 
 <head>
-    
-    {% if site.google_analytics %}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
-    <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', '{{ site.google_analytics }}');
-    </script>
-    {% endif %}
+
+    {% include analytics.html %}
 
     {% include auto-ads.html %}
     
