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

update 0xdb and pad.ma home screens (fixes #1310)

Browse source
This commit is contained in:
rolux 2013-07-10 09:34:40 +02:00
parent 9cd9611306
commit 22f4d8441d
2 changed files with 171 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
static/js/pandora/home.0xdb.js
View file

@ -13,6 +13,7 @@ pandora.ui.home = function() {
opacity: 0, opacity: 0,
zIndex: 1001 zIndex: 1001
}), }),
$reflectionImage = $('<img>') $reflectionImage = $('<img>')
.addClass('logo') .addClass('logo')
.attr({src: '/static/png/logo.png'}) .attr({src: '/static/png/logo.png'})
@ -30,6 +31,7 @@ pandora.ui.home = function() {
WebkitTransform: 'scaleY(-1)' WebkitTransform: 'scaleY(-1)'
}) })
.appendTo(that), .appendTo(that),
$reflectionGradient = $('<div>') $reflectionGradient = $('<div>')
.addClass('OxReflection logo') .addClass('OxReflection logo')
.css({ .css({
@ -44,6 +46,7 @@ pandora.ui.home = function() {
margin: 'auto', margin: 'auto',
}) })
.appendTo(that), .appendTo(that),
$logo = $('<img>') $logo = $('<img>')
.addClass('logo') .addClass('logo')
.attr({ .attr({
@ -66,6 +69,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo(that), .appendTo(that),
$findInput = Ox.Input({ $findInput = Ox.Input({
width: 156 width: 156
}) })
@ -92,6 +96,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo(that), .appendTo(that),
$findButton = Ox.Button({ $findButton = Ox.Button({
title: Ox._('Find'), title: Ox._('Find'),
width: 74 width: 74
@ -125,6 +130,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo(that), .appendTo(that),
$browseButton = Ox.Button({ $browseButton = Ox.Button({
title: Ox._('Browse'), title: Ox._('Browse'),
width: 74 width: 74
@ -147,6 +153,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo(that), .appendTo(that),
$signupButton = Ox.Button({ $signupButton = Ox.Button({
title: Ox._('Sign Up'), title: Ox._('Sign Up'),
width: 74 width: 74
@ -166,6 +173,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$signinButton = Ox.Button({ $signinButton = Ox.Button({
title: Ox._('Sign In'), title: Ox._('Sign In'),
width: 74 width: 74
@ -185,6 +193,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$preferencesButton = Ox.Button({ $preferencesButton = Ox.Button({
title: Ox._('Preferences'), title: Ox._('Preferences'),
width: 156 width: 156
@ -204,6 +213,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$aboutButton = Ox.Button({ $aboutButton = Ox.Button({
title: Ox._('About {0}', [pandora.site.site.name]), title: Ox._('About {0}', [pandora.site.site.name]),
width: 156 width: 156
@ -224,6 +234,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo(that), .appendTo(that),
$text = $('<div>') $text = $('<div>')
.html(Ox._( .html(Ox._(
'A Movie Database. \u2620 2007-{0} 0x2620. All Open Source.', 'A Movie Database. \u2620 2007-{0} 0x2620. All Open Source.',

259
static/js/pandora/home.padma.js
View file

@ -5,6 +5,7 @@
pandora.ui.home = function() { pandora.ui.home = function() {
var self = {}, var self = {},
that = $('<div>') that = $('<div>')
.addClass('OxScreen') .addClass('OxScreen')
.css({ .css({
@ -15,6 +16,7 @@ pandora.ui.home = function() {
overflowY: 'auto', overflowY: 'auto',
zIndex: 1001 zIndex: 1001
}), }),
$box = $('<div>') $box = $('<div>')
.css({ .css({
position: 'absolute', position: 'absolute',
@ -25,6 +27,7 @@ pandora.ui.home = function() {
margin: '0 auto 0 auto' margin: '0 auto 0 auto'
}) })
.appendTo(that), .appendTo(that),
$reflectionImage = $('<img>') $reflectionImage = $('<img>')
.attr({src: '/static/png/logo.png'}) .attr({src: '/static/png/logo.png'})
.css({ .css({
@ -40,6 +43,7 @@ pandora.ui.home = function() {
WebkitTransform: 'scaleY(-1)' WebkitTransform: 'scaleY(-1)'
}) })
.appendTo($box), .appendTo($box),
$reflectionGradient = $('<div>') $reflectionGradient = $('<div>')
.addClass('OxReflection') .addClass('OxReflection')
.css({ .css({
@ -52,6 +56,7 @@ pandora.ui.home = function() {
margin: '0 auto 0 auto', margin: '0 auto 0 auto',
}) })
.appendTo($box), .appendTo($box),
$logo = Ox.Element({ $logo = Ox.Element({
element: '<img>', element: '<img>',
tooltip: Ox._('Enter {0}', [pandora.site.site.name]) tooltip: Ox._('Enter {0}', [pandora.site.site.name])
@ -74,6 +79,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo($box), .appendTo($box),
$findInput = Ox.Input({ $findInput = Ox.Input({
width: 252 width: 252
}) })
@ -100,6 +106,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo($box), .appendTo($box),
$findButton = Ox.Button({ $findButton = Ox.Button({
title: Ox._('Find'), title: Ox._('Find'),
width: 122 width: 122
@ -133,6 +140,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo($box), .appendTo($box),
$browseButton = Ox.Button({ $browseButton = Ox.Button({
title: Ox._('Browse'), title: Ox._('Browse'),
width: 122 width: 122
@ -155,6 +163,7 @@ pandora.ui.home = function() {
} }
}) })
.appendTo($box), .appendTo($box),
$signupButton = Ox.Button({ $signupButton = Ox.Button({
title: Ox._('Sign Up'), title: Ox._('Sign Up'),
width: 122 width: 122
@ -174,6 +183,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$signinButton = Ox.Button({ $signinButton = Ox.Button({
title: Ox._('Sign In'), title: Ox._('Sign In'),
width: 122 width: 122
@ -193,6 +203,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$preferencesButton = Ox.Button({ $preferencesButton = Ox.Button({
title: Ox._('Preferences'), title: Ox._('Preferences'),
width: 252 width: 252
@ -212,6 +223,7 @@ pandora.ui.home = function() {
that.fadeOutScreen(); that.fadeOutScreen();
} }
}), }),
$aboutButton = Ox.Button({ $aboutButton = Ox.Button({
title: Ox._('About {0}', [pandora.site.site.name]), title: Ox._('About {0}', [pandora.site.site.name]),
width: 252 width: 252
@ -232,7 +244,8 @@ pandora.ui.home = function() {
} }
}) })
.appendTo($box), .appendTo($box),
$lists = $('<div>')
$features = $('<div>')
.attr({id: 'lists'}) .attr({id: 'lists'})
.css({ .css({
position: 'absolute', position: 'absolute',
@ -253,30 +266,56 @@ pandora.ui.home = function() {
$preferencesButton.appendTo($box); $preferencesButton.appendTo($box);
} }
function showLists() { function showFeatures() {
pandora.api.findLists({ var $space,
query: { featured = {},
conditions: [{key: 'status', value: 'featured', operator: '=='}], find = {
operator: '&' query: {
conditions: [{key: 'status', value: 'featured', operator: '=='}],
operator: '&'
},
keys: ['description', 'modified', 'name', 'user'],
sort: [{key: 'position', operator: '+'}]
}, },
keys: ['user', 'name', 'description', 'modified'], items, lists, texts;
sort: [{key: 'position', operator: '+'}] pandora.api.findLists(find, function(result) {
}, function(result) { lists = result.data.items.length;
var lists = result.data.items, items = result.data.items.map(function(item) {
counter = 0, items = 8, mouse = false, position = 0, selected = 0, return Ox.extend(item, {type: 'list'});
color = Ox.Theme() == 'oxlight' ? 'rgb(32, 32, 32)' });
: Ox.Theme() == 'oxmedium' ? 'rgb(144, 144, 144)' pandora.api.findTexts(find, function(result) {
: 'rgb(224, 224, 224)', texts = result.data.items.length
items = items.concat(result.data.items.map(function(item) {
return Ox.extend(item, {type: 'text'});
}));
$features.empty();
show();
return;
if (featured.lists.length) {
top += 24;
}
show('texts');
});
});
function show() {
var counter = 0, max = 8, mouse = false, position = 0, selected = 0,
color = Ox.Theme() == 'oxlight' ? 'rgb(0, 0, 0)'
: Ox.Theme() == 'oxmedium' ? 'rgb(0, 0, 0)'
: 'rgb(255, 255, 255)',
$label, $icon, $text, $label, $icon, $text,
$listsBox, $listsContainer, $listsContent, $featuresBox, $featuresContainer, $featuresContent,
$listBox = [], $listIcon = [], $featureBox = [], $featureIcon = [],
$previousButton, $nextButton, $previousButton, $nextButton;
$space; if (items.length) {
$lists.empty();
if (lists.length) {
$label = Ox.Label({ $label = Ox.Label({
textAlign: 'center', textAlign: 'center',
title: '<b>' + Ox.formatCount(lists.length, 'Featured List') + '</b>', title: '<b>' + Ox._('Featured ' + (
lists == 1 && texts == 0 ? 'List'
: lists == 0 && texts == 1 ? 'Text'
: texts == 0 ? 'Lists'
: lists == 0 ? 'Texts'
: 'Lists and Texts'
)) + '</b>',
width: 512 width: 512
}) })
.css({ .css({
@ -287,7 +326,7 @@ pandora.ui.home = function() {
bottom: 0, bottom: 0,
margin: '0 auto 0 auto' margin: '0 auto 0 auto'
}) })
.appendTo($lists); .appendTo($features);
$text = Ox.Label({ $text = Ox.Label({
width: 386 width: 386
}) })
@ -306,18 +345,16 @@ pandora.ui.home = function() {
whiteSpace: 'normal' whiteSpace: 'normal'
}) })
.html( .html(
'<b>' + Ox.encodeHTMLEntities(lists[selected].name) + '</b><br><br>' getHTML(items[selected])
+ lists[selected].description
) )
.appendTo($lists); .appendTo($features);
pandora.createLinks($text); pandora.createLinks($text);
$icon = Ox.Element({ $icon = Ox.Element({
element: '<img>', element: '<img>',
tooltip: Ox._('View List') tooltip: getTooltip(items[selected])
}) })
.attr({ .attr({
src: '/list/' + lists[selected].user + ':' src: getImageURL(items[selected])
+ lists[selected].name + '/icon256.jpg?' + lists[selected].modified
}) })
.css({ .css({
position: 'absolute', position: 'absolute',
@ -332,12 +369,12 @@ pandora.ui.home = function() {
}) })
.bindEvent({ .bindEvent({
anyclick: function() { anyclick: function() {
openList(selected); openItem(selected);
} }
}) })
.appendTo($lists); .appendTo($features);
if (lists.length > 1) { if (items.length > 1) {
$listsBox = $('<div>') $featuresBox = $('<div>')
.css({ .css({
position: 'absolute', position: 'absolute',
left: 0, left: 0,
@ -347,8 +384,8 @@ pandora.ui.home = function() {
width: '560px', // 16+8+512+8+16 width: '560px', // 16+8+512+8+16
margin: '0 auto 0 auto' margin: '0 auto 0 auto'
}) })
.appendTo($lists); .appendTo($features);
$listsContainer = $('<div>') $featuresContainer = $('<div>')
.css({ .css({
position: 'absolute', position: 'absolute',
left: '20px', left: '20px',
@ -357,18 +394,18 @@ pandora.ui.home = function() {
width: '520px', width: '520px',
overflow: 'hidden' overflow: 'hidden'
}) })
.appendTo($listsBox); .appendTo($featuresBox);
$listsContent = $('<div>') $featuresContent = $('<div>')
.css({ .css({
position: 'absolute', position: 'absolute',
width: lists.length * 65 + 'px', width: items.length * 65 + 'px',
height: '65px', height: '65px',
marginLeft: lists.length < items marginLeft: items.length < max
? (items - lists.length) * 65 / 2 + 'px' ? (max - items.length) * 65 / 2 + 'px'
: 0 : 0
}) })
.appendTo($listsContainer); .appendTo($featuresContainer);
if (lists.length > items) { if (items.length > max) {
$previousButton = Ox.Button({ $previousButton = Ox.Button({
title: 'left', title: 'left',
type: 'image' type: 'image'
@ -393,12 +430,12 @@ pandora.ui.home = function() {
} }
} }
}) })
.appendTo($listsBox); .appendTo($featuresBox);
$nextButton = Ox.Button({ $nextButton = Ox.Button({
title: 'right', title: 'right',
type: 'image' type: 'image'
}) })
.addClass(position < lists.length - 1 ? 'visible' : '') .addClass(position < items.length - 1 ? 'visible' : '')
.css({ .css({
position: 'absolute', position: 'absolute',
right: 0, right: 0,
@ -418,8 +455,8 @@ pandora.ui.home = function() {
} }
} }
}) })
.appendTo($listsBox); .appendTo($featuresBox);
$listsBox.on({ $featuresBox.on({
mouseenter: function() { mouseenter: function() {
mouse = true; mouse = true;
$('.visible').show().stop().animate({ $('.visible').show().stop().animate({
@ -441,27 +478,8 @@ pandora.ui.home = function() {
} }
}); });
} }
self.keydown = function(e) { items.forEach(function(item, i) {
var focused = Ox.Focus.focused(), $featureBox[i] = $('<div>')
key = Ox.KEYS[e.keyCode];
if (
focused === null
|| !Ox.UI.elements[focused].hasClass('OxInput')
) {
if (key == 'left' && selected > 0) {
selectList(selected - 1);
} else if (key == 'up' && selected > 0) {
selectList(0);
} else if (key == 'right' && selected < lists.length - 1) {
selectList(selected + 1);
} else if (key == 'down' && selected < lists.length - 1) {
selectList(lists.length - 1);
}
}
};
Ox.$document.on({keydown: self.keydown});
lists.forEach(function(list, i) {
$listBox[i] = $('<div>')
.css({ .css({
float: 'left', float: 'left',
width: '57px', width: '57px',
@ -471,14 +489,14 @@ pandora.ui.home = function() {
borderRadius: '16px', borderRadius: '16px',
boxShadow: '0 0 2px ' + (i == selected ? color : 'transparent') boxShadow: '0 0 2px ' + (i == selected ? color : 'transparent')
}) })
.appendTo($listsContent); .appendTo($featuresContent);
$listIcon[i] = Ox.Element({ $featureIcon[i] = Ox.Element({
element: '<img>', element: '<img>',
tooltip: Ox.encodeHTMLEntities(list.name) tooltip: (lists && texts ? Ox._(Ox.toTitleCase(item.type)) + ': ' : '')
+ Ox.encodeHTMLEntities(item.name)
}) })
.attr({ .attr({
src: '/list/' + list.user + ':' src: getImageURL(item)
+ list.name + '/icon256.jpg?' + list.modified
}) })
.css({ .css({
width: '57px', width: '57px',
@ -488,47 +506,87 @@ pandora.ui.home = function() {
}) })
.bindEvent({ .bindEvent({
doubleclick: function() { doubleclick: function() {
openList(i); openItem(i);
}, },
singleclick: function() { singleclick: function() {
selectList(i); selectItem(i);
} }
}) })
.appendTo($listBox[i]); .appendTo($featureBox[i]);
}); });
self.keydown = function(e) {
var focused = Ox.Focus.focused(),
key = Ox.KEYS[e.keyCode];
if (
focused === null
|| !Ox.UI.elements[focused].hasClass('OxInput')
) {
if (key == 'left' && selected > 0) {
selectItem(selected - 1);
} else if (key == 'up' && selected > 0) {
selectItem(0);
} else if (key == 'right' && selected < items.length - 1) {
selectItem(selected + 1);
} else if (key == 'down' && selected < items.length - 1) {
selectItem(items.length - 1);
}
}
};
Ox.$document.on({keydown: self.keydown});
} }
$space = $('<div>') $space = $('<div>')
.css({ .css({
position: 'absolute', position: 'absolute',
top: lists.length == 0 ? '0px' top: items.length == 0 ? '0px'
: lists.length == 1 ? '150px' : items.length == 1 ? '150px'
: '215px', : '215px',
width: '560px', width: '560px',
height: '80px' height: '80px'
}) })
.appendTo($lists); .appendTo($features);
$lists.animate({opacity: 1}, 250); $features.animate({opacity: 1}, 250);
} }
function openList(i) {
function getHTML(item) {
return '<b>'
+ (lists && texts ? Ox._(Ox.toTitleCase(item.type)) + ': ' : '')
+ Ox.encodeHTMLEntities(item.name) + '</b><br><br>'
+ item.description;
}
function getImageURL(item) {
return '/' + item.type + '/' + item.user
+ ':' + item.name + '/icon256.jpg?' + item.modified;
}
function getTooltip(item) {
return Ox._('View {0}', [Ox._(Ox.toTitleCase(item.type))])
}
function openItem(i) {
that.fadeOutScreen(); that.fadeOutScreen();
pandora.UI.set({ pandora.UI.set(Ox.extend({
page: '', section: items[i].type == 'list' ? 'items' : 'texts',
item: '', page: ''
}, items[i].type == 'list' ? {
find: { find: {
conditions: [{ conditions: [{
key: 'list', key: 'list',
value: lists[i].user + ':' value: items[i].user + ':'
+ lists[i].name, + items[i].name,
operator: '==' operator: '=='
}], }],
operator: '&' operator: '&'
} }
}); } : {
text: items[i].user + ':' + items[i].name
}));
} }
function scrollToPosition(i, animate) { function scrollToPosition(i, animate) {
if (i >= 0 && i <= lists.length - items && i != position) { if (i >= 0 && i <= items.length - max && i != position) {
position = i; position = i;
$listsContent.stop().animate({ $featuresContent.stop().animate({
left: (position * -65) + 'px' left: (position * -65) + 'px'
}, animate ? 250 : 0, function() { }, animate ? 250 : 0, function() {
if (position == 0) { if (position == 0) {
@ -540,7 +598,7 @@ pandora.ui.home = function() {
} else { } else {
$previousButton.addClass('visible'); $previousButton.addClass('visible');
} }
if (position == lists.length - items) { if (position == items.length - max) {
$nextButton.removeClass('visible').stop().animate({ $nextButton.removeClass('visible').stop().animate({
opacity: 0 opacity: 0
}, 250, function() { }, 250, function() {
@ -550,37 +608,38 @@ pandora.ui.home = function() {
$nextButton.addClass('visible'); $nextButton.addClass('visible');
} }
if (mouse) { if (mouse) {
$listsBox.trigger('mouseenter'); $featuresBox.trigger('mouseenter');
} }
}); });
} }
} }
function selectList(i) {
if (i >= 0 && i <= lists.length - 1 && i != selected) { function selectItem(i) {
$listBox[selected].css({ if (i >= 0 && i <= items.length - 1 && i != selected) {
$featureBox[selected].css({
boxShadow: 'none' boxShadow: 'none'
}); });
selected = i; selected = i;
$listBox[selected].css({ $featureBox[selected].css({
boxShadow: '0 0 2px ' + color boxShadow: '0 0 2px ' + color
}); });
if (selected < position) { if (selected < position) {
scrollToPosition(selected, true); scrollToPosition(selected, true);
} else if (selected > position + items - 1) { } else if (selected > position + max - 1) {
scrollToPosition(selected - items + 1, true); scrollToPosition(selected - max + 1, true);
} }
$icon.attr({ $icon.attr({
src: '/list/' + lists[selected].user + ':' src: getImageURL(items[selected])
+ lists[selected].name + '/icon256.jpg?' + lists[selected].modified }).options({
tooltip: getTooltip(items[selected])
}); });
$text.html( $text.html(
'<b>' + Ox.encodeHTMLEntities(lists[selected].name) + '</b><br><br>' getHTML(items[selected])
+ lists[selected].description
); );
} }
} }
});
}
} }
that.fadeInScreen = function() { that.fadeInScreen = function() {