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

merge changes from pandora

Browse source
This commit is contained in:
j 2010-09-10 12:09:21 +02:00
commit afa4e9c584
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/backend/models.py
View file

@ -189,7 +189,7 @@ class Movie(models.Model):
poster = {} poster = {}
poster['width'] = self.poster_width poster['width'] = self.poster_width
poster['height'] = self.poster_height poster['height'] = self.poster_height
poster['url'] = '/poster/%s.jpg' % self.movieId poster['url'] = '/%s/poster.jpg' % self.movieId
''' '''
if self.poster: if self.poster:
poster['url'] = self.poster.url poster['url'] = self.poster.url

2
pandora/backend/views.py
View file

@ -569,6 +569,8 @@ def poster(request, id, size=128):
else: else:
poster_path = movie.poster.path poster_path = movie.poster.path
else: else:
if not size: size='large'
return redirect('http:///0xdb.org/%s/poster.%s.jpg' % (movie.movieId, size))
poster_path = os.path.join(settings.STATIC_ROOT, 'png/posterDark.48.png') poster_path = os.path.join(settings.STATIC_ROOT, 'png/posterDark.48.png')
return HttpFileResponse(poster_path, content_type='image/jpeg') return HttpFileResponse(poster_path, content_type='image/jpeg')

10
pandora/static/js/pandora.js
View file

@ -490,8 +490,7 @@ app.constructInfo = function() {
app.constructList = function(view) { app.constructList = function(view) {
var $list, var $list,
info = $.inArray(app.user.ui.sort[0].key, ['title', 'director']) > -1 ? 'year' : app.user.ui.sort[0].key, keys = ['director', 'id', 'poster', 'title', 'year'];
keys = Ox.unique(['director', 'id', 'poster', 'title', info]);
Ox.print('constructList', view); Ox.print('constructList', view);
if (view == 'list' || view == 'calendar') { if (view == 'list' || view == 'calendar') {
$list = new Ox.TextList({ $list = new Ox.TextList({
@ -520,7 +519,7 @@ app.constructList = function(view) {
return { return {
height: data.poster.height || 128, // fixme: remove later height: data.poster.height || 128, // fixme: remove later
id: data['id'], id: data['id'],
info: data[info], info: data[['title', 'director'].indexOf(sort[0].key) > -1 ? 'year' : sort[0].key],
title: data.title + (data.director ? ' (' + data.director + ')' : ''), title: data.title + (data.director ? ' (' + data.director + ')' : ''),
url: data.poster.url.replace(/jpg$/, size + '.jpg'), url: data.poster.url.replace(/jpg$/, size + '.jpg'),
width: data.poster.width || 80 // fixme: remove later width: data.poster.width || 80 // fixme: remove later
@ -528,6 +527,7 @@ app.constructList = function(view) {
}, },
keys: keys, keys: keys,
request: function(options) { request: function(options) {
Ox.print('options, Query.toObject', options, app.Query.toObject())
app.request('find', $.extend(options, { app.request('find', $.extend(options, {
query: app.Query.toObject() query: app.Query.toObject()
}), options.callback); }), options.callback);
@ -908,12 +908,12 @@ app.constructMainMenu = function() {
app.$ui.findSelect.selectItem(id); app.$ui.findSelect.selectItem(id);
} else if (data.id == 'ordermovies') { } else if (data.id == 'ordermovies') {
var id = data.checked[0].id; var id = data.checked[0].id;
app.$ui.list.sort(user.ui.sort[0].key, id == 'ascending' ? '' : '-'); app.$ui.list.sortList(user.ui.sort[0].key, id == 'ascending' ? '' : '-');
} else if (data.id == 'sortmovies') { } else if (data.id == 'sortmovies') {
var id = data.checked[0].id, var id = data.checked[0].id,
operator = Ox.getObjectById(app.config.sortKeys, id).operator; operator = Ox.getObjectById(app.config.sortKeys, id).operator;
app.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending')); app.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending'));
app.$ui.list.sort(id, operator); app.$ui.list.sortList(id, operator);
} }
}, },
click: function(event, data) { click: function(event, data) {

6
pandora/templates/pandora.json
View file

@ -108,7 +108,7 @@
"itemView": "info", "itemView": "info",
"listQuery": {"conditions": [], "operator": ""}, "listQuery": {"conditions": [], "operator": ""},
"listsSize": 192, "listsSize": 192,
"listView": "list", "listView": "icons",
"sections": ["history", "lists", "public", "featured"], "sections": ["history", "lists", "public", "featured"],
"showGroups": true, "showGroups": true,
"showInfo": true, "showInfo": true,
@ -119,6 +119,6 @@
], ],
"theme": "classic" "theme": "classic"
}, },
"name": "" "username": ""
} }
} }