diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js index 7ef9e224c..ee207a684 100644 --- a/static/js/pandora/ui/list.js +++ b/static/js/pandora/ui/list.js @@ -145,11 +145,14 @@ pandora.ui.list = function() { var ui = pandora.user.ui, ratio = ui.icons == 'posters' ? (ui.showSitePoster ? 5/8 : data.posterRatio) : 1, + info = ['hue', 'saturation', 'lightness'].indexOf(sort[0].key) > -1 + ? Ox.formatColor(data[sort[0].key], sort[0].key) + : data[['title', 'director'].indexOf(sort[0].key) > -1 ? 'year' : sort[0].key]; size = size || 128; return { height: Math.round(ratio <= 1 ? size : size / ratio), id: data.id, - info: data[['title', 'director'].indexOf(sort[0].key) > -1 ? 'year' : sort[0].key], + info: info, title: data.title + (data.director.length ? ' (' + data.director.join(', ') + ')' : ''), url: '/' + data.id + '/' + ( ui.icons == 'posters' @@ -230,11 +233,18 @@ pandora.ui.list = function() { var ratio = data.videoRatio, width = ratio > fixedRatio ? size : Math.round(size * ratio / fixedRatio), height = Math.round(width / ratio), - url = '/' + data.id.split('/')[0] + '/' + height + 'p' + data['in'] + '.jpg'; + url = '/' + data.id.split('/')[0] + '/' + height + 'p' + data['in'] + '.jpg', + sortKey = sort[0].key.split(':').pop(), + info = ['hue', 'saturation', 'lightness'].indexOf(sortKey) > -1 + ? Ox.formatColor(data[sort[0].key], sortKey) + : data[['title', 'director'].indexOf(sort[0].key) > -1 ? 'year' : sort[0].key]; return { height: height, id: data.id, - info: Ox.formatDuration(data['in'], 'short') + ' - ' + Ox.formatDuration(data['out'], 'short'), + info: sort[0].key == 'clip:hue' ? Ox.formatColor(data['hue'], 'hue') + : sort[0].key == 'clip:saturation' ? Ox.formatColor(data['saturation'], 'saturation') + : sort[0].key == 'clip:lightness' ? Ox.formatColor(data['lightness'], 'lightness') + : Ox.formatDuration(data['in'], 'short') + ' - ' + Ox.formatDuration(data['out'], 'short'), title: data.value, url: url, width: width diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js index 4f03673fc..55a64299c 100644 --- a/static/js/pandora/ui/menu.js +++ b/static/js/pandora/ui/menu.js @@ -263,6 +263,7 @@ pandora.ui.mainMenu = function() { { id: 'newlistfromselection', title: 'New List from Selection...', disabled: true, keyboard: 'shift control n' }, { id: 'newsmartlist', title: 'New Smart List...', keyboard: 'alt control n' }, { id: 'newsmartlistfromresults', title: 'New Smart List from Results...', keyboard: 'shift alt control n' }, + { id: 'duplicatelist', title: 'Duplicate Selected List', keyboard: 'control d' }, {}, { id: 'addmovietolist', title: ['Add Selected ' + pandora.site.itemName.singular + ' to List...', 'Add Selected ' + pandora.site.itemName.plural + ' to List...'], disabled: true }, {},