From b86f8d73c8bef3c597ee0339c51375000f2c6d51 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 27 Oct 2012 18:57:28 +0200 Subject: [PATCH] users/statistics: add systems/browsers --- static/js/pandora/statisticsDialog.js | 10 +++++++++- static/js/pandora/usersDialog.js | 9 +++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/static/js/pandora/statisticsDialog.js b/static/js/pandora/statisticsDialog.js index 4c264d6c..f56c3d36 100644 --- a/static/js/pandora/statisticsDialog.js +++ b/static/js/pandora/statisticsDialog.js @@ -7,18 +7,26 @@ pandora.ui.statisticsDialog = function() { var colors = { system: { 'Android': [0, 255, 0], + 'BlackBerry': [64, 64, 64], 'BSD': [255, 0, 0], 'iOS': [0, 128, 255], + 'Java': [128, 128, 128], 'Linux': [255, 128, 0], 'Mac OS X': [0, 255, 255], + 'Nokia': [255, 0, 255], + 'PlayStation': [192, 192, 192], 'Unix': [255, 255, 0], 'Windows': [0, 0, 255] }, browser: { - 'Chrome Frame': [255, 255, 0], + 'Camino': [192, 192, 192], 'Chrome': [0, 255, 0], + 'Chrome Frame': [255, 255, 0], + 'Epiphany': [128, 128, 128], 'Firefox': [255, 128, 0], 'Internet Explorer': [0, 0, 255], + 'Konqueror': [64, 64, 64], + 'Nokia Browser': [255, 0, 255], 'Opera': [255, 0, 0], 'Safari': [0, 255, 255], 'WebKit': [0, 255, 128] diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js index eaa8784a..f606d716 100644 --- a/static/js/pandora/usersDialog.js +++ b/static/js/pandora/usersDialog.js @@ -5,16 +5,17 @@ pandora.ui.usersDialog = function() { var browsers = [ - 'Chrome', 'Chrome Frame', 'Firefox', - 'Internet Explorer', 'Opera', 'Safari', 'WebKit' + 'Camino', 'Chrome', 'Chrome Frame', 'Epiphany', 'Firefox', + 'Internet Explorer', 'Konqueror', 'Nokia Browser', 'Opera', + 'Safari', 'WebKit' ], dialogHeight = Math.round((window.innerHeight - 48) * 0.9), dialogWidth = Math.round(window.innerWidth * 0.9), formWidth = 256, numberOfUsers = 0, systems = [ - 'Android', 'BSD', 'iOS', 'Linux', - 'Mac OS X', 'Unix', 'Windows' + 'Android', 'BlackBerry', 'BSD', 'iOS', 'Java', 'Linux', 'Mac OS X', + 'Nokia', 'PlayStation', 'Unix', 'Windows' ], userLevels = pandora.site.userLevels.map(function(userLevel) { return Ox.toTitleCase(userLevel);