From 3d84bc7d0b6fff4eb5d2001751649d91058563e5 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Sun, 10 Feb 2013 18:08:39 +0530
Subject: [PATCH] remove hardcoded references to classic theme

---
 static/js/pandora.js                  |  1 -
 static/js/pandora/home.padma.js       |  5 +++--
 static/js/pandora/news.js             |  4 ++--
 static/js/pandora/statisticsDialog.js | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/static/js/pandora.js b/static/js/pandora.js
index 6a47aae55..05dc6961b 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -119,7 +119,6 @@ appPanel
             gradient.style.background = theme == 'oxlight' ? '-webkit-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
                 : theme == 'oxmedium' ? '-webkit-linear-gradient(top, rgba(144, 144, 144, 0.75), rgba(144, 144, 144, 1), rgba(144, 144, 144, 1))'
                 : '-webkit-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
-
         }
         var loadingScreen = document.createElement('div');
         loadingScreen.setAttribute('id', 'loadingScreen');
diff --git a/static/js/pandora/home.padma.js b/static/js/pandora/home.padma.js
index 8f65a24a9..358facb45 100644
--- a/static/js/pandora/home.padma.js
+++ b/static/js/pandora/home.padma.js
@@ -261,8 +261,9 @@ pandora.ui.home = function() {
         }, function(result) {
             var lists = result.data.items,
                 counter = 0, items = 8, mouse = false, position = 0, selected = 0,
-                color = Ox.Theme() == 'classic'
-                    ? 'rgb(32, 32, 32)' : 'rgb(224, 224, 224)',
+                color = Ox.Theme() == 'oxlight' ? 'rgb(32, 32, 32)'
+                    : Ox.Theme() == 'oxmedium' ? 'rgb(144, 144, 144)'
+                    : 'rgb(224, 224, 224)',
                 $label, $icon, $text,
                 $listsBox, $listsContainer, $listsContent,
                 $listBox = [], $listIcon = [],
diff --git a/static/js/pandora/news.js b/static/js/pandora/news.js
index 997d943b2..d7031f6e9 100644
--- a/static/js/pandora/news.js
+++ b/static/js/pandora/news.js
@@ -9,8 +9,8 @@ pandora.ui.news = function(width, height) {
         $right = $('<div>')
             .css({position: 'absolute', top: '16px', right: '16px', width: '192px'})
             .appendTo(that),
-        backgroundColor = Ox.Theme() == 'classic'
-            ? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)',        
+        backgroundColor = Ox.Theme() == 'oxlight' ? 'rgb(224, 224, 224)'
+            : Ox.Theme() == 'oxmedium' ? 'rgb(128, 128, 128)' : 'rgb(32, 32, 32)',        
         isEditable = pandora.site.capabilities.canEditSitePages[pandora.user.level],
         items = [],
         selected,
diff --git a/static/js/pandora/statisticsDialog.js b/static/js/pandora/statisticsDialog.js
index 37c76f283..9e82f6091 100644
--- a/static/js/pandora/statisticsDialog.js
+++ b/static/js/pandora/statisticsDialog.js
@@ -290,8 +290,8 @@ pandora.ui.statisticsDialog = function() {
                         .css({
                             padding: '16px',
                             overflowY: 'auto',
-                            background: pandora.user.ui.theme == 'classic'
-                                ? 'rgb(240, 240, 240)'
+                            background: pandora.user.ui.theme == 'oxlight' ? 'rgb(240, 240, 240)'
+                                : pandora.user.ui.theme == 'oxmedium' ? 'rgb(160, 160, 160)'
                                 : 'rgb(16, 16, 16)' 
                         });
                 if (id == 'seen') {
@@ -306,7 +306,7 @@ pandora.ui.statisticsDialog = function() {
                                                 ) : Ox.rgb(
                                                     (Math.abs(11.5 - parseInt(split[0], 10)) - 0.5) * -11, 1, 0.5
                                                 );
-                                        if (pandora.user.ui.theme == 'classic') {
+                                        if (pandora.user.ui.theme == 'oxlight') {
                                             color = getColor(color);
                                         }
                                         return color;
@@ -359,7 +359,7 @@ pandora.ui.statisticsDialog = function() {
                                     var color = Ox.getGeoColor(
                                         key == 'continent' ? value : value.split(', ')[1]
                                     );
-                                    if (pandora.user.ui.theme == 'classic') {
+                                    if (pandora.user.ui.theme == 'oxlight') {
                                         color = getColor(color);
                                     }
                                     return color;
@@ -448,7 +448,7 @@ pandora.ui.statisticsDialog = function() {
                                     color: function(value) {
                                         var name = version ? getName(key, value) : value,
                                             color = colors[key][name];
-                                        if (pandora.user.ui.theme == 'classic') {
+                                        if (pandora.user.ui.theme == 'oxlight') {
                                             color = getColor(color);
                                         }
                                         return color;
@@ -516,7 +516,7 @@ pandora.ui.statisticsDialog = function() {
                                     })).map(function(c) {
                                         return Math.round(Ox.sum(c) / 2);
                                     });
-                                if (pandora.user.ui.theme == 'classic') {
+                                if (pandora.user.ui.theme == 'oxlight') {
                                     color = getColor(color);
                                 }
                                 return color;