0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

support new themes, plus patch for legacy themes

Browse source
This commit is contained in:
rolux 2013-02-10 17:22:31 +05:30
parent caa52211a1
commit 3b44e38e14
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
static/js/pandora.js
View file

@ -34,8 +34,11 @@ appPanel
enableDebugMode = localStorage && localStorage['pandora.enableDebugMode'], enableDebugMode = localStorage && localStorage['pandora.enableDebugMode'],
enableEventLogging = localStorage && localStorage['pandora.enableEventLogging'], enableEventLogging = localStorage && localStorage['pandora.enableEventLogging'],
isMSIE = /MSIE/.test(navigator.userAgent), isMSIE = /MSIE/.test(navigator.userAgent),
legacyThemes = {classic: 'oxlight', modern: 'oxdark'},
theme = localStorage && localStorage['Ox.theme'] theme = localStorage && localStorage['Ox.theme']
&& JSON.parse(localStorage['Ox.theme']) || 'modern'; && JSON.parse(localStorage['Ox.theme']) || 'oxmedium';
theme = legacyThemes[theme] || theme;
loadImages(function(images) { loadImages(function(images) {
loadScreen(images); loadScreen(images);
@ -107,15 +110,16 @@ appPanel
gradient.style.width = '322px'; gradient.style.width = '322px';
gradient.style.height = '162px'; gradient.style.height = '162px';
gradient.style.margin = 'auto'; gradient.style.margin = 'auto';
gradient.style.background = theme == 'classic' gradient.style.background = theme == 'oxlight' ? '-moz-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
? '-moz-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' : theme == 'oxmedium' ? '-moz-linear-gradient(top, rgba(144, 144, 144, 0.75), rgba(144, 144, 144, 1), rgba(144, 144, 144, 1))'
: '-moz-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; : '-moz-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
gradient.style.background = theme == 'classic' gradient.style.background = theme == 'oxlight' ? '-o-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))'
? '-o-linear-gradient(top, rgba(224, 224, 224, 0.75), rgba(224, 224, 224, 1), rgba(224, 224, 224, 1))' : theme == 'oxmedium' ? '-o-linear-gradient(top, rgba(144, 144, 144, 0.75), rgba(144, 144, 144, 1), rgba(144, 144, 144, 1))'
: '-o-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))'; : '-o-linear-gradient(top, rgba(32, 32, 32, 0.75), rgba(32, 32, 32, 1), rgba(32, 32, 32, 1))';
gradient.style.background = theme == 'classic' 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))'
? '-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))'; : '-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'); var loadingScreen = document.createElement('div');
loadingScreen.setAttribute('id', 'loadingScreen'); loadingScreen.setAttribute('id', 'loadingScreen');
@ -123,8 +127,8 @@ appPanel
loadingScreen.style.position = 'absolute'; loadingScreen.style.position = 'absolute';
loadingScreen.style.width = '100%'; loadingScreen.style.width = '100%';
loadingScreen.style.height = '100%'; loadingScreen.style.height = '100%';
loadingScreen.style.backgroundColor = theme == 'classic' loadingScreen.style.backgroundColor = theme == 'oxlight' ? 'rgb(224, 224, 224)'
? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)'; : theme == 'oxmedium' ? 'rgb(144, 144, 144)' : 'rgb(32, 32, 32)';
loadingScreen.style.zIndex = '1002'; loadingScreen.style.zIndex = '1002';
loadingScreen.appendChild(images.logo); loadingScreen.appendChild(images.logo);
images.reflection && loadingScreen.appendChild(images.reflection); images.reflection && loadingScreen.appendChild(images.reflection);
@ -234,6 +238,8 @@ appPanel
delete pandora.user.ui[key]; delete pandora.user.ui[key];
} }
}); });
// patch theme ... this can be removed at a later point
pandora.user.ui.theme = legacyThemes[pandora.user.ui.theme] || pandora.user.ui.theme;
// patch itemView ... this can be removed at a later point // patch itemView ... this can be removed at a later point
if (pandora.user.ui.itemView == 'video') { if (pandora.user.ui.itemView == 'video') {
pandora.user.ui.itemView = 'player'; pandora.user.ui.itemView = 'player';

7
static/js/pandora/mainMenu.js
View file

@ -119,10 +119,9 @@ pandora.ui.mainMenu = function() {
{ id: 'entervideofullscreen', title: 'Enter Video Fullscreen', disabled: !ui.item || ui.itemView != 'player' }, { id: 'entervideofullscreen', title: 'Enter Video Fullscreen', disabled: !ui.item || ui.itemView != 'player' },
{}, {},
{ id: 'theme', title: 'Theme', items: [ { id: 'theme', title: 'Theme', items: [
{ group: 'settheme', min: 1, max: 1, items: [ { group: 'settheme', min: 1, max: 1, items: pandora.site.themes.map(function(theme) {
{ id: 'classic', title: 'Light', checked: ui.theme == 'classic'}, return {id: theme, title: Ox.Theme.getThemeData(theme).themeName, checked: ui.theme == theme}
{ id: 'modern', title: 'Dark', checked: ui.theme == 'modern' } }) }
]}
] } ] }
]}, ]},
getSortMenu(), getSortMenu(),