Skip to content

Commit

Permalink
Merge branch '2773-mergeR'
Browse files Browse the repository at this point in the history
  • Loading branch information
SSuranie committed Mar 8, 2021
2 parents 484813e + b3aaace commit 2e9694f
Show file tree
Hide file tree
Showing 20 changed files with 13,089 additions and 71 deletions.
36 changes: 36 additions & 0 deletions _assets/sass/components/_bidder-list.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.pb-content {
.bidder-filter {
padding: 10px 15px;
border: 1px solid #b3c1cc;
background-color: rgba(236, 243, 245, 0.35);

&:focus {
outline: none;
}
}

.c-bidder-list-group {
h4 {
color: #797f90;
font-size: 19px;
font-weight: 700;
}
}

.c-bidder-list {
padding-left: 0;
columns: 2;

li {
padding-bottom: 5px;

&::before {
content: none !important;
}
}

a {
text-decoration: none;
}
}
}
17 changes: 17 additions & 0 deletions _assets/sass/components/_download-form.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.download-form {
margin-bottom: 20px;

> .row {
flex-flow: column;
}

.adapters {
display: flex;
flex-flow: row wrap;
}
}

.download-form__modal,
.modal-backdrop.fade {
opacity: 0;
}
5 changes: 5 additions & 0 deletions _assets/sass/components/_search.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.algolia-autocomplete {
.algolia-docsearch-suggestion--category-header {
display: none !important;
}
}
4 changes: 4 additions & 0 deletions _assets/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@import 'vendor/bootstrap';
@import 'vendor/bourbon';
@import 'vendor/include-media';
@import 'vendor/awesomplete';

// Base Styles
@import 'base/base';
Expand All @@ -32,6 +33,9 @@
@import 'components/pb';
@import 'components/social-media';
@import 'components/table';
@import 'components/download-form';
@import 'components/bidder-list';
@import 'components/search';

// Pages
@import 'pages/home';
Expand Down
27 changes: 27 additions & 0 deletions _assets/sass/vendor/_awesomplete.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@import '../../node_modules/awesomplete/awesomplete.base.css';

.awesomplete {
> ul {
background: #333;
padding: 0 !important;

> li {
padding: 10px 15px;
border-bottom: 1px solid #707070;
color: #efefef;
font-size: 17px;

&:last-child {
border-bottom: 0;
}

&[aria-selected="true"] {
background-color: #ff6f00;
}

&::before {
content: none !important;
}
}
}
}
1 change: 1 addition & 0 deletions _assets/sass/vendor/_bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
@import "../../../node_modules/bootstrap/scss/card";
@import "../../../node_modules/bootstrap/scss/code";
@import "../../../node_modules/bootstrap/scss/alert";
@import "../../../node_modules/bootstrap/scss/modal";
@import "../../../node_modules/bootstrap/scss/utilities";
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ collections:

port: 8080

exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js']
exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js', 'find-ungrouped-bidders.sh' ]

keep_files:
- assets/css/main-bundle.css
Expand Down
23 changes: 23 additions & 0 deletions _includes/body-end.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
<script type="text/javascript"> docsearch({
apiKey: 'e9e0827a8769cc3797d1d75add431a5c',
indexName: 'prebid',
inputSelector: '#site-search',
algoliaOptions: {
// 'facetFilters': ["tags:$TAGS"]
hitsPerPage: 30,
},
transformData: function(hits) {
var returned_hits = { };
hits.forEach( function(hit) {
var url = new URL(hit.url);
var key = url.origin + url.pathname;
if ( !returned_hits[key] ) {
returned_hits[key] = hit;
}
} );
return Object.values(returned_hits);
},
debug: false // Set debug to true if you want to inspect the dropdown
});
</script>
1 change: 1 addition & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@
</script>

<script src="{{site.baseurl}}/assets/js/prism.js"></script>
{% include body-end.html %}
3 changes: 2 additions & 1 deletion _includes/head--common.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- OneTrust Cookies Consent Notice end for docs.prebid.org -->
{% endif %}

<link href="{{site.baseurl}}/assets/css/main-bundle.css" rel="stylesheet">
<link href="{{site.baseurl}}/assets/css/main-bundle.css?v=9" rel="stylesheet">

<!-- Favicons -->
<link href="{{site.baseurl}}/assets/images/favicon.png" rel="icon">
Expand All @@ -39,4 +39,5 @@
<script src="{{site.baseurl}}/assets/js/main.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/assets/js/pbjs_home.js"></script>
<script type="text/javascript" src="/assets/js/video/pb-code-highlight.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />

2 changes: 1 addition & 1 deletion _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</li>

{% endfor %}

<li class="nav-item"><input type="search" id="site-search"></li>
</ul>
</div>
</div>
Expand Down
56 changes: 41 additions & 15 deletions _layouts/bidder.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

<div class="row">

<div class="col-md-9" role="main">
<div class="col-md-12" role="main">
<div class="bs-docs-section">

<h3>{{ page.title }}</h3>
<h2>{{ page.title }}</h2>

{% if page.s2s_only == true %}
<div class="pb-bidder-s2">
Expand All @@ -42,7 +42,7 @@ <h3>Note:</h3> This is a S2S adapter only.</h3>

<h3>Features</h3>

<table class="table table-bordered">
<table class="table table-bordered table-striped">
<tr>
<th class="pbTh">Bidder Code</th>
<td class="pbTd">{{ page.biddercode }}</td>
Expand All @@ -51,23 +51,53 @@ <h3>Features</h3>
</tr>
<tr>
<th class="pbTh">Media Types</th>
<td class="pbTd">display{% if page.media_types contains 'video' %}, video{% endif %}{% if page.media_types contains 'native' %}, native{% endif %}</td>
<th class="pbTh">GDPR Support</th>
<td class="pbTd">{% unless page.media_types contains 'no-display' %}display{% if page.media_types contains 'video' %},{% endif %}{% endunless %}{% if page.media_types contains 'video' %} video{% endif %}{% if page.media_types != "no-display, native" and page.media_types contains 'native' %}, native{% endif %}{% if page.media_types == "no-display, native" %}native{% endif %}</td>
<th class="pbTh">GDPR TCF1 Support</th>
<td class="pbTd">{% if page.gdpr_supported == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">User IDs</th>
<td class="pbTd">{% if page.userIds and page.userIds != '' %}{{page.userIds}}{% else %}none{% endif %}</td>
<th class="pbTh">GDPR TCF2 Support</th>
<td class="pbTd">{% if page.tcf2_supported == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">SChain Support</th>
<td class="pbTd">{% if page.schain_supported == true %}yes{% else %}no{% endif %}</td>
<th class="pbTh">COPPA Support</th>
<td class="pbTd">{% if page.coppa_supported == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Safeframes OK</th>
<td class="pbTd">{% if page.safeframes_ok == false %}no{% elsif page.safeframes_ok == true %}yes{% else %}check with bidder{% endif %}</td>
<th class="pbTh">USP/CCPA Support</th>
<td class="pbTd">{% if page.usp_supported == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Supports Deals</th>
<td class="pbTd">{% if page.bidder_supports_deals == false %}no{% elsif page.bidder_supports_deals == true %}yes{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Prebid.js Adapter</th>
<td class="pbTd">yes</td>
</tr>
<tr>
<th class="pbTh">IAB GVL ID</th>
<td class="pbTd">{% if page.gvl_id %}{{page.gvl_id}}{% else %}check with bidder{% endif %}</td>
<th class="pbTh">Prebid Server Adapter</th>
<td class="pbTd">{% if page.pbs == true %}yes{% else %}no{% endif %}</td>
</tr>
<tr>
<th class="pbTh">Floors Module Support</th>
<td class="pbTd">{% if page.getFloor == true %}yes{% else %}no{% endif %}</td>
<th class="pbTh"></th>
<td class="pbTd"></td>
</tr>
</table>

<h3>"Send All Bids" Ad Server Keys</h3>

<font size="-1">These are the bidder-specific keys that would be targeted within GAM in a Send-All-Bids scenario. GAM truncates keys to 20 characters.</font>

<table class="table table-bordered">
<table class="table table-bordered table-striped">
<tr>
<td class="pbTd"><code>{{ "hb_pb_" | append: page.biddercode | slice: 0,20 }}</code></td>
<td class="pbTd"><code>{{ "hb_bidder_" | append: page.biddercode | slice: 0,20 }}</code></td>
Expand All @@ -83,16 +113,17 @@ <h3>"Send All Bids" Ad Server Keys</h3>
<td class="pbTd"><code>{{ "hb_cache_id_" | append: page.biddercode | slice: 0,20 }}</code></td>
<td class="pbTd"><code>{{ "hb_uuid_" | append: page.biddercode | slice: 0,20 }}</code></td>
</tr>
<tr>
<td class="pbTd"><code>{{ "hb_cache_path_" | append: page.biddercode | slice: 0,20 }}</code></td>
<td class="pbTd"><code>{{ "hb_deal_" | append: page.biddercode | slice: 0,20 }}</code></td>
<td class="pbTd"></td>
</tr>
</table>

{% if page.prevBiddercode %}
This bidder previously had a bidder code of `{{ page.prevBiddercode }}`, but prefers new configurations to use `{{ page.biddercode }}`.
{% endif %}

{% if page.bidder_supports_deals != false %}
<h3>"Deal ID" Ad Server Key</h3>
<code>{{ "hb_deal_" | append: page.biddercode | slice: 0,20 }}</code>
{% endif %}

{{content}}

Expand Down Expand Up @@ -123,8 +154,3 @@ <h3>"Deal ID" Ad Server Key</h3>

</body>
</html>





2 changes: 1 addition & 1 deletion _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,5 @@ <h5>Follow Us</h5>


</div> <!-- pb-homepage -->

{% include body-end.html %}
</body>
2 changes: 1 addition & 1 deletion assets/css/main-bundle.css

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions assets/js/autocomplete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
var input = document.getElementById('bidder-filter');
new Awesomplete(input, {
list: BidderList,
replace: function(item) {
this.input.value = item.label;
},
sort: function(a, b) {
var name_a = a.label.toUpperCase();
var name_b = b.label.toUpperCase();
if ( name_a < name_b ) {
return -1;
}
if ( name_b < name_a ) {
return 1;
}
return 0;
}
});
input.addEventListener('awesomplete-select', function(event) {
document.location = document.location.origin + event.text.value;
});
Loading

0 comments on commit 2e9694f

Please sign in to comment.