Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catching stage up with master #2215

Merged
merged 16 commits into from
Aug 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
prebid.org
docs.prebid.org
8 changes: 8 additions & 0 deletions _data/sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,14 @@
sectionTitle:
subgroup: 1

- sbSecId: 4
title: '  Akamai AMP'
link: /examples/video/instream/akamai/pb-ve-amp.html
isHeader: 0
isSectionHeader: 0
sectionTitle:
subgroup: 1

- sbSecId: 4
title: '  AdPlayer.Pro'
link: /examples/video/instream/adplayerpro/pb-ve-adplayerpro.html
Expand Down
4 changes: 2 additions & 2 deletions _includes/adops/adops-gam-video-setup.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ <h3 id="creative-single-cache">Single Cache Location</h3>

<p>If you’re using a single order for all bidders, then the VAST URL will be the same for each bidder:</p>

<figure class="highlight"><pre><code class="language-html" data-lang="html"> https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_cache_id%%
<figure class="highlight"><pre><code class="language-html" data-lang="html"> https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_uuid%%
or
[other bidder cache location]</code></pre></figure>

<p>If you’re using different orders for each bidder, the VAST URL for each will include the bidder-specific targeting variable:</p>

<figure class="highlight"><pre><code class="language-html" data-lang="html"> https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_cache_id_BIDDERCODE%%
<figure class="highlight"><pre><code class="language-html" data-lang="html"> https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_uuid_BIDDERCODE%%
or
[other bidder cache location]</code></pre></figure>

Expand Down
136 changes: 136 additions & 0 deletions _includes/video/pb-is-amp.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="google-site-verification" content="_SMhyxJ4MnU9eTUQQNMUwU5W18T5tjNF7A6mumIci-A" />
<meta name="keywords" content="Header Bidding, Advanced Bidding, Header Bid, Pre-bid">
<meta name="description" content="{{page.description}}" />

<link rel="shortcut icon" type="image/png" href="/favicon.png" />


{% if page.head_title %}
<title>{{page.head_title}}</title>
{% else %}
<title>{{page.title}} for Header Bidding</title>
{% endif %}

<!-- OneTrust Cookies Consent Notice start -->

<script src="https://cdn.cookielaw.org/consent/53783db5-1614-43d4-bb1a-148e68e8c87b.js" type="text/javascript" charset="UTF-8"></script>
<script type="text/javascript">
function OptanonWrapper() { }
</script>
<!-- OneTrust Cookies Consent Notice end -->


<!--<link href="{{site.baseurl}}/assets/css/bootstrap.min.css" rel="stylesheet">-->
<!-- Latest compiled and minified Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="{{site.baseurl}}/assets/css/docs.min.css" rel="stylesheet">

<link rel="stylesheet" href="/assets/css/prism.css">
<link href="{{site.baseurl}}/assets/css/style.css" rel="stylesheet">


<!-- Favicons -->
<link href="{{site.baseurl}}/assets/images/favicon.png" rel="icon">
<link href="{{site.baseurl}}/assets/images/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Montserrat:300,400,500,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,300i,400,400i,700,700i>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans+Condensed" />
<link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">

<style>
#content {
background:{{site.header.color1}};
background:linear-gradient(135deg, {{site.header.color1}}, {{site.header.color2}});
}

.sample-player {
width: 604px;
height: 341px;
}
</style>

<script src="{{site.baseurl}}/assets/js/prism.js"></script>
<script src="{{site.baseurl}}/assets/js/jquery.min.js"></script>
<script src="{{site.baseurl}}/assets/js/bootstrap.js"></script>
<script src="{{site.baseurl}}/assets/js/bootbox.min.js"></script>
<script src="{{site.baseurl}}/assets/js/docs.min.js"></script>
<script src="{{site.baseurl}}/assets/js/easing.min.js"></script>
<script src="{{site.baseurl}}/assets/js/main.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/assets/js/pbjs_home.js"></script>

<!--production version of prebid.js-->
<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>
<script type="text/javascript" src="https://amp.akamaized.net/hosted/1.1/player.esi?apikey=prebid.org.samples"></script>

<script type="text/javascript">

var type = "{{page.videoType}}";
var adTag = false;
var invokeVideoPlayer = function(url) {
adTag = url;
}
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

var videoAdUnit = {
code: 'video1',
mediaTypes: {
video: {
playerSize: [640, 480],
context: 'instream'
}
},
bids: [{
bidder: 'appnexus',
params: {
placementId: 13232361, // Add your own placement id here
video: {
skipppable: true,
playback_method: ['auto_play_sound_off']
}
}
}]
};

pbjs.que.push(function() {
pbjs.addAdUnits(videoAdUnit); // add your ad units to the bid request

pbjs.setConfig({
debug: true,
cache: {
url: 'https://prebid.adnxs.com/pbc/v1/cache'
}
});

pbjs.requestBids({
bidsBackHandler: function(bids) {
var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
adUnit: videoAdUnit,
params: {
iu: '/19968336/prebid_cache_video_adunit',
cust_params: {
section: 'blog',
anotherKey: 'anotherValue'
},
output: 'vast'
}
});
invokeVideoPlayer(videoUrl);
}
});
});

</script>

</head>

<body>
136 changes: 136 additions & 0 deletions _includes/video/pb-is-amp.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="google-site-verification" content="_SMhyxJ4MnU9eTUQQNMUwU5W18T5tjNF7A6mumIci-A" />
<meta name="keywords" content="Header Bidding, Advanced Bidding, Header Bid, Pre-bid">
<meta name="description" content="{{page.description}}" />

<link rel="shortcut icon" type="image/png" href="/favicon.png" />


{% if page.head_title %}
<title>{{page.head_title}}</title>
{% else %}
<title>{{page.title}} for Header Bidding</title>
{% endif %}

<!-- OneTrust Cookies Consent Notice start -->

<script src="https://cdn.cookielaw.org/consent/53783db5-1614-43d4-bb1a-148e68e8c87b.js" type="text/javascript" charset="UTF-8"></script>
<script type="text/javascript">
function OptanonWrapper() { }
</script>
<!-- OneTrust Cookies Consent Notice end -->


<!--<link href="{{site.baseurl}}/assets/css/bootstrap.min.css" rel="stylesheet">-->
<!-- Latest compiled and minified Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="{{site.baseurl}}/assets/css/docs.min.css" rel="stylesheet">

<link rel="stylesheet" href="/assets/css/prism.css">
<link href="{{site.baseurl}}/assets/css/style.css" rel="stylesheet">


<!-- Favicons -->
<link href="{{site.baseurl}}/assets/images/favicon.png" rel="icon">
<link href="{{site.baseurl}}/assets/images/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Montserrat:300,400,500,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,300i,400,400i,700,700i>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans+Condensed" />
<link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">

<style>
#content {
background:{{site.header.color1}};
background:linear-gradient(135deg, {{site.header.color1}}, {{site.header.color2}});
}

.sample-player {
width: 604px;
height: 341px;
}
</style>

<script src="{{site.baseurl}}/assets/js/prism.js"></script>
<script src="{{site.baseurl}}/assets/js/jquery.min.js"></script>
<script src="{{site.baseurl}}/assets/js/bootstrap.js"></script>
<script src="{{site.baseurl}}/assets/js/bootbox.min.js"></script>
<script src="{{site.baseurl}}/assets/js/docs.min.js"></script>
<script src="{{site.baseurl}}/assets/js/easing.min.js"></script>
<script src="{{site.baseurl}}/assets/js/main.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/assets/js/pbjs_home.js"></script>

<!--production version of prebid.js-->
<script async src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js"></script>
<script type="text/javascript" src="https://amp.akamaized.net/hosted/1.1/player.esi?apikey=prebid.org.samples"></script>

<script type="text/javascript">

var type = "{{page.videoType}}";
var adTag = false;
var invokeVideoPlayer = function(url) {
adTag = url;
}
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

var videoAdUnit = {
code: 'video1',
mediaTypes: {
video: {
playerSize: [640, 480],
context: 'instream'
}
},
bids: [{
bidder: 'appnexus',
params: {
placementId: 13232361, // Add your own placement id here
video: {
skipppable: true,
playback_method: ['auto_play_sound_off']
}
}
}]
};

pbjs.que.push(function() {
pbjs.addAdUnits(videoAdUnit); // add your ad units to the bid request

pbjs.setConfig({
debug: true,
cache: {
url: 'https://prebid.adnxs.com/pbc/v1/cache'
}
});

pbjs.requestBids({
bidsBackHandler: function(bids) {
var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
adUnit: videoAdUnit,
params: {
iu: '/19968336/prebid_cache_video_adunit',
cust_params: {
section: 'blog',
anotherKey: 'anotherValue'
},
output: 'vast'
}
});
invokeVideoPlayer(videoUrl);
}
});
});

</script>

</head>

<body>
40 changes: 17 additions & 23 deletions _layouts/video_sample.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% if page.videoType == "pb-is-br" %}
{% include /video/pb-is-br.html %}
{% elsif page.videoType == "pb-is-amp" %}
{% include /video/pb-is-amp.html %}
{% elsif page.videoType == "pb-is-app" %}
{% include /video/pb-is-app.html %}
{% elsif page.videoType == "pb-is-bc" %}
Expand Down Expand Up @@ -64,32 +66,32 @@
{% include nav.html %}

<div class="container bs-docs-container">

<div class="row ">

<div class="wrapper">

<div class="col-sm-2 sidebar-expanded d-none d-md-block sidebar" id="sidebar">
{% include left_nav.html %}
</div>

{% include left_nav.html %}

</div>


<div class="col-sm-9 pb-content" markdown="1">

{{ content }}

{% if page.description == "Partners" %}
{% include partners.html %}
{% endif %}

</div>

</div>
<!--end wrapper-->
</div>
<!--end row-->
</div>
<!--end row-->
</div>

<p></p>
Expand All @@ -112,11 +114,3 @@
</script>

-->








15 changes: 8 additions & 7 deletions dev-docs/bidders/adbutler.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ biddercode: adbutler
### Bid Params

{: .table .table-bordered .table-striped }
| Name | Scope | Description | Example | Type |
|-------------|----------|--------------------------------------|------------------|----------|
| `accountID` | required | Account ID | `'167283'` | `string` |
| `zoneID` | required | Zone ID | `'210093'` | `string` |
| `keyword` | optional | Keyword(s) used for custom targeting | `'green,orange'` | `string` |
| `minCPM` | optional | Minimum CPM value to accept | `'1.00'` | `string` |
| `maxCPM` | optional | Maximum CPM value to accept | `'5.00'` | `string` |
| Name | Scope | Description | Example | Type |
|-------------|----------|------------------------------------------------------|------------------|----------|
| `accountID` | required | Account ID | `'167283'` | `string` |
| `zoneID` | required | Zone ID | `'210093'` | `string` |
| `keyword` | optional | Keyword(s) used for custom targeting | `'green,orange'` | `string` |
| `minCPM` | optional | Minimum CPM value to accept | `'1.00'` | `string` |
| `maxCPM` | optional | Maximum CPM value to accept | `'5.00'` | `string` |
| `extra` | optional | Pass other AdButler parameters like 'tuid' or 'kw' | `{kw: "green"}` | `object` |
Loading