diff --git a/404.md b/404.md
index 6622c4e045..c04bcce824 100644
--- a/404.md
+++ b/404.md
@@ -5,29 +5,6 @@ description:
hide: true
---
-
-
-
The page you're looking for does not exist.
-
+ 404 - The page you're looking for does not exist.
-
-
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index fc19ed8538..67d347033f 100755
--- a/_config.yml
+++ b/_config.yml
@@ -1,9 +1,7 @@
# name of the software
-name: Prebid.js
+name: Prebid
# current version of the software
version: 1.0.0
-# url of the download button
-downloadUrl: https://github.com/prebid/Prebid.js/releases
# licence of the software
license: Apache License
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0
@@ -11,17 +9,17 @@ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0
# list of additional links on the right of the top menu
headerLinks:
- title: GitHub
- url: https://github.com/prebid/Prebid.js
+ url: https://github.com/prebid
# list if additional links on the footer
footerLinks:
- title: GitHub
- url: https://github.com/prebid/Prebid.js
- - title: Issues
- url: https://github.com/prebid/Prebid.js/issues?state=open
- # - title: About Us
- # url: /about.html
+ url: https://github.com/prebid/
+# - title: Issues
+# url: https://github.com/prebid/Prebid.js/issues?state=open
+# - title: About Us
+# url: /about.html
# header
@@ -70,10 +68,13 @@ nav_sections:
- top_nav: dev_docs
code: quick-start
- name: QUICK START
+ name: DEVELOPER QUICK START
- top_nav: dev_docs
code: prebid-video
name: PREBID VIDEO (BETA)
+ - top_nav: dev_docs
+ code: prebid-server
+ name: PREBID SERVER
- top_nav: dev_docs
code: prebid-amp
name: PREBID FOR AMP (ALPHA)
@@ -108,18 +109,25 @@ nav_sections:
- top_nav: adops
code: tutorials
- name: TUTORIALS
+ name: AD OPS TUTORIALS
+ - top_nav: adops
+ code: reference
+ name: REFERENCE
- top_nav: support
code: support
name: SUPPORT
+ - top_nav: principles
+ code: principles
+ name: PRINCIPLES
+
- top_nav: download
code: download
name: DOWNLOAD
-port: 80
+port: 8080
exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile']
diff --git a/_includes/foot.html b/_includes/foot.html
index 20c0957cf9..4ed958916a 100644
--- a/_includes/foot.html
+++ b/_includes/foot.html
@@ -37,7 +37,7 @@
- All demos, instructions, documentation and code included in Prebid.js or on the Prebid.org website are released under the {{site.license}} .
+ All demos, instructions, documentation and code included on the Prebid.org website are released under the {{site.license}} .
diff --git a/_includes/head.html b/_includes/head.html
index 78255c997b..127dbff3c1 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -7,6 +7,8 @@
+
+
{% if page.head_title %}
{{page.head_title}}
{% else %}
diff --git a/_includes/main_nav.html b/_includes/main_nav.html
index 540771f272..d1e10287ff 100644
--- a/_includes/main_nav.html
+++ b/_includes/main_nav.html
@@ -12,57 +12,91 @@
{{site.name}}
-
-
-
-
- Overview
-
-
-
- Dev Docs
-
-
+
+
-
- {% for p in site.headerLinks %}
-
- {{p.title}}
-
- {% endfor %}
-
-
diff --git a/_layouts/post.html b/_layouts/post.html
index 82c32646c5..36900bb435 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -7,8 +7,8 @@
diff --git a/adops/docs-by-ad-server.md b/adops/docs-by-ad-server.md
new file mode 100644
index 0000000000..12602f58cf
--- /dev/null
+++ b/adops/docs-by-ad-server.md
@@ -0,0 +1,32 @@
+---
+layout: page
+title: Docs by Ad Server
+head_title: Docs by Ad Server
+description: Prebid implementation docs, broken out by Ad Server
+pid: 0
+top_nav_section: adops
+nav_section: reference
+---
+
+
+
+# Docs by Ad Server
+{:.no_toc}
+
+This page has all of our Ad Ops setup docs, broken out by ad server.
+
+For code samples and other on-page implementation docs, see [our docs for developers]({{site.github.url}}/dev-docs/getting-started.html).
+
+* TOC
+{:toc}
+
+{: .table .table-bordered .table-striped }
+| Server | Page |
+|--------------+-----------------------------------------------------------------------------------------------------------------------------------------|
+| **DFP** | [Step by step guide to DFP setup]({{site.github.url}}/adops/step-by-step.html) |
+| | [Send all bids to the ad server]({{site.github.url}}/adops/send-all-bids-adops.html) |
+| | [Setting up Prebid for AMP in DFP]({{site.github.url}}/adops/setting-up-prebid-for-amp-in-dfp.html) |
+| | [Setting up Prebid Video in DFP]({{site.github.url}}/adops/setting-up-prebid-video-in-dfp.html) |
+| **AppNexus** | [Setting up Prebid with the AppNexus Publisher Ad Server]({{site.github.url}}/adops/setting-up-prebid-with-the-appnexus-ad-server.html) |
+
+
diff --git a/adops/setting-up-prebid-for-amp-in-dfp.md b/adops/setting-up-prebid-for-amp-in-dfp.md
index 12bcd129bc..7072bc9520 100644
--- a/adops/setting-up-prebid-for-amp-in-dfp.md
+++ b/adops/setting-up-prebid-for-amp-in-dfp.md
@@ -9,6 +9,8 @@ top_nav_section: adops
nav_section: tutorials
---
+
+
# Setting up Prebid for AMP in DFP
{: .no_toc}
@@ -89,3 +91,5 @@ Note that you can always get the latest version of the creative code below from
+ [Show Prebid Ads on AMP Pages]({{site.github.url}}/dev-docs/show-prebid-ads-on-amp-pages.html)
+ [How Prebid on AMP Works]({{site.github.url}}/dev-docs/how-prebid-on-amp-works.html)
+
+
diff --git a/adops/setting-up-prebid-video-in-dfp.md b/adops/setting-up-prebid-video-in-dfp.md
index c259266dbc..8cf86bfea8 100644
--- a/adops/setting-up-prebid-video-in-dfp.md
+++ b/adops/setting-up-prebid-video-in-dfp.md
@@ -9,6 +9,8 @@ top_nav_section: adops
nav_section: tutorials
---
+
+
# Setting up Prebid Video in DFP (Beta)
{: .no_toc}
@@ -74,3 +76,5 @@ setups and DFP video ads.
+ [Add Key-Values to a Master Video Ad Tag](https://support.google.com/dfp_premium/answer/1080597)
+ [DFP Macros](https://support.google.com/dfp_premium/answer/1242718)
+
+
diff --git a/adops/setting-up-prebid-with-the-appnexus-ad-server.md b/adops/setting-up-prebid-with-the-appnexus-ad-server.md
index 29263be4a6..09a5ff5d86 100644
--- a/adops/setting-up-prebid-with-the-appnexus-ad-server.md
+++ b/adops/setting-up-prebid-with-the-appnexus-ad-server.md
@@ -42,14 +42,14 @@ If you are only sending the winning bid to the ad server, set up your keys like
| Key | Value (string) |
|-------------+----------------|
| `hb_pb` | `0.1` |
-| `hb_bidder` | `"appnexus"` |
+| `hb_bidder` | `"rubicon"` |
-Otherwise, if you are [sending all bids to the ad server]({{site.github.url}}/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids), you'll have to create a key for each bidder (e.g., `hb_pb_appnexus`, `hb_pb_partner1`, `hb_pb_partner2`, etc.), and all of the price bucket values for that key.
+Otherwise, if you are [sending all bids to the ad server]({{site.github.url}}/dev-docs/publisher-api-reference.html#module_pbjs.enableSendAllBids), you'll have to create a key for each bidder (e.g., `hb_pb_rubicon`, `hb_pb_partner1`, `hb_pb_partner2`, etc.), and all of the price bucket values for that key.
{: .table .table-bordered .table-striped }
| Key | Value (string) |
|------------------+----------------|
-| `hb_pb_appnexus` | `0.1` |
+| `hb_pb_rubicon` | `0.1` |
Depending on the price granularity you want, you may find one of the following CSV files helpful. Each file has the buckets for that granularity level predefined. You can avoid manually setting up key-value targeting by uploading the appropriate CSV file on the [key-values screen](https://wiki.appnexus.com/x/-PQdBQ):
@@ -79,7 +79,7 @@ Follow the creative setup instructions in [Add Creatives](https://wiki.appnexus.
- The creative content should be the HTML and JavaScript shown below.
{: .alert.alert-success :}
-If you are using "send all bids" mode, the macro in the call to `renderAd` below should match the header bidding partner associated with that creative, e.g., `'#{HB_ADID_APPNEXUS}'`, `'#{HB_ADID_PARTNER}'`, etc.
+If you are using "send all bids" mode, the macro in the call to `renderAd` below should match the header bidding partner associated with that creative, e.g., `'#{HB_ADID_RUBICON}'`, `'#{HB_ADID_PARTNER}'`, etc.
{% highlight html %}
+
+
+{% endhighlight %}
+
+## Related Topics
+
++ [Show Outstream Video Ads - Example Code]({{site.github.url}}/dev-docs/examples/outstream-video-example.html)
+
+
diff --git a/dev-docs/show-prebid-ads-on-amp-pages.md b/dev-docs/show-prebid-ads-on-amp-pages.md
index 7d9423c499..5456961356 100644
--- a/dev-docs/show-prebid-ads-on-amp-pages.md
+++ b/dev-docs/show-prebid-ads-on-amp-pages.md
@@ -64,7 +64,7 @@ The `amp-ad` elements in the page body need to be set up as shown below, especia
height="250"
layout="fixed"
type="doubleclick"
- json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"4799418","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
+ json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
data-slot="/19968336/header-bid-tag-1">
```
@@ -236,10 +236,13 @@ The function `loadPrebidJS()` shown below is what's called by the AMP `draw3p` f
#### 6. Implement `draw3p`, the integration point with AMP
-In the page's body, implement the `draw3p` function as shown below. Don't forget to add the arrays showing the ad networks used and the domains allowed to load this file in an iframe.
-
`draw3p` is the integration point between AMP and content in third-party iframes (which is what this page is).
+In the page's body, implement the `draw3p` function as shown below. This implementation should work even on pages that have multiple AMP ad types.
+
+{: .alert.alert-danger :}
+Don't forget to add the required arrays at the end of the function showing the ad networks used and the domains allowed to load this file in an iFrame. You **must** add all `amp-ad` types on page to the `draw3p` array, even if they are not being used with Prebid demand.
+
For an example showing how `draw3p` is used, see [this AMP test](https://dfp-amp-testing-1185.appspot.com/amp_tests/dfp-3p-iframe.html).
For more information about `draw3p`, see:
@@ -252,19 +255,25 @@ For more information about `draw3p`, see:
/** The draw3p function is the integration point between AMP and content in third party
* iframes. For more info see: https://github.com/ampproject/amphtml/blob/e5501a30adf15c8fef049729f5e0e3137dbb18ca/3p/integration.js#L252
*/
- draw3p(function(config, done) {
- if (typeof window.context.master.adCalls === 'undefined') {
- window.context.master.adCalls = [];
- }
- if (window.context && window.context.isMaster && config.prebid) {
- var prebid = config.prebid;
- adUnits = prebid.adUnits;
- requestBidsDuration = prebid.requestBidsDuration;
- loadPrebidJS();
+ draw3p(function(config, done) {
+ if(config.prebid) {
+ if (typeof window.context.master.adCalls === 'undefined') {
+ window.context.master.adCalls = [];
+ }
+ if (window.context && window.context.isMaster && config.prebid) {
+ var prebid = config.prebid;
+ adUnits = prebid.adUnits;
+ requestBidsDuration = prebid.requestBidsDuration;
+ loadPrebidJS();
+ }
+ window.context.master.adCalls.push(setTargeting.bind(null, config, done));
+ }
+ else{
+ done(config);
}
- window.context.master.adCalls.push(setTargeting.bind(null, config, done));
- }, ['doubleclick'], ['publisher.com']);
-// the first array contains ad networks used, the second domains allows to load this file in an iframe
+
+ }, ['doubleclick', 'taboola'], ['vip.local', 'preprod.metro.co.uk', 'preprod.metro.co.uk', 'metro.co.uk']);
+// the first array contains ad networks used, the second domains that allow us to load this file in an iframe
```
diff --git a/dev-docs/testing-prebid.md b/dev-docs/testing-prebid.md
index c5bddc12cf..126a90f59c 100644
--- a/dev-docs/testing-prebid.md
+++ b/dev-docs/testing-prebid.md
@@ -9,6 +9,8 @@ nav_section: hacking
hide: false
---
+
+
# Testing Prebid.js
{: .no_toc}
@@ -105,3 +107,5 @@ The Prebid.js testing stack contains some of the following tools. It may be help
- [Mocha - test framework](http://mochajs.org/)
- [Chai - BDD/TDD assertion library](http://chaijs.com/)
- [Sinon - spy, stub, and mock library](http://sinonjs.org/)
+
+
diff --git a/download.md b/download.md
index 33c9ed4922..6dc2791809 100644
--- a/download.md
+++ b/download.md
@@ -4,7 +4,6 @@ title: Download Prebid.js
description: Documentation on how to download Prebid.js for header bidding.
pid: 0
-show_disqus: true
is_top_nav: yeah
@@ -71,6 +70,7 @@ function submit_download() {
function get_form_data() {
var bidders = [];
+ var analytics = [];
var bidder_check_boxes = $('.bidder-check-box');
for (var i = 0; i < bidder_check_boxes.length; i++) {
@@ -80,10 +80,19 @@ function get_form_data() {
}
}
+ var analytics_check_boxes = $('.analytics-check-box');
+ for (var i = 0; i < analytics_check_boxes.length; i++) {
+ var box = analytics_check_boxes[i];
+ if (box.checked) {
+ analytics.push(box.getAttribute('analyticscode'));
+ }
+ }
+
var form_data = {};
form_data['email'] = $('#input-email').val();
form_data['company'] = $('#input-company').val();
form_data['bidders'] = bidders;
+ form_data['analytics'] = analytics;
return form_data;
}
@@ -109,6 +118,7 @@ To improve the speed and load time of your site, build Prebid.js for only the he