From e8e9458fced921238b2df18730ed4c253e17c959 Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 20 Mar 2012 12:56:30 +0100 Subject: [PATCH] the ui pref is 'showSitePosters', not 'showSitePoster' --- static/js/pandora/browser.js | 4 ++-- static/js/pandora/infoView.js | 12 ++++++------ static/js/pandora/infoView.padma.js | 2 +- static/js/pandora/list.js | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/static/js/pandora/browser.js b/static/js/pandora/browser.js index ba55d5cba..1222b9a85 100644 --- a/static/js/pandora/browser.js +++ b/static/js/pandora/browser.js @@ -57,10 +57,10 @@ pandora.ui.browser = function() { size = size || 64; var ui = pandora.user.ui, ratio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1, url = '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + '128.jpg', format, info, sortKey = sort[0].key; if (['title', 'director', 'random'].indexOf(sortKey) > -1) { diff --git a/static/js/pandora/infoView.js b/static/js/pandora/infoView.js index 6e2da9722..ba4f10040 100644 --- a/static/js/pandora/infoView.js +++ b/static/js/pandora/infoView.js @@ -14,7 +14,7 @@ pandora.ui.infoView = function(data) { WebkitUserSelect: 'text' }, iconRatio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1, iconSize = ui.infoIconSize, iconWidth = iconRatio > 1 ? iconSize : Math.round(iconSize * iconRatio), iconHeight = iconRatio < 1 ? iconSize : Math.round(iconSize / iconRatio), @@ -60,7 +60,7 @@ pandora.ui.infoView = function(data) { .attr({ src: '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + '512.jpg?' + uid }) .css({ @@ -93,7 +93,7 @@ pandora.ui.infoView = function(data) { .attr({ src: '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + '512.jpg?' + uid }) .css({ @@ -727,7 +727,7 @@ pandora.ui.infoView = function(data) { if ($browserImages.length == 0) { $browserImages = pandora.$ui.browser.find('img[src*="/' + data.id + '/"]'); } - if (ui.icons == 'posters' && !ui.showSitePoster) { + if (ui.icons == 'posters' && !ui.showSitePosters) { $browserImages.each(function() { var $this = $(this), size = Math.max($this.width(), $this.height()); @@ -852,13 +852,13 @@ pandora.ui.infoView = function(data) { that.reload = function() { var src = src = '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + '512.jpg?' + Ox.uid() $icon.attr({src: src}); $reflectionIcon.attr({src: src}); iconSize = iconSize == 256 ? 512 : 256; iconRatio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1; + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1; toggleIconSize(); pandora.user.level == 'admin' && $list.replaceWith($list = renderList()); }; diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index 11f81c5b8..06988d405 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -733,7 +733,7 @@ pandora.ui.infoView = function(data) { $reflectionIcon.attr({src: src}); iconSize = iconSize == 256 ? 512 : 256; iconRatio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1; + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1; toggleIconSize(); }; diff --git a/static/js/pandora/list.js b/static/js/pandora/list.js index 4e472047c..166ffb2bf 100644 --- a/static/js/pandora/list.js +++ b/static/js/pandora/list.js @@ -122,10 +122,10 @@ pandora.ui.list = function() { item: function(data, sort, size) { var ui = pandora.user.ui, ratio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1, url = '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + size + '.jpg', format, info, sortKey = sort[0].key; if (['title', 'director', 'random'].indexOf(sortKey) > -1) { @@ -175,10 +175,10 @@ pandora.ui.list = function() { size = 128; var ui = pandora.user.ui, ratio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1, url = '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + size + '.jpg', format, info, sortKey = sort[0].key; if (['title', 'director'].indexOf(sortKey) > -1) { @@ -255,10 +255,10 @@ pandora.ui.list = function() { isClipsQuery = !!clipsQuery.conditions.length, ui = pandora.user.ui, ratio = ui.icons == 'posters' - ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + ? (ui.showSitePosters ? 5/8 : data.posterRatio) : 1, url = '/' + data.id + '/' + ( ui.icons == 'posters' - ? (ui.showSitePoster ? 'siteposter' : 'poster') : 'icon' + ? (ui.showSitePosters ? 'siteposter' : 'poster') : 'icon' ) + size + '.jpg', format, info, sortKey = sort[0].key; if (['title', 'director'].indexOf(sortKey) > -1) {