Merge pull request #4 from prebid/master

pull the latest master
LiveIntent · Jun 22, 2020 · 20c4611 · 20c4611
2 parents 9c8a7f6 + d1f1625
commit 20c4611
Show file tree

Hide file tree

Showing 155 changed files with 16,438 additions and 6,215 deletions.
diff --git a/_data/message.yml b/_data/message.yml
@@ -1 +1,4 @@
 #-------------Message----------------
+- messageId: 1
+  messageText:
+  messageCreateDt:
diff --git a/_data/partners.yml b/_data/partners.yml
@@ -53,6 +53,11 @@
   imgURL: /assets/images/partners/tech/datablocks_logo.png
   type: technology
 
+- company: LiveRamp 
+  link: https://liveramp.com/
+  imgURL: /assets/images/partners/tech/LiveRamp-Logo.png
+  type: technology
+
 - company: Marfeel 
   link: https://www.marfeel.com/
   imgURL: /assets/images/partners/tech/marfeel.png
@@ -133,6 +138,11 @@
   imgURL: /assets/images/partners/publisher/PCH-logo_v3.jpg
   type: publisher
 
+- company: PubWise
+  link: https://pubwise.io
+  imgURL: /assets/images/partners/publisher/Pubwise-logo.png
+  type: publisher
+
 - company: SHE Media
   link: https://www.shemedia.com/
   imgURL: /assets/images/partners/publisher/SHE_Media_Logo.png
@@ -153,6 +163,10 @@
   imgURL: /assets/images/partners/community/Adomik-logo.png
   type: community
 
+- company: Adtelligent
+  link: https://adtelligent.com/
+  type: community
+
 - company: Audigent
   link: https://audigent.com/
   imgURL: /assets/images/partners/community/audigent_logo.png
@@ -168,6 +182,10 @@
   imgURL: /assets/images/partners/community/CHEQ_Logo.png
   type: community
 
+- company: ConnectAd
+  link: https://connectad.io
+  type: community
+
 - company: DailyMotion
   link: https://dailymotion.com/
   imgURL: /assets/images/partners/community/Dailymotion_logo.png
@@ -188,17 +206,40 @@
   imgURL: /assets/images/partners/community/ID5-Logo.png
   type: community
 
+- company: JW Player
+  link: https://jwplayer.com
+  type: community
+
 - company: LiveIntent
   link: https://www.liveintent.com
   imgURL: /assets/images/partners/community/liveintent_logo.png
   type: community
 
+- company: Media.net
+  link: https://media.net
+  type: community
+
+- company: MobileFuse
+  link: https://mobilefuse.com/
+  type: community
+
+- company: Parrable
+  link: https://parrable.com
+  type: community
+
 - company: Publica
   link: https://getpublica.com
   imgURL: /assets/images/partners/community/Publica-Logo.png
   type: community
 
-- company: PubWise
-  link: https://pubwise.io
-  imgURL: /assets/images/partners/community/Pubwise-logo.png
+- company: Simplaex
+  link: https://simplaex.com
+  type: community
+
+- company: Sovrn
+  link: https://sovrn.com
+  type: community
+
+- company: Yeahmobi
+  link: https://yeahmobi.com
   type: community
diff --git a/_data/sidebar.yml b/_data/sidebar.yml
@@ -486,7 +486,7 @@
   isSectionHeader: 0
   sectionTitle:
   subgroup: 5
-  
+
 - sbSecId: 1
   title: Google Ad Manager Video
   link: /dev-docs/modules/dfp_video.html

diff --git a/_includes/adops/adops-gam-video-setup.html b/_includes/adops/adops-gam-video-setup.html
@@ -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_uuid%%
+<figure class="highlight"><pre><code class="language-html" data-lang="html">   https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_cache_id%%
 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_uuid_BIDDERCODE%%
+<figure class="highlight"><pre><code class="language-html" data-lang="html">   https://prebid.adnxs.com/pbc/v1/cache?uuid=%%PATTERN:hb_cache_id_BIDDERCODE%%
 or
    [other bidder cache location]</code></pre></figure>
 

diff --git a/_includes/partners.html b/_includes/partners.html
@@ -2,7 +2,7 @@
 
 <div class="partners">
 
-	<div class="tableTitle"><h3>Prebid.org Leader Members</h3></div>
+	<div class="tableTitle"><h2>Prebid.org Leader Members</h2></div>
 	<script type="text/javascript">
 	var memberDataLeader=[];
 	var idx=0;
@@ -20,7 +20,7 @@
 	  writeDynamicTable({div:"memberTableLeader", data:"memberDataLeader", sort:"rowFirst", maxcols:4, striped: false, fixedHeight: true});
 	</script>
 
-	<div class="tableTitle"><h3>Prebid.org Technology Partner Members</h3></div>
+	<div class="tableTitle"><h2>Prebid.org Technology Partner Members</h2></div>
 	<script type="text/javascript">
 	var memberDataTech=[];
 	var idx=0;
@@ -38,7 +38,7 @@
 	  writeDynamicTable({div:"memberTableTech", data:"memberDataTech", sort:"rowFirst", maxcols: 4, striped: false, fixedHeight: true});
 	</script>
 
-	<div class="tableTitle"><h3>Prebid.org Publisher Members</h3></div>
+	<div class="tableTitle"><h2>Prebid.org Publisher Members</h2></div>
 	<script type="text/javascript">
 	var memberDataPub=[];
 	var idx=0;
@@ -56,7 +56,7 @@
 	  writeDynamicTable({div: "memberTablePub", data: "memberDataPub", sort:"rowFirst", maxcols: 4, striped: false, fixedHeight: true});
 	</script>
 
-	<div class="tableTitle"><h3>Prebid.org Community Members</h3></div>
+	<div class="tableTitle"><h2>Prebid.org Community Members</h2></div>
 	<script type="text/javascript">
 	var memberDataComm=[];
 	var idx=0;
@@ -65,34 +65,15 @@
 		{% if item.type == "community" %}
 			memberDataComm[idx]={};
 			memberDataComm[idx].href="{{item.link}}";
-			memberDataComm[idx].text="<img src=\"{{item.imgURL}}\" width=\"100\">";
+			memberDataComm[idx].text="{{item.company}}";
 			idx++;
 		{% endif %}
 	{% endfor %}
 	</script>
 
 	<div id="memberTableComm"></div>
 	<script>
-	  writeDynamicTable({div: "memberTableComm", data: "memberDataComm", sort:"rowFirst", maxcols: 4, striped: false, fixedHeight: true});
+	  writeDynamicTable({div: "memberTableComm", data: "memberDataComm", sort:"rowFirst", maxcols: 4, striped: false, fixedHeight: false});
 	</script>
 
-
-	<div class="tableTitle"><h3>Prebid.js Bidding Partners</h3></div>
-	<script type="text/javascript">
-	    var partnerData=[];
-	    idx=0;
-
-		{% assign bidder_pages = site.pages | where: "layout", "bidder" %}
-	    {% for item in bidder_pages %}
-		partnerData[idx]={};
-		partnerData[idx].href="/dev-docs/bidders.html#{{item.biddercode}}";
-		partnerData[idx].text="{{item.title}}";
-		idx++;
-	    {% endfor %}
-        </script>
-
-	<div id="partnerTable"></div>
-	<script>
-	   writeDynamicTable({div:"partnerTable", data:"partnerData"});
-	</script>
 </div>