Discource-C
/
discourse-adplugin
mirror of https://github.com/discourse/discourse-adplugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored trust levels

This commit is contained in:
Sarah Ni 2015-09-02 13:50:47 +10:00
parent 14bd843ac1
commit dbb7d1a784
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/javascripts/discourse/components/google-dfp-ad.js.es6
View File

@ -89,7 +89,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)), topic_list_top) custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)), topic_list_top)
} }
} }
if (settings.dfp_topic_above_post_stream_code && !settings.dfp_show_topic_above_post_stream && settings.topic_above_post_stream_ad_sizes && !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.dfp_through_trust_level))) { if (settings.dfp_topic_above_post_stream_code && !settings.dfp_show_topic_above_post_stream && settings.topic_above_post_stream_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.topic_above_post_stream_ad_sizes)); const_width = parseInt(splitWidthInt(settings.topic_above_post_stream_ad_sizes));
const_height = parseInt(splitHeightInt(settings.topic_above_post_stream_ad_sizes)); const_height = parseInt(splitHeightInt(settings.topic_above_post_stream_ad_sizes));
if (Discourse.Mobile.mobileView) { if (Discourse.Mobile.mobileView) {
@ -99,7 +99,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_value_code)), topic_above_post_stream) custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_post_stream_value_code)), topic_above_post_stream)
} }
} }
if (settings.dfp_topic_above_suggested_code && !settings.dfp_show_topic_above_suggested && settings.topic_above_suggested_ad_sizes && !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.dfp_through_trust_level))) { if (settings.dfp_topic_above_suggested_code && !settings.dfp_show_topic_above_suggested && settings.topic_above_suggested_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.topic_above_suggested_ad_sizes)); const_width = parseInt(splitWidthInt(settings.topic_above_suggested_ad_sizes));
const_height = parseInt(splitHeightInt(settings.topic_above_suggested_ad_sizes)); const_height = parseInt(splitHeightInt(settings.topic_above_suggested_ad_sizes));
if (Discourse.Mobile.mobileView) { if (Discourse.Mobile.mobileView) {
@ -109,7 +109,7 @@ function loadGoogle(settings) {
custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_value_code)), topic_above_suggested) custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_above_suggested_value_code)), topic_above_suggested)
} }
} }
if (settings.dfp_post_bottom_code && !settings.dfp_show_post_bottom && settings.post_bottom_ad_sizes && !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.dfp_through_trust_level))) { if (settings.dfp_post_bottom_code && !settings.dfp_show_post_bottom && settings.post_bottom_ad_sizes) {
const_width = parseInt(splitWidthInt(settings.post_bottom_ad_sizes)); const_width = parseInt(splitWidthInt(settings.post_bottom_ad_sizes));
const_height = parseInt(splitHeightInt(settings.post_bottom_ad_sizes)); const_height = parseInt(splitHeightInt(settings.post_bottom_ad_sizes));
if (Discourse.Mobile.mobileView) { if (Discourse.Mobile.mobileView) {
@ -153,6 +153,10 @@ export default Ember.Component.extend({
return `width: ${this.get('const_mobile_width')}px; height: ${this.get('const_mobile_height')}px;`.htmlSafe(); return `width: ${this.get('const_mobile_width')}px; height: ${this.get('const_mobile_height')}px;`.htmlSafe();
}.property('const_mobile_width', 'const_mobile_height'), }.property('const_mobile_width', 'const_mobile_height'),
checkTrustLevels: function() {
return !((currentUser) && (currentUser.get('trust_level') > Discourse.SiteSettings.dfp_through_trust_level));
}.property('trust_level'),
_initGoogleDFP: function() { _initGoogleDFP: function() {
var self = this; var self = this;
loadGoogle(this.siteSettings).then(function() { loadGoogle(this.siteSettings).then(function() {

4
assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
View File

@ -1,18 +1,22 @@
{{#if site.mobileView}} {{#if site.mobileView}}
{{#if loadedGoogletag}} {{#if loadedGoogletag}}
{{#if checkTrustLevels}}
<div id={{divId}} style={{adWrapperStyleMobile}} class="dfp-ad-unit" align=center> <div id={{divId}} style={{adWrapperStyleMobile}} class="dfp-ad-unit" align=center>
<script type='text/javascript'> <script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('{{divId}}'); }); googletag.cmd.push(function() { googletag.display('{{divId}}'); });
</script> </script>
</div> </div>
{{/if}} {{/if}}
{{/if}}
{{else}} {{else}}
{{#if loadedGoogletag}} {{#if loadedGoogletag}}
{{#if checkTrustLevels}}
<div id={{divId}} style={{adWrapperStyle}} class="dfp-ad-unit" align=center> <div id={{divId}} style={{adWrapperStyle}} class="dfp-ad-unit" align=center>
<script type='text/javascript'> <script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('{{divId}}'); }); googletag.cmd.push(function() { googletag.display('{{divId}}'); });
</script> </script>
</div> </div>
{{/if}} {{/if}}
{{/if}}
{{/if}} {{/if}}

2
config/locales/client.en.yml
View File

@ -3,5 +3,5 @@ en:
admin: admin:
site_settings: site_settings:
categories: categories:
ad_plugin: 'Ad Plugin' ad_plugin: 'DFP Plugin'
adsense_plugin: 'Adsense Plugin' adsense_plugin: 'Adsense Plugin'