update info view js files and config

This commit is contained in:
rlx 2017-12-15 13:53:01 +00:00
parent cf8d56135f
commit 0f086373a5
3 changed files with 74 additions and 50 deletions

View file

@ -170,18 +170,16 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"type": "string", "type": "string",
"find": true, "find": true,
"sort": true, "sort": true,
"sortType": "title",
"autocomplete": true, "autocomplete": true,
"columnWidth": 256 "columnWidth": 256
}, },
{ {
"id": "version", "id": "version",
"operator": "+", "operator": "+",
"title": "Ver", "title": "Version",
"type": "string", "type": "string",
"find": true, "find": true,
"sort": true, "sort": true,
"sortType": "title",
"autocomplete": true, "autocomplete": true,
"columnWidth": 256 "columnWidth": 256
}, },
@ -221,15 +219,13 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"columnWidth": 256 "columnWidth": 256
}, },
{ {
"id": "publisher", "id": "language",
"operator": "+", "title": "Language",
"title": "Publisher", "type": ["string"],
"type": "string", "columnWidth": 128,
"filter": true, "filter": true,
"find": true, "find": true,
"sort": true, "sort": true
"autocomplete": true,
"columnWidth": 256
}, },
{ {
"id": "place", "id": "place",
@ -248,15 +244,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
//"format": {"type": "date", "args": ["%a, %b %e, %Y"]}, //"format": {"type": "date", "args": ["%a, %b %e, %Y"]},
"sort": true "sort": true
}, },
{
"id": "language",
"title": "Language",
"type": ["string"],
"columnWidth": 128,
"filter": true,
"find": true,
"sort": true
},
{ {
"id": "keywords", "id": "keywords",
"title": "Keywords", "title": "Keywords",
@ -275,6 +262,12 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"sort": true, "sort": true,
"columnWidth": 256 "columnWidth": 256
}, },
{
"id": "notes",
"title": "Notes",
"type": "text",
"capability": "canEditMetadata"
},
{ {
"id": "id", "id": "id",
"operator": "+", "operator": "+",
@ -538,8 +531,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"columnRequired": true, "columnRequired": true,
"columnWidth": 180, "columnWidth": 180,
"find": true, "find": true,
"sort": true, "sort": true
"sortType": "title"
}, },
{ {
"id": "version", "id": "version",
@ -550,15 +542,13 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"columnRequired": true, "columnRequired": true,
"columnWidth": 180, "columnWidth": 180,
"find": true, "find": true,
"sort": true, "sort": true
"sortType": "title"
}, },
{ {
"id": "name", "id": "name",
"title": "Name", "title": "Name",
"type": ["string"], "type": ["string"],
"autocomplete": true, "autocomplete": true,
"filter": true,
"find": true "find": true
}, },
{ {
@ -583,6 +573,15 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"sort": true, "sort": true,
"sortType": "person" "sortType": "person"
}, },
{
"id": "language",
"title": "Language",
"type": ["string"],
"columnWidth": 128,
"filter": true,
"find": true,
"sort": true
},
{ {
"id": "location", "id": "location",
"title": "Location", "title": "Location",
@ -607,16 +606,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"find": true, "find": true,
"sort": true "sort": true
}, },
{
"id": "language",
"title": "Language",
"type": ["string"],
"autocomplete": true,
"columnWidth": 120,
"filter": true,
"find": true,
"sort": true
},
{ {
"id": "keywords", "id": "keywords",
"title": "Keywords", "title": "Keywords",
@ -1055,18 +1044,17 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
the system (from). the system (from).
*/ */
"site": { "site": {
"description": "We were fighting racism and fascism on the streets of London. We were trying to resist and survive the violent ethno-nationalism in Yugoslavia. Where were you in 92'? What political actions or groups were you involved in, in 1992? What were your modes of activism? What technologies were you using to communicate? Moving between the personal and the collective, between then and now, these questions will direct our visual and textual exploration of the MayDay Rooms archives.", "description": "This is a demo of pan.do/ra - a free, open source media archive. It allows you to manage large, decentralized collections of video, to collaboratively create metadata and time-based annotations, and to serve your archive as a cutting-edge web application.",
"email": { "email": {
// E-mail address in contact form (to) // E-mail address in contact form (to)
"contact": "system@1992archive.local", "contact": "system@1992archive.local",
"footer": "-- \npan.do/ra - https://1992archive.maydayrooms.org", "footer": "-- \npan.do/ra - https://1992archive.maydayrooms.org",
"prefix": "1992 News -", "prefix": "pan.do/ra News -",
// E-mail address uses by the system (from) // E-mail address uses by the system (from)
"system": "system@1992archive.local" "system": "system@1992archive.local"
}, },
"https": false, "https": false,
"id": "ninetytwo", "id": "ninetytwo",
"public": false,
"name": "1992archive", "name": "1992archive",
"sendReferrer": true, "sendReferrer": true,
"url": "1992archive.maydayrooms.org" "url": "1992archive.maydayrooms.org"
@ -1321,7 +1309,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"downloadFormat": "webm", "downloadFormat": "webm",
"formats": ["webm", "mp4"], "formats": ["webm", "mp4"],
"previewRatio": 1.3333333333, "previewRatio": 1.3333333333,
"resolutions": [240, 480], "resolutions": [240, 1080],
"torrent": true "torrent": true
} }
} }

View file

@ -223,11 +223,13 @@ pandora.ui.documentInfoView = function(data) {
) )
.appendTo($text); .appendTo($text);
// Director, Year and Country ---------------------------------------------- // Work, Author, etc. ------------------------------------------------------
renderGroup(['author', 'date', 'type']); renderGroup(['work', 'version', 'type']);
renderGroup(['version', 'versionauthor', 'work', 'workauthor']); renderGroup(['author', 'versionauthor']);
renderGroup(['publisher', 'place', 'series', 'edition', 'language']); renderGroup(['place', 'date', 'language']);
renderGroup(['keywords']);
// Description ------------------------------------------------------------- // Description -------------------------------------------------------------
@ -359,6 +361,41 @@ pandora.ui.documentInfoView = function(data) {
.appendTo($statistics); .appendTo($statistics);
renderRightsLevel(); renderRightsLevel();
// Notes -------------------------------------------------------------------
if (canEdit) {
$('<div>')
.css({marginBottom: '4px'})
.append(
formatKey('Notes', 'statistics').options({
tooltip: Ox._('Only {0} can see and edit these comments', [
Object.keys(pandora.site.capabilities.canEditMetadata).map(function(level, i) {
return (
i == 0 ? ''
: i < Ox.len(pandora.site.capabilities.canEditMetadata) - 1 ? ', '
: ' ' + Ox._('and') + ' '
) + Ox.toTitleCase(level)
}).join('')])
})
)
.append(
Ox.EditableContent({
height: 128,
placeholder: formatLight(Ox._('No notes')),
tooltip: pandora.getEditTooltip(),
type: 'textarea',
value: data.notes || '',
width: 128
})
.bindEvent({
submit: function(event) {
editMetadata('notes', event.value);
}
})
)
.appendTo($statistics);
}
function editMetadata(key, value) { function editMetadata(key, value) {
if (value != data[key]) { if (value != data[key]) {
var edit = {id: data.id}; var edit = {id: data.id};

View file

@ -225,16 +225,15 @@ pandora.ui.infoView = function(data) {
) )
.appendTo($text); .appendTo($text);
// Author, Year and Country ---------------------------------------------- // Work, Author, etc. ------------------------------------------------------
renderGroup(['author', 'year', 'country']); renderGroup(['work', 'version']);
renderGroup(['version', 'versionauthor', 'work', 'workauthor']); renderGroup(['author', 'versionauthor']);
renderGroup(['location', 'date', 'language']);
// Featuring ---------------------------------------------- renderGroup(['keywords']);
renderGroup(['featuring']); // Description -------------------------------------------------------------
// Summary -----------------------------------------------------------------
if (canEdit || data.summary) { if (canEdit || data.summary) {
$('<div>') $('<div>')
@ -323,7 +322,7 @@ pandora.ui.infoView = function(data) {
.appendTo($statistics); .appendTo($statistics);
renderRightsLevel(); renderRightsLevel();
// Notes -------------------------------------------------------------------- // Notes -------------------------------------------------------------------
if (canEdit) { if (canEdit) {
$('<div>') $('<div>')