0x2620/pandora_mdr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git.0x2620.org:/pandora_mdr

Browse source
This commit is contained in:
Rolux 2015-09-21 20:10:37 +01:00
commit d0769bafaf
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.jsonc
View file

@ -671,6 +671,8 @@
"id": "keywords", "id": "keywords",
"title": "Keywords", "title": "Keywords",
"canAddAnnotations": {"member": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"hasEvents": true,
"hasPlaces": true,
"item": "Keyword", "item": "Keyword",
"autocomplete": true, "autocomplete": true,
"overlap": true, "overlap": true,
@ -680,6 +682,8 @@
"id": "notes", "id": "notes",
"title": "Notes", "title": "Notes",
"canAddAnnotations": {"member": true, "friend": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "friend": true, "staff": true, "admin": true},
"hasEvents": true,
"hasPlaces": true,
"item": "Note", "item": "Note",
"overlap": true, "overlap": true,
"showInfo": true, "showInfo": true,

6
static/js/infoView.mdr.js
View file

@ -23,6 +23,7 @@ pandora.ui.infoView = function(data) {
'writer', 'producer', 'featuring' 'writer', 'producer', 'featuring'
], ],
listKeys = nameKeys.concat(['language', 'themes', 'groups']), listKeys = nameKeys.concat(['language', 'themes', 'groups']),
posterKeys = nameKeys.concat(['title', 'date', 'collection']),
statisticsWidth = 128, statisticsWidth = 128,
$bar = Ox.Bar({size: 16}) $bar = Ox.Bar({size: 16})
@ -525,6 +526,11 @@ pandora.ui.infoView = function(data) {
} }
pandora.updateItemContext(); pandora.updateItemContext();
pandora.$ui.browser.value(result.data.id, key, result.data[key]); pandora.$ui.browser.value(result.data.id, key, result.data[key]);
if (Ox.contains(posterKeys, key) && ui.icons == 'posters') {
src = pandora.getMediaURL('/' + data.id + '/poster512.jpg?' + Ox.uid());
$icon.attr({src: src});
$reflectionIcon.attr({src: src});
}
pandora.$ui.itemTitle pandora.$ui.itemTitle
.options({ .options({
title: '<b>' + result.data.title title: '<b>' + result.data.title