0x2620/pandora_erg
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
rlx 2019-11-19 18:06:21 +01:00
commit e8995ea46c
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
config.jsonc
View file

@ -551,14 +551,18 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"sort": true
},
{
"id": "summary",
"title": "Topic",
"type": "text",
"find": true
"id": "genre",
"title": "Genre",
"type": ["string"],
"autocomplete": true,
"columnWidth": 120,
"filter": true,
"find": true,
"sort": true
},
{
"id": "topic",
"title": "Topic",
"id": "section",
"title": "Section",
"type": ["string"],
"autocomplete": true,
"columnWidth": 180,
@ -566,6 +570,12 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"find": true,
"sort": true
},
{
"id": "summary",
"title": "Summary",
"type": "text",
"find": true
},
{
"id": "notes",
"title": "Notes",
@ -643,8 +653,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"find": true
},
{
"id": "runtime",
"title": "Runtime",
"id": "duration",
"title": "Duration",
"type": "time",
"columnWidth": 90,
"format": {"type": "duration", "args": []},
@ -772,13 +782,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"sort": true,
"value": {"key": "files", "type": "length"}
},
{
"id": "filename",
"title": "Filename",
"type": ["string"],
"capability": "canSeeMedia",
"find": true
},
{
"id": "created",
"title": "Date Created",
@ -1176,7 +1179,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
{"id": "director", "sort": [{"key": "items", "operator": "-"}]},
{"id": "country", "sort": [{"key": "items", "operator": "-"}]},
{"id": "year", "sort": [{"key": "name", "operator": "-"}]},
{"id": "topic", "sort": [{"key": "items", "operator": "-"}]},
{"id": "section", "sort": [{"key": "items", "operator": "-"}]},
{"id": "keywords", "sort": [{"key": "items", "operator": "-"}]}
],
"filtersSize": 176,

4
static/js/infoView.erg.js
View file

@ -319,7 +319,7 @@ pandora.ui.infoView = function(data, isMixed) {
// Duration, Aspect Ratio --------------------------------------------------
if (!isMultiple) {
if (!isMultiple && data.parts && data.rendered) {
['duration', 'aspectratio'].forEach(function(key) {
var itemKey = Ox.getObjectById(pandora.site.itemKeys, key),
value = data[key] || 0;
@ -394,7 +394,7 @@ pandora.ui.infoView = function(data, isMixed) {
.append(
Ox.EditableContent({
height: 128,
placeholder: formatLight(Ox._(isMixed ? 'Mixed notes' : 'No notes')),
placeholder: formatLight(Ox._(isMixed.notes ? 'Mixed notes' : 'No notes')),
tooltip: pandora.getEditTooltip(),
type: 'textarea',
value: data.notes || '',