browser: indicate browser usage from separate include

diff --git a/browser.plp b/browser.plp
index bbf2d6bb9288b0e98d0fb0af8cb1cc2c13830e95..0f5b704d473a5e88a16387188b512ab37de10d3d 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -1,5 +1,6 @@
 <(common.inc.plp)><:
 use 5.010;
 <(common.inc.plp)><:
 use 5.010;

+use List::Util qw(sum max);

 
 Html({
        title => 'browser compatibility cheat sheet',
 
 Html({
        title => 'browser compatibility cheat sheet',


@@ -14,7 +15,9 @@ Html({
 :>
 <h1>Browser compatibility</h1>
 
 :>
 <h1>Browser compatibility</h1>
 

-<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> site.</p>
+<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
+with <a href="http://stats.wikimedia.org/archive/squid_reports/">Wikimedia</a>
+browser usage statistics.</p>

 
 <:
 use JSON;
 
 <:
 use JSON;


@@ -65,6 +68,12 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
        }
 }
 
        }
 }
 

+my $canihas = do 'browser-usage.inc.pl';
+for ($! || $@ || ()) {
+       printf "<p>Browser usage data not found: <em>%s</em>.</p>\n", $_;
+}
+my $scorediv = (max(map { sum(values %$_) } values %$canihas) // 1) / 100;
+

 print '<table class="mapped">';
 print '<col>' x 3;
 printf '<colgroup span="%d">', scalar @{ $versions{$_} } for @browsers;
 print '<table class="mapped">';
 print '<col>' x 3;
 printf '<colgroup span="%d">', scalar @{ $versions{$_} } for @browsers;


@@ -126,9 +135,14 @@ for my $id (sort {
                for my $ver (@{ $versions{$browser} }, undef) {
                        unless (!defined $prev
                        or $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
                for my $ver (@{ $versions{$browser} }, undef) {
                        unless (!defined $prev
                        or $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {

-                               printf '<td class="%s" colspan="%d">%s',
-                                       $CSTATS{ $data->{$browser}->{$prev} },
+                               my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
+                               printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
+                                       join(' ',
+                                               $CSTATS{ $data->{$browser}->{$prev} },
+                                               sprintf('opacity%.0f', $usage / $scorediv),
+                                       ),

                                        scalar @span,
                                        scalar @span,

+                                       $usage,

                                        showversions(\@span),
                                undef $prev;
                                @span = ();
                                        showversions(\@span),
                                undef $prev;
                                @span = ();