From e17da9f060ca984e8dee77cd284e23a6c39817be Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 5 Dec 2018 12:39:59 +0100 Subject: [PATCH] Update pandora config to align with upstream, closes #296 --- pandora/install.sh | 2 +- pandora/install/srv/pandora/conf/config.jsonc | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pandora/install.sh b/pandora/install.sh index 2758071..31d703d 100755 --- a/pandora/install.sh +++ b/pandora/install.sh @@ -25,7 +25,7 @@ if [ ${VANILLA:-0} -eq 0 ]; then cp srv/pandora/conf/config.jsonc /srv/pandora/conf else chown 8002:8002 /srv/pandora/conf - cp /var/lib/lxc/pandora/pandora/srv/pandora/pandora/config.pandora.jsonc /srv/pandora/conf + cp /var/lib/lxc/pandora/pandora/srv/pandora/pandora/config.pandora.jsonc /srv/pandora/conf/config.jsonc fi cp srv/pandora/conf/gunicorn_config.py /srv/pandora/conf/gunicorn_config.py envsubst /srv/pandora/conf/local_settings.py diff --git a/pandora/install/srv/pandora/conf/config.jsonc b/pandora/install/srv/pandora/conf/config.jsonc index 89fe7de..11d8020 100644 --- a/pandora/install/srv/pandora/conf/config.jsonc +++ b/pandora/install/srv/pandora/conf/config.jsonc @@ -10,10 +10,14 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. { /* "annotations" configures the annotation panel. + "separator" is the character, string or HTML tag that separates + annotations of type "string" "showUsers": If true, include list of users in menu, so that annotations by specific users can be turned on and off + */ "annotations": { + "separator": ";", "showUsers": false }, /* @@ -63,6 +67,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "canManageHome": {"staff": true, "admin": true}, "canManagePlacesAndEvents": {"member": true, "staff": true, "admin": true}, "canManageTitlesAndNames": {"member": true, "staff": true, "admin": true}, + "canManageTranslations": {"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}, @@ -102,7 +107,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "clipLayers": ["publicnotes", "keywords", "subtitles", "places", "events"], /* "documentKeys" defines the metadata associated with each document. Required keys - are "*", "id" and "title". + are "*", "id" and "title". A documentKey must have the following properties: "id": The unique id of the key (as used by the server) "title": The title of the key (as displayed by the client) @@ -589,6 +594,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "id": "keywords", "title": "Keywords", "type": "layer", + "autocomplete": true, "filter": true, "find": true }, @@ -873,6 +879,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "canPlayClips": If true, clips from this layer will play for users with canPlayClips access "entity": ID of the referenced entity (if type is "entity") + "getDefaults": function in pandora namespace that gets called + to populate defaults for new annotations. i.e. getCurrentFrameAnnotation "hasEvents": If true, the calendar will be populated with matches from this layer "hasPlaces": If true, the map will be populated with matches from this @@ -889,6 +897,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "title": "Keywords", "canAddAnnotations": {"member": true, "staff": true, "admin": true}, "item": "Keyword", + "autocomplete": true, "overlap": true, "type": "string" }, @@ -965,7 +974,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. */ "media": { "importPosters": false, - "importFrames": false + "importFrames": false }, /* "menuExtras" can be used to add extra functionality to the main menu bar. @@ -1032,6 +1041,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "https": true, "id": "pandora", "name": "pan.do/ra", + // Set to true to allow search engines to index the site + "public": false, "sendReferrer": true, "url": "pandora.spotter.vm" }, @@ -1115,6 +1126,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. "level": "guest", "ui": { "annotationsCalendarSize": 128, + "annotationsHighlight": "none", "annotationsMapSize": 128, "annotationsRange": "all", "annotationsSize": 256,