Changeset 1240

Timestamp:

02/10/2015 12:43:47 AM (12 years ago)

Author:

obenland

Message:

WP.org Themes: Improve downloads graph display.

• Use data from the past tow years.
• Avoid circumstances where the most current stats were cut off.

See #745.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes

Files:

• content-single.php (modified) (4 diffs)
• js/theme.js (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/content-single.php

@@ -106 +106 @@
                                         function drawThemeDownloadsChart() {
                                                 jQuery(document).ready(function($){
-                                                        jQuery.getJSON('https://api.wordpress.org/stats/themes/1.0/downloads.php?slug=<?php echo $theme->slug; ?>&limit=267&callback=?', function (downloads) {
+                                                        jQuery.getJSON('https://api.wordpress.org/stats/themes/1.0/downloads.php?slug=<?php echo $theme->slug; ?>&limit=730&callback=?', function (downloads) {
                                                                 var data = new google.visualization.DataTable(),
-                                                                        count = 0,
-                                                                        sml;
+                                                                        count = 0;
 
                                                                 data.addColumn('string', _wpThemeSettings.l10n.date);
@@ -121 +120 @@
                                                                 });
 
-                                                                sml = data.getNumberOfRows() < 225;
-
                                                                 new google.visualization.ColumnChart(document.getElementById('theme-download-stats-<?php echo esc_attr( $theme->slug ); ?>')).draw(data, {
                                                                         colors: ['#253578'],
@@ -132 +129 @@
                                                                         chartArea: {
                                                                                 height: 280,
-                                                                                left: sml ? 30 : 0,
-                                                                                width: sml ? '80%' : '100%'
+                                                                                left: 35,
+                                                                                width: '98%'
                                                                         },
                                                                         hAxis: {
@@ -140 +137 @@
                                                                         vAxis: {
                                                                                 format: '###,###',
-                                                                                textPosition: sml ? 'out' : 'in',
+                                                                                textPosition: 'out',
                                                                                 viewWindowMode: 'explicit',
                                                                                 viewWindow: {min: 0}

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js

@@ -244 +244 @@
                         var self = this;
 
-                        $.getJSON( 'https://api.wordpress.org/stats/themes/1.0/downloads.php?slug=' + self.model.get( 'id' ) + '&limit=230&callback=?', function( downloads ) {
+                        $.getJSON( 'https://api.wordpress.org/stats/themes/1.0/downloads.php?slug=' + self.model.get( 'id' ) + '&limit=730&callback=?', function( downloads ) {
                                 var data = new google.visualization.DataTable(),
-                                        count = 0,
-                                        sml;
+                                        count = 0;
 
                                 data.addColumn('string', _wpThemeSettings.l10n.date);
@@ -258 +257 @@
                                         count++;
                                 });
-
-                                sml = data.getNumberOfRows() < 225;
 
                                 new google.visualization.ColumnChart(document.getElementById('theme-download-stats-' + self.model.get( 'id' ) )).draw(data, {
@@ -270 +267 @@
                                         chartArea: {
                                                 height: 280,
-                                                left: sml ? 30 : 0,
-                                                width: sml ? '80%' : '100%'
+                                                left: 35,
+                                                width: '98%'
                                         },
                                         hAxis: {
@@ -278 +275 @@
                                         vAxis: {
                                                 format: '###,###',
-                                                textPosition: sml ? 'out' : 'in',
+                                                textPosition: 'out',
                                                 viewWindowMode: 'explicit',
                                                 viewWindow: {min: 0}