Modified readme for todo and changed name of plugin for dfp

README.md

@@ -6,28 +6,7 @@ Ad plugin for Discourse forum.
 
 * Supported Discourse version: v1.4
 
-### Special Installation Instructions for RGSoC Coaches
+* Supported Ad Platforms: Google Adsense and Doubleclick for Publishers
-
-* You would have already gotten the discourse to load locally.  If not, do that first.  You can find instructions [here](https://github.com/team-melbourne-rgsoc2015/discoursetest-avn).
-* Then clone this repo in a new local folder.
-* In the terminal, go into your discourse folder and then into plugins.  Example ```cd ~/code/discourse/plugins```
-* Create a symlink in this folder and do that by doing:
-
-```
-ln -s ~/whereever_your_cloned_ad_plugin_path_is .
-
-For example: ln -s ~/discourse-plugin-test .
-
-```
-Now you are done.  See 'Usage' heading for sample ad codes that you can input.
-
-
-### Non-docker installation
-
-* Run `bundle exec rake plugin:install repo=http://github.com/team-melbourne-rgsoc2015/discourse-adplugin` in your discourse directory
-* In development mode, run `bundle exec rake assets:clean`
-* In production, recompile your assets: `bundle exec rake assets:precompile`
-* Restart Discourse
  
 ### Docker installation
 
@@ -53,17 +32,14 @@ git pull
 
 ## Usage
 
-* Go to Admin > Settings > Ad Plugin
+* Go to Admin > Settings > DFP Plugin / Adsense Plugin
-* Add DFP link into code boxes, input width and height based on Google Ad Ad units.  Here are some sample ad codes that you can put in the input into the settings.  But remember:
+
-⋅⋅* Each slot requires a different sample ad code.  That means, you cannot put the same ad sample ad codes multiple times in different slots.  They won't appear.  
+# DFP
-⋅⋅* Don't click on the ad.  
-⋅⋅* On the last stroke of midnight, the magic will wear off. Make sure you leave the ball before then. 
 
-*Please test both plugins individually* - don't symlink both together, instead test them in isolation. 
 
 Input 3 parts - ad code (topmost box), width, height. And be sure to untick the disable box. Then, refresh the page for the inputs to take effect, and go to the ad location.
 
-Usually google sizes to input are (width*height) 300*250 or 728*90 (best) respectively. Input your dfp ad code.
+Usually google sizes tDOcso input are (width*height) 300*250 or 728*90 (best) respectively. Input your dfp ad code.
 
 The namings in settings are with reference to the plugin outlets created by Discourse.
 
@@ -78,10 +54,6 @@ The namings in settings are with reference to the plugin outlets created by Disc
 `dfp_nth_post_code` and ensure your total number of posts in topic >=N. For example, if you input N = 4, the forum should have at least 4 replies/posts)
 
 
-### Sample DFP Ad Codes:
-1. /142953540/PostandCourier/Postandcourier.com/News/Leaderboard_Bottom
-2. /6355419/Travel/Europe/France/Paris
-3. /1047893/kv_home_bigbox1
 
 This is how it looks like when you put it in site settings.
 (Images here aren't showing atm - but you can go to [this link to see the ad codes and what the ads look like when they're loaded](https://meta.discourse.org/t/rails-girls-soc-banter/26875/53)).
@@ -105,16 +77,8 @@ This is how the ads should display is all is working fine.... (ads also change s
 
 * Finally, if you wish to disable the ad, tick ad disabling box
 
-# Ad Providers Supported
+# Ad Sizes
 
-* Google DFP
-
-# Potential Ad Sizes
-
-Restricted container:
-Max H: 300 or lower of ad,  W: 1000 left align.
-
-Topic list top, Topic top, Above Suggested
 -	728*90
 -	336*280
 -	300*250
@@ -126,21 +90,12 @@ Topic list top, Topic top, Above Suggested
 -	200*200
 -	250*250
 
-Post Bottom
+* Mobile Ads will automatically default to 320*50.
-Max H: 90 or lower of ad,  W: 1000 left align.
-
--	728*90
--	960*90
--	468*60
--	234*60
 
 ## License
 
-GPL v2
+{{fill in here}}
 
-TO-DO:
+TODO:
-
+Non docker installation
-* Fix up the image loading issue in Readme.
+Expand on the usage - dfp and adsense
-* Publisher ID support 
-* Trust levels
-* More ad providers!

config/locales/client.en.yml

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

plugin.rb

@@ -1,7 +1,7 @@
 # name: discourse-adplugin
-# about: Ad Plugin for Discourse (dfp)
+# about: Ad Plugin for Discourse
 # version: 0.1
-# authors: Vi and Sarah (Team Melbourne)
+# authors: Vi and Sarah (@ladydanger and @cyberkoi)
 
 register_css <<CSS