From 560f552d47572a7cf99ae0b9fd54610819f253e6 Mon Sep 17 00:00:00 2001 From: rlx Date: Tue, 9 Aug 2016 16:23:12 +0200 Subject: [PATCH] update --- config.jsonc | 120 +++++++++++++++++------------------ static/js/infoView.cdosea.js | 6 +- 2 files changed, 64 insertions(+), 62 deletions(-) diff --git a/config.jsonc b/config.jsonc index 7e39655..6cf04c7 100644 --- a/config.jsonc +++ b/config.jsonc @@ -38,41 +38,41 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. texts of a rights level up to and including x */ "capabilities": { - "canAddItems": {"member": true, "staff": true, "admin": true}, - "canDownloadVideo": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canEditAnnotations": {"staff": true, "admin": true}, - "canEditDocuments": {"staff": true, "admin": true}, - "canEditEntities": {"staff": true, "admin": true}, - "canEditEvents": {"staff": true, "admin": true}, - "canEditFeaturedEdits": {"staff": true, "admin": true}, - "canEditFeaturedLists": {"staff": true, "admin": true}, - "canEditFeaturedTexts": {"staff": true, "admin": true}, - "canEditMedia": {"staff": true, "admin": true}, - "canEditMetadata": {"staff": true, "admin": true}, - "canEditPlaces": {"staff": true, "admin": true}, - "canEditRightsLevel": {"member": true, "staff": true, "admin": true}, - "canEditSitePages": {"staff": true, "admin": true}, + "canAddItems": {"admin": true}, + "canDownloadVideo": {"guest": -1, "member": -1, "admin": 0}, + "canEditAnnotations": {"admin": true}, + "canEditDocuments": {"admin": true}, + "canEditEntities": {"admin": true}, + "canEditEvents": {"admin": true}, + "canEditFeaturedEdits": {"admin": true}, + "canEditFeaturedLists": {"admin": true}, + "canEditFeaturedTexts": {"admin": true}, + "canEditMedia": {"admin": true}, + "canEditMetadata": {"admin": true}, + "canEditPlaces": {"admin": true}, + "canEditRightsLevel": {"admin": true}, + "canEditSitePages": {"admin": true}, "canEditUsers": {"admin": true}, - "canExportAnnotations": {"member": true, "staff": true, "admin": true}, - "canImportAnnotations": {"member": true, "staff": true, "admin": true}, - "canImportItems": {"member": true, "staff": true, "admin": true}, - "canManageDocuments": {"member": true, "staff": true, "admin": true}, - "canManageEntities": {"member": true, "staff": true, "admin": true}, - "canManagePlacesAndEvents": {"member": true, "staff": true, "admin": true}, - "canManageTitlesAndNames": {"member": true, "staff": true, "admin": true}, - "canManageUsers": {"staff": true, "admin": true}, - "canPlayClips": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canPlayVideo": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canReadText": {"guest": 0, "member": 0, "staff": 1, "admin": 1}, + "canExportAnnotations": {"member": true, "admin": true}, + "canImportAnnotations": {"member": true, "admin": true}, + "canImportItems": {"member": true, "admin": true}, + "canManageDocuments": {"member": true, "admin": true}, + "canManageEntities": {"member": true, "admin": true}, + "canManagePlacesAndEvents": {"member": true, "admin": true}, + "canManageTitlesAndNames": {"member": true, "admin": true}, + "canManageUsers": {"admin": true}, + "canPlayClips": {"guest": -1, "member": -1, "admin": 0}, + "canPlayVideo": {"guest": -1, "member": -1, "admin": 0}, + "canReadText": {"guest": -1, "member": -1, "admin": 0}, "canRemoveItems": {"admin": true}, - "canSeeAccessed": {"staff": true, "admin": true}, - "canSeeDebugMenu": {"staff": true, "admin": true}, - "canSeeExtraItemViews": {"staff": true, "admin": true}, - "canSeeMedia": {"staff": true, "admin": true}, - "canSeeItem": {"guest": 1, "member": 1, "staff": 4, "admin": 4}, - "canSeeSize": {"staff": true, "admin": true}, - "canSeeSoftwareVersion": {"staff": true, "admin": true}, - "canSendMail": {"staff": true, "admin": true} + "canSeeAccessed": {"admin": true}, + "canSeeDebugMenu": {"admin": true}, + "canSeeExtraItemViews": {"admin": true}, + "canSeeMedia": {"admin": true}, + "canSeeItem": {"guest": -1, "member": -1, "admin": 0}, + "canSeeSize": {"admin": true}, + "canSeeSoftwareVersion": {"admin": true}, + "canSendMail": {"admin": true} }, /* "clipKeys" are the properties that clips can be sorted by (the values are @@ -112,24 +112,11 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "id" and "name" keys are required. If "alternativeNames" is present, these will act as synonyms when autocompleting values entered as annotations. */ - "entities": [ - { - "id": "people", - "title": "People", - "keys": [ - {"id": "id", "title": "ID", "type": "string"}, - {"id": "name", "title": "Name", "type": "string"}, - {"id": "additionalNames", "title": "Additional Names", "type": ["string"]}, - {"id": "biography", "title": "Biography", "type": "text"}, - {"id": "portrait", "title": "Portrait", "type": "document"} - ], - "sortType": "person" - } - ], + "entities": [], /* "flags", if set to true, will cause flag icons to appear in filters. */ - "flags": true, + "flags": false, /* "help" specifies the sections of the help dialog. */ @@ -163,8 +150,9 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. */ "importMetadata": { "date": "{date}", - "topic": "{tags}", + "source": "{url}", "summary": "{description}", + "tags": "{tags}", "title": "{title}" }, /* @@ -274,14 +262,13 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "sort": true }, { - "id": "country", - "title": "Country", + "id": "location", + "title": "Location", "type": "string", "autocomplete": true, "columnWidth": 180, "filter": true, "find": true, - "flag": "country", "sort": true }, { @@ -305,12 +292,25 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "sort": true, "value": {"key": "date", "type": "map", "map": "^(\\d{4})"} }, + { + "id": "tags", + "title": "Tags", + "type": ["string"], + "find": true, + "filter": true + }, { "id": "summary", "title": "Summary", "type": "text", "find": true }, + { + "id": "source", + "title": "Source", + "type": "string", + "find": true + }, { "id": "notes", "title": "Notes", @@ -612,7 +612,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. { "id": "keywords", "title": "Keywords", - "canAddAnnotations": {"member": true, "staff": true, "admin": true}, + "autocomplete": true, + "canAddAnnotations": {"member": true, "admin": true}, "item": "Keyword", "overlap": true, "type": "string" @@ -620,7 +621,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. { "id": "notes", "title": "Notes", - "canAddAnnotations": {"member": true, "staff": true, "admin": true}, + "canAddAnnotations": {"member": true, "admin": true}, "item": "Public Note", "overlap": true, "showInfo": true, @@ -629,7 +630,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. { "id": "subtitles", "title": "Subtitles", - "canAddAnnotations": {"staff": true, "admin": true}, + "canAddAnnotations": {"admin": true}, "canPlayClips": true, "hasEvents": true, "hasPlaces": true, @@ -697,14 +698,12 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "rightsLevel" defines which initial rights level will be assigned to items and texts created by users of these user levels. */ - "rightsLevel": {"member": 2, "staff": 2, "admin": 2}, + "rightsLevel": {"guest": 0, "member": 0, "admin": 0}, /* "rightsLevels" is an ordered list of rights levels, one of which will be assigned to each item. */ "rightsLevels": [ - {"name": "Public", "color": [128, 255, 128]}, - {"name": "Restricted", "color": [255, 192, 128]}, {"name": "Private", "color": [255, 128, 128]} ], /* @@ -761,7 +760,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "textRightsLevels" defines a list of rights levels for texts. */ "textRightsLevels": [ - {"name": "Public", "color": [128, 255, 128]}, {"name": "Private", "color": [255, 128, 128]} ], /* @@ -848,9 +846,9 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "entitiesType": "", "filters": [ {"id": "director", "sort": [{"key": "items", "operator": "-"}]}, - {"id": "country", "sort": [{"key": "items", "operator": "-"}]}, + {"id": "location", "sort": [{"key": "items", "operator": "-"}]}, {"id": "year", "sort": [{"key": "name", "operator": "-"}]}, - {"id": "featuring", "sort": [{"key": "items", "operator": "-"}]}, + {"id": "tags", "sort": [{"key": "items", "operator": "-"}]}, {"id": "keywords", "sort": [{"key": "items", "operator": "-"}]} ], "filtersSize": 176, diff --git a/static/js/infoView.cdosea.js b/static/js/infoView.cdosea.js index a6408b6..4d8000d 100644 --- a/static/js/infoView.cdosea.js +++ b/static/js/infoView.cdosea.js @@ -225,7 +225,9 @@ pandora.ui.infoView = function(data) { // Director, Date and Country ---------------------------------------------- - renderGroup(['director', 'date', 'country']); + renderGroup(['director', 'location', 'date']); + + renderGroup(['tags']); // Summary ----------------------------------------------------------------- @@ -261,6 +263,8 @@ pandora.ui.infoView = function(data) { .appendTo($text); } + renderGroup(['source']); + // Duration, Aspect Ratio -------------------------------------------------- ['duration', 'aspectratio'].forEach(function(key) {