From e4abced5941262e51951f52b82db64d59a3447a3 Mon Sep 17 00:00:00 2001
From: pandora <pandora@bak.ma>
Date: Thu, 8 Mar 2018 08:19:27 +0000
Subject: [PATCH] add collectives

---
 config.jsonc                | 14 ++++++++++++--
 static/js/home.bakma.js     |  2 +-
 static/js/infoView.bakma.js |  5 +++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config.jsonc b/config.jsonc
index 5cb00c7..c81d754 100644
--- a/config.jsonc
+++ b/config.jsonc
@@ -480,6 +480,14 @@
             "filter": true,
             "find": true
         },
+        {
+            "id": "collectives",
+            "title": "Groups and Collectives",
+            "type": ["string"],
+            "autocomplete": true,
+            "filter": true,
+            "find": true
+        },
         {
             "id": "language",
             "title": "Language",
@@ -763,6 +771,7 @@
             "hasEvents": true,
             "hasPlaces": true,
             "item": "Keyword",
+            "autocomplete": true,
             "overlap": true,
             "type": "string"
         },
@@ -833,6 +842,7 @@
         "id": "bakma",
         "name": "bak.ma",
         "url": "bak.ma",
+        "public": false,
         "videoprefix": ""
     },
     "sitePages": [
@@ -923,7 +933,7 @@
                 {"id": "category", "sort": [{"key": "name", "operator": "+"}]},
                 {"id": "tag", "sort": [{"key": "items", "operator": "-"}]},
                 {"id": "keywords", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "timeofday", "sort": [{"key": "items", "operator": "-"}]}
+                {"id": "collectives", "sort": [{"key": "items", "operator": "-"}]}
             ],
             "filtersSize": 176,
             "find": {"conditions": [], "operator": "&"},
@@ -1024,7 +1034,7 @@
     },
     "userLevels": ["guest", "member", "staff", "admin"],
     "video": {
-        "torrent": true,
+        "torrent": false,
         "formats": ["webm", "mp4"],
         "previewRatio": 1.3333333333,
         //supported resolutions are
diff --git a/static/js/home.bakma.js b/static/js/home.bakma.js
index e5faf6e..4ffca35 100644
--- a/static/js/home.bakma.js
+++ b/static/js/home.bakma.js
@@ -281,7 +281,7 @@ pandora.ui.home = function() {
                 });
             }
             $features.append($footer);
-            $features.append($support);
+            //$features.append($support);
             $features.animate({opacity: 1}, 250);
         });
     }
diff --git a/static/js/infoView.bakma.js b/static/js/infoView.bakma.js
index 87e3abd..016d679 100644
--- a/static/js/infoView.bakma.js
+++ b/static/js/infoView.bakma.js
@@ -302,6 +302,8 @@ pandora.ui.infoView = function(data) {
 
     renderGroup(['category', 'name']);
 
+    renderGroup(['collectives']);
+
     renderGroup(['tag']);
 
     // Summary -------------------------------------------------------------
@@ -538,10 +540,9 @@ pandora.ui.infoView = function(data) {
     }
 
     function formatLink(key, value, linkValue) {
-        linkValue = linkValue || value;
         return (Ox.isArray(value) ? value : [value]).map(function(value) {
             return key
-                ? '<a href="/' + key + '=' + linkValue + '">' + value + '</a>'
+                ? '<a href="/' + key + '=' + pandora.escapeQueryValue(linkValue ? linkValue : value) + '">' + value + '</a>'
                 : value;
         }).join(', ');
     }