From b9ce9d487c8ee56c2fd655f774dea5b89ea1381f Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Wed, 13 Jun 2012 18:01:32 +0200
Subject: [PATCH] more demo config cleanup

---
 pandora/config.pandora.jsonc | 68 ++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc
index b223358cb..99d89d5ad 100644
--- a/pandora/config.pandora.jsonc
+++ b/pandora/config.pandora.jsonc
@@ -66,12 +66,12 @@
         text of clips. Excluding a layer from this list means it will not be
         included in find annotations. // FIXME: the last bit is not implemented.
     */
-    "clipLayers": ["publicnotes", "keywords", "subtitles"],
+    "clipLayers": ["transcripts", "keywords", "places", "events", "descriptions"],
     // fixme: either this, or filter: true in itemKeys, but not both
     "filters": [
         {"id": "director", "title": "Director", "type": "string"},
         {"id": "country", "title": "Country", "type": "string"},
-        {"id": "year", "title": "Year", "type": "integer"},
+        {"id": "year", "title": "Year", "type": "string"},
         {"id": "language", "title": "Languages", "type": "string"},
         {"id": "featuring", "title": "Featuring", "type": "string"},
         {"id": "keywords", "title": "Keywords", "type": "string"}
@@ -119,7 +119,7 @@
         },
         {
             "id": "name",
-            "title": "Name",
+            "title": "People",
             "type": ["string"],
             "autocomplete": true,
             "find": true
@@ -168,12 +168,8 @@
         {
             "id": "year",
             "title": "Year",
-            "type": "year",
-            "additionalSort": [{"key": "director", "operator": "+"}, {"key": "title", "operator": "+"}],
-            "autocomplete": true,
-            "columnWidth": 60,
-            "filter": true,
-            "find": true,
+            "type": "string",
+            "columnWidth": 120,
             "sort": true
         },
         {
@@ -203,7 +199,7 @@
         },
         {
             "id": "publicnotes",
-            "title": "Notes",
+            "title": "Public Notes",
             "type": "layer",
             "find": true
         },
@@ -346,7 +342,14 @@
             "title": "User",
             "type": "string",
             "capability": "canSeeFiles",
-            "find": false
+            "find": true
+        },
+        {
+            "id": "filename",
+            "title": "Filename",
+            "type": ["string"],
+            "capability": "canSeeFiles",
+            "find": true
         },
         {
             "id": "created",
@@ -417,6 +420,14 @@
         {"id": "files", "title": "Files"}
     ],
     "layers": [
+        {
+            "id": "keywords",
+            "title": "Keywords",
+            "canAddAnnotations": {"member": true, "staff": true, "admin": true},
+            "item": "Keyword",
+            "overlap": true,
+            "type": "string"
+        },
         {
             "id": "privatenotes",
             "title": "Private Notes",
@@ -429,25 +440,13 @@
         },
         {
             "id": "publicnotes",
-            "title": "Notes",
+            "title": "Public Notes",
             "canAddAnnotations": {"member": true, "staff": true, "admin": true},
-            "hasEvents": true,
-            "hasPlaces": true,
             "item": "Note",
             "overlap": true,
             "showInfo": true,
             "type": "text"
         },
-        {
-            "id": "keywords",
-            "title": "Keywords",
-            "canAddAnnotations": {"member": true, "staff": true, "admin": true},
-            "hasEvents": true,
-            "hasPlaces": true,
-            "item": "Keyword",
-            "overlap": true,
-            "type": "string"
-        },
         {
             "id": "subtitles",
             "title": "Subtitles",
@@ -497,7 +496,7 @@
             "system": "system@pandora.local"
         },
         "id": "pandora",
-        "name": "Demo",
+        "name": "pan.do/ra",
         "url": "pandora.local",
         "videoprefix": ""
     },
@@ -532,7 +531,7 @@
             "annotationsCalendarSize": 128,
             "annotationsFont": "small",
             "annotationsMapSize": 128,
-            "annotationsRange": "all",
+            "annotationsRange": "position",
             "annotationsSize": 256,
             "annotationsSort": "position",
             "clipsColumns": 2,
@@ -543,16 +542,16 @@
                 }
             },
             "filters": [
-                {"id": "director", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "country", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "year", "sort": [{"key": "name", "operator": "+"}]},
-                {"id": "featuring", "sort": [{"key": "items", "operator": "-"}]},
+                {"id": "director", "sort": [{"key": "name", "operator": "+"}]},
+                {"id": "country", "sort": [{"key": "name", "operator": "+"}]},
+                {"id": "year", "sort": [{"key": "name", "operator": "-"}]},
+                {"id": "featuring", "sort": [{"key": "name", "operator": "+"}]},
                 {"id": "keywords", "sort": [{"key": "items", "operator": "-"}]}
             ],
             "filtersSize": 176,
             "find": {"conditions": [], "operator": "&"},
             "followPlayer": true,
-            "icons": "posters",
+            "icons": "frames",
             "infoIconSize": 256,
             "item": "",
             "itemFind": "",
@@ -581,10 +580,11 @@
             "showIconBrowser": false,
             "showInfo": true,
             "showLayers": {
+                "places": false,
+                "events": false,
                 "keywords": true,
-                "privatenotes": true,
-                "publicnotes": true,
-                "subtitles": true
+                "descriptions": true,
+                "transcripts": true
             },
             "showMapControls": false,
             "showMapLabels": false,