From 49b89e90a82cc8e9b3cc8c89d0545782ffad9c2e Mon Sep 17 00:00:00 2001
From: Sarah Ni <snjqi188@gmail.com>
Date: Thu, 30 Jul 2015 11:05:33 +1000
Subject: [PATCH] post-bottom additions and test.hbs

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../discourse/components/google-dfp-ad.js.es6 |   3 +++
 .../templates/components/google-dfp-ad.hbs    |   2 +-
 .../discourse-google-dfp.hbs                  |   0
 .../post-bottom/discourse-google-dfp.hbs      |   3 +++
 .../templates/connectors/post-bottom/test.hbs |   0
 .../discourse-google-dfp.hbs                  |   0
 .../discourse-google-dfp.hbs                  |   0
 ...03562e98e357709eaba07c3a0e9054afdd7697.css |   0
 config/locales/client.en.yml                  |   0
 config/locales/server.en.yml                  |   6 +++++-
 config/settings.yml                           |  12 ++++++++++++
 plugin.rb                                     |   0
 13 files changed, 24 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 assets/javascripts/discourse/components/google-dfp-ad.js.es6
 mode change 100644 => 100755 assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
 mode change 100644 => 100755 assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs
 create mode 100644 assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs
 create mode 100644 assets/javascripts/discourse/templates/connectors/post-bottom/test.hbs
 mode change 100644 => 100755 assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs
 mode change 100644 => 100755 assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs
 mode change 100644 => 100755 auto_generated/plugin_5e03562e98e357709eaba07c3a0e9054afdd7697.css
 mode change 100644 => 100755 config/locales/client.en.yml
 mode change 100644 => 100755 config/locales/server.en.yml
 mode change 100644 => 100755 config/settings.yml
 mode change 100644 => 100755 plugin.rb

diff --git a/.DS_Store b/.DS_Store
index e5209d1eee17ba37c0477e027385990b184f6852..598636897fdbe3e1c37cd8e5f61c47f408098c91 100644
GIT binary patch
delta 352
zcmZoMXfc=|#>B!ku~2NHo+2aL#DLw46_}VA*(UQa>esU|Br+5OVJbrjLvd1haY0f}
zei8!%!>^=*oXp}91B084Ow25-Z0sDIT-+ciAjlOPoRME1T#{H)TI`fq6b<HOrlcl8
z*#U_q88CK8etr&|otPAsnOYt%AmW^#SCW{Sms%8D4>Ad&HzqtYFD1X+DZex?r8ovE
z7@nC@k`XT;8c>v42Gkpnn3o!sS)7@anUh&k$-xPN@dA?7)kda9Mmh?H7Dlx?3f1Q3
z2098R#^$xP0w*{)q%}<)eIpBMyA~~8vUJ(<6-SN%y$1x0j6gyZ#1aM(NZ|Np3&x#H
ko7p+|Ie_7|S&->F^JIPzO97w;kRA}h1fn-bh^%1-0IpGC8UO$Q

delta 78
zcmZoMXfc=|#>B`mu~2NHo+2ab#DLw5tdn_I^fw2xZe!Z4z`@Qkv4MXxI|n}pP}OEZ
bj_=Hq`9&-R7=VD0fq@B1vuutKS;Gtf+M^HB

diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js.es6 b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
old mode 100644
new mode 100755
index 2b7e723..b809806
--- a/assets/javascripts/discourse/components/google-dfp-ad.js.es6
+++ b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
@@ -35,6 +35,9 @@ function loadGoogle(settings) {
       if (settings.dfp_topic_above_suggested_code && !settings.dfp_show_topic_above_suggested) {
         googletag.defineSlot(settings.dfp_topic_above_suggested_code, [parseInt(settings.dfp_size_topic_above_suggested_width_code), parseInt(settings.dfp_size_topic_above_suggested_height_code)], 'div-gpt-ad-topic-above-suggested').addService(googletag.pubads());
       }
+      if (settings.dfp_post_bottom_code && !settings.dfp_show_post_bottom) {
+          googletag.defineSlot(settings.dfp_post_bottom_code, [parseInt(settings.dfp_size_post_bottom_width_code), parseInt(settings.dfp_size_post_bottom_height_code)], 'div-gpt-ad-post-bottom').addService(googletag.pubads());
+      }
       googletag.pubads().enableSingleRequest();
       googletag.enableServices();
     });
diff --git a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs b/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
old mode 100644
new mode 100755
index e03841b..926004c
--- a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
+++ b/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
@@ -1,5 +1,5 @@
 <div class="google-dfp-ad-label"><h2>Google Ad Plugin Display</h2></div>
-  <div id={{divId}} style='width: {{const_width}}px; height: {{const_height}}px' class="dfp-ad-unit" align=center>
+  <div id={{divId}} style='width: {{const_width}}px; height: {{const_height}}px' class="dfp-ad-unit" align=center> 
   	{{#if loadedGoogletag}}
     <script type='text/javascript'>
     googletag.cmd.push(function() { googletag.display('{{divId}}'); });
diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs
old mode 100644
new mode 100755
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs
new file mode 100644
index 0000000..a306c03
--- /dev/null
+++ b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs
@@ -0,0 +1,3 @@
+{{#if siteSettings.dfp_post_bottom_code}}
+  {{google-dfp-ad placement="post-bottom"}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/test.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/test.hbs
new file mode 100644
index 0000000..e69de29
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs
old mode 100644
new mode 100755
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs
old mode 100644
new mode 100755
diff --git a/auto_generated/plugin_5e03562e98e357709eaba07c3a0e9054afdd7697.css b/auto_generated/plugin_5e03562e98e357709eaba07c3a0e9054afdd7697.css
old mode 100644
new mode 100755
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
old mode 100644
new mode 100755
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
old mode 100644
new mode 100755
index 7dbadbc..bc707a3
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -6,9 +6,13 @@ en:
     dfp_topic_above_post_stream_code: "Show leaderboard ad above post stream"
     dfp_show_topic_above_suggested: "Disable topic_above_suggested ad"
     dfp_topic_above_suggested_code: "Show leaderboard ad above suggested topics"
+    dfp_show_post_bottom: "Disable post_bottom ad"
+    dfp_post_bottom_code: "Show leaderboard ad post_bottom topics"
     dfp_size_topic_list_top_width_code: "Put your ad topic list top size width!"
     dfp_size_topic_list_top_height_code: "Put your ad topic above post stream size height!"
     dfp_size_topic_above_post_stream_width_code: "Put your ad topic above post stream size width!"
     dfp_size_topic_above_post_stream_height_code: "Put your ad topic list top size height!"
     dfp_size_topic_above_suggested_width_code: "Put your ad topic above suggested size width!"
-    dfp_size_topic_above_suggested_height_code: "Put your ad topic above suggested size height!"
\ No newline at end of file
+    dfp_size_topic_above_suggested_height_code: "Put your ad topic above suggested size height!"
+    dfp_size_post_bottom_width_code: "Put your ad post bottom size width!"
+    dfp_size_post_bottom_height_code: "Put your ad post bottom size height!"
\ No newline at end of file
diff --git a/config/settings.yml b/config/settings.yml
old mode 100644
new mode 100755
index f31c8ef..d7037fa
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -33,5 +33,17 @@ ad_plugin:
     client: true
     default: ''
   dfp_show_topic_above_suggested:
+    client: true
+    default: false
+  dfp_post_bottom_code:
+    client: true
+    default: ''
+  dfp_size_post_bottom_width_code:
+    client: true
+    default: ''
+  dfp_size_post_bottom_height_code:
+    client: true
+    default: ''
+  dfp_show_post_bottom:
     client: true
     default: false
\ No newline at end of file
diff --git a/plugin.rb b/plugin.rb
old mode 100644
new mode 100755