From e07bcb482e24d0198a58207f0a7d68ba15945e28 Mon Sep 17 00:00:00 2001
From: rolux <rolux@lion.fritz.box>
Date: Wed, 12 Sep 2018 18:48:18 +0200
Subject: [PATCH] add annotation separator option

---
 pandora/config.pandora.jsonc | 8 ++++++--
 static/js/editor.js          | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc
index b9e92c412..bbaeaacaf 100644
--- a/pandora/config.pandora.jsonc
+++ b/pandora/config.pandora.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
     },
     /*
@@ -102,7 +106,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
     "clipLayers": ["publicnotes", "keywords", "subtitles"],
     /*
     "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)
@@ -936,7 +940,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.
diff --git a/static/js/editor.js b/static/js/editor.js
index 3e43c9708..1251ec982 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -9,6 +9,7 @@ pandora.ui.editor = function(data) {
             annotationsCalendarSize: ui.annotationsCalendarSize,
             annotationsMapSize: ui.annotationsMapSize,
             annotationsRange: ui.annotationsRange,
+            annotationsSeparator: pandora.site.annotations.separator,
             annotationsSize: ui.annotationsSize,
             annotationsSort: ui.annotationsSort,
             annotationsTooltip: Ox._('annotations')