From 937b8c6b506ccde3ac408ea9c5502fb4810fe626 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 29 Dec 2011 13:42:19 +0100 Subject: [PATCH] padma info view --- pandora/padma.jsonc | 16 +++++- static/js/pandora/infoView.padma.js | 88 +++++++++++++++-------------- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc index 5e662aec..cf8e135c 100644 --- a/pandora/padma.jsonc +++ b/pandora/padma.jsonc @@ -25,7 +25,8 @@ "canSeeDebugMenu": {"staff": true, "admin": true}, "canSeeFiles": {"staff": true, "admin": true}, "canSeeItem": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true} + "canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}, + "canSendMail": {"staff": true, "admin": true} }, /* clipKeys are the properties that clips can by sorted by. @@ -45,6 +46,7 @@ {"id": "collection", "title": "Collection", "type": "string"}, {"id": "source", "title": "Source", "type": "string"}, {"id": "director", "title": "Director", "type": "string"}, + {"id": "cinematographer", "title": "Cinematographer", "type": "string"}, {"id": "places", "title": "Places", "type": "string"}, {"id": "year", "title": "Year", "type": "integer"}, {"id": "language", "title": "Language", "type": "string"}, @@ -101,6 +103,16 @@ "find": true, "sort": "person" }, + { + "id": "cinematographer", + "title": "Cinematographer", + "type": ["string"], + "autocomplete": true, + "columnWidth": 180, + "filter": true, + "find": true, + "sort": "person" + }, { "id": "name", "title": "Name", @@ -491,7 +503,7 @@ "listColumns": ["title", "director", "location", "collection", "language", "duration", "source"], "listColumnWidth": {}, "listSelection": [], - "listSort": [{"key": "director", "operator": "+"}], + "listSort": [{"key": "title", "operator": "+"}], "listView": "grid", "lists": {}, "mapFind": "", diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index 3a8b47bf..f40f0ef9 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -169,7 +169,7 @@ pandora.ui.infoView = function(data) { .appendTo($text); // Director ---------------------------------------------------------------- - +/* if (data.director || isEditable) { $('
') .css({ @@ -202,6 +202,7 @@ pandora.ui.infoView = function(data) { ) .appendTo($text); } +*/ // Country, Year, Language, Runtime ---------------------------------------- /* @@ -249,48 +250,7 @@ pandora.ui.infoView = function(data) { $('
').css(css).html(html.join('; ')).appendTo($text); } */ - $('
').html('
').appendTo($text); - [ - 'language', - 'source', - 'collection', - 'category', - 'user', - 'location', - 'date', - ].forEach(function(key) { - var $div = $('
') - .appendTo($text); - $('
') - .html( - formatKey({ - categorty: 'categories', - user: 'contributor' - }[key] || key).replace('', ' ') - ) - .appendTo($div); - Ox.Editable({ - clickLink: pandora.clickLink, - format: function(value) { - return ['language', 'category'].indexOf(key) >= 0 - ? formatValue(value.split(', '), key) - : value; - }, - placeholder: formatLight('unknown'), - tooltip: 'Doubleclick to edit', - value: ['language', 'category'].indexOf(key) >= 0 - ? (data[key] || []).join(', ') - : data[key] || '' - }) - .bindEvent({ - submit: function(event) { - editMetadata(key, event.value); - } - }) - .appendTo($div); - }); $('
') - .append(formatKey('description')) .append( Ox.Editable({ clickLink: pandora.clickLink, @@ -307,6 +267,50 @@ pandora.ui.infoView = function(data) { ) .appendTo($text); + var list_keys = ['language', 'category', 'director', 'cinematographer']; + $('
').html('
').appendTo($text); + [ + 'date', + 'location', + 'director', + 'cinematographer', + 'language', + 'source', + 'collection', + 'category', + 'user', + ].forEach(function(key) { + var $div = $('
') + .appendTo($text); + $('
') + .html( + formatKey({ + categorty: 'categories', + user: 'contributor' + }[key] || key).replace('', ' ') + ) + .appendTo($div); + Ox.Editable({ + clickLink: pandora.clickLink, + format: function(value) { + return list_keys.indexOf(key) >= 0 + ? formatValue(value.split(', '), key) + : value; + }, + placeholder: formatLight('unknown'), + tooltip: 'Doubleclick to edit', + value: list_keys.indexOf(key) >= 0 + ? (data[key] || []).join(', ') + : data[key] || '' + }) + .bindEvent({ + submit: function(event) { + editMetadata(key, event.value); + } + }) + .appendTo($div); + }); + $('
').css({height: '16px'}).appendTo($text); [ 'created',