fix stuff

This commit is contained in:
j 2016-08-09 16:07:23 +02:00
parent b28087d8e7
commit a620a8e384
2 changed files with 5 additions and 18 deletions

View file

@ -93,7 +93,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
text of clips (in grid view, below the icon). Excluding a layer from this text of clips (in grid view, below the icon). Excluding a layer from this
list means it will not be included in find annotations. list means it will not be included in find annotations.
*/ */
"clipLayers": ["publicnotes", "keywords", "subtitles"], "clipLayers": ["notes", "keywords", "subtitles"],
/* /*
"entities" can be used to store arbitrary data. They can be referenced in "entities" can be used to store arbitrary data. They can be referenced in
annotations, info view, or elsewhere. Each entry defines a specific class annotations, info view, or elsewhere. Each entry defines a specific class
@ -338,7 +338,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"find": true "find": true
}, },
{ {
"id": "publicnotes", "id": "notes",
"title": "Notes", "title": "Notes",
"type": "layer", "type": "layer",
"find": true "find": true

View file

@ -28,7 +28,7 @@ pandora.ui.infoView = function(data) {
}).map(function(key){ }).map(function(key){
return key.id; return key.id;
}), }),
posterKeys = nameKeys.concat(['title', 'year']), posterKeys = nameKeys.concat(['title', 'date']),
statisticsWidth = 128, statisticsWidth = 128,
$bar = Ox.Bar({size: 16}) $bar = Ox.Bar({size: 16})
@ -223,10 +223,9 @@ pandora.ui.infoView = function(data) {
) )
.appendTo($text); .appendTo($text);
// Director, Year and Country ---------------------------------------------- // Director, Date and Country ----------------------------------------------
renderGroup(['director', 'year', 'country', 'runtime', 'format']);
renderGroup(['director', 'date', 'country']);
// Summary ----------------------------------------------------------------- // Summary -----------------------------------------------------------------
@ -262,12 +261,6 @@ pandora.ui.infoView = function(data) {
.appendTo($text); .appendTo($text);
} }
$('<div>')
.addClass('OxSelectable')
.css(css)
.html('<a target="blank" href="http://www.cinenova.org/filmdetail.php?filmId=' + data.cinenova + '">cinenova.org</a>')
.appendTo($text);
// Duration, Aspect Ratio -------------------------------------------------- // Duration, Aspect Ratio --------------------------------------------------
['duration', 'aspectratio'].forEach(function(key) { ['duration', 'aspectratio'].forEach(function(key) {
@ -430,12 +423,6 @@ pandora.ui.infoView = function(data) {
var ret; var ret;
if (key == 'year') { if (key == 'year') {
ret = formatLink(value, 'year'); ret = formatLink(value, 'year');
} else if (key == 'runtime') {
if(value < 60) {
ret = Math.round(data[key]) + '&nbsp;sec';
} else {
ret = Math.round(data[key] / 60) + '&nbsp;min';
}
} else if (nameKeys.indexOf(key) > -1) { } else if (nameKeys.indexOf(key) > -1) {
ret = formatLink(value.split(', '), 'name'); ret = formatLink(value.split(', '), 'name');
} else if (listKeys.indexOf(key) > -1) { } else if (listKeys.indexOf(key) > -1) {