diff --git a/pandora/backend/views.py b/pandora/backend/views.py index 5e2e14789..730469cb0 100644 --- a/pandora/backend/views.py +++ b/pandora/backend/views.py @@ -565,7 +565,7 @@ def poster(request, id, size=None): poster_path = movie.poster.path else: if not size: size='large' - return redirect('http:///0xdb.org/%s/poster.%s.jpg' % (movie.movieId, size)) + return redirect('http://0xdb.org/%s/poster.%s.jpg' % (movie.movieId, size)) poster_path = os.path.join(settings.STATIC_ROOT, 'png/posterDark.48.png') return HttpFileResponse(poster_path, content_type='image/jpeg') diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 8db2bf3bf..1f9a6b4dd 100755 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -3,11 +3,9 @@ ***/ var app = new Ox.App({ + apiURL: '/api/', config: '/pandora.json', init: 'hello', - id: site.id, - name: site.name, - requestURL: '/api/' }).launch(function(data) { Ox.print('data', data) app.config = data.config; @@ -599,7 +597,7 @@ app.constructList = function(view) { app.$ui.previewDialog.resize(dialogWidth, dialogHeight, function() { app.$ui.previewImage .attr({ - src: item.poster.url.replace(/jpg/, 'large.jpg'), + src: item.poster.url }) .one('load', function() { app.$ui.previewImage @@ -618,7 +616,7 @@ app.constructList = function(view) { } else { app.$ui.previewImage = $('') .attr({ - src: item.poster.url.replace(/jpg/, 'large.jpg') + src: item.poster.url }) .css({ position: 'absolute', @@ -797,7 +795,7 @@ app.constructMainMenu = function() { ], id: 'mainMenu', menus: [ - { id: app.options('id') + 'Menu', title: app.options('name'), items: [ + { id: app.config.site.id + 'Menu', title: app.config.site.name, items: [ { id: 'about', title: 'About' }, {}, { id: 'home', title: 'Home Screen' }, diff --git a/pandora/templates/pandora.json b/pandora/templates/pandora.json index dfadac5cf..02196e0ae 100644 --- a/pandora/templates/pandora.json +++ b/pandora/templates/pandora.json @@ -1,7 +1,4 @@ { - "name": "{{settings.SITENAME}}", - "id": "{{settings.SITEID}}", - "url": "{{settings.URL}}", "findKeys": [ {"id": "all", "title": "All"}, {"id": "title", "title": "Title", "autocomplete": true}, @@ -43,6 +40,11 @@ {"id": "map", "title": "on Map"}, {"id": "calendar", "title": "on Calendar"} ], + "site": { + "name": "{{settings.SITENAME}}", + "id": "{{settings.SITEID}}", + "url": "{{settings.URL}}" + }, "sections": [ {"id": "history", "title": "History"}, {"id": "lists", "title": "My Lists"}, @@ -90,7 +92,8 @@ {"id": "files", "title": "Files", "operator": "-", "align": "right", "width": 60}, {"id": "filename", "title": "Filename", "operator": "", "align": "left", "width": 180}, {"id": "published", "title": "Date Published", "operator": "-", "align": "left", "width": 90}, - {"id": "modified", "title": "Date Modified", "operator": "-", "align": "left", "width": 90} + {"id": "modified", "title": "Date Modified", "operator": "-", "align": "left", "width": 90}, + {"id": "popularity", "title": "Popularity", "operator": "-", "align": "left", "width": 60} ], "totals": [ {"id": "items"},