From 90486ec77442747d777255d6a6c625384015c37d Mon Sep 17 00:00:00 2001
From: rlx <rlx@rolux.org>
Date: Tue, 9 Aug 2016 13:35:47 +0200
Subject: [PATCH] update menu and config

---
 pandora/config.pandora.jsonc | 2 +-
 static/js/mainMenu.js        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc
index aad507bf8..209a1c9ba 100644
--- a/pandora/config.pandora.jsonc
+++ b/pandora/config.pandora.jsonc
@@ -55,6 +55,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
         "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},
@@ -161,7 +162,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
     with "{date}".
     */
     "importMetadata": {
-        "keywords": "{tags}",
         "summary": "{description}",
         "title": "{title}"
     },
diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index b8702267b..659e65902 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -387,6 +387,8 @@ pandora.ui.mainMenu = function() {
                     pandora.addItem();
                 } else if (data.id == 'upload') {
                     pandora.$ui.uploadVideoDialog = pandora.ui.uploadVideoDialog().open();
+                } else if (data.id == 'import') {
+                    pandora.$ui.importMediaDialog = pandora.ui.importMediaDialog().open();
                 } else if (data.id == 'deletelist') {
                     pandora.ui.deleteListDialog().open();
                 } else if (data.id == 'print') {
@@ -1042,6 +1044,7 @@ pandora.ui.mainMenu = function() {
         return { id: 'itemMenu', title: Ox._('Item'), items: [
             { id: 'add', title: Ox._('Add {0}', [Ox._(pandora.site.itemName.singular)]), disabled: pandora.site.itemRequiresVideo || !pandora.site.capabilities.canAddItems[pandora.user.level] },
             { id: 'upload', title: Ox._('Upload Video...'), disabled: !pandora.site.capabilities.canAddItems[pandora.user.level] },
+            { id: 'import', title: Ox._('Import Video...'), disabled: !pandora.site.capabilities.canImportItems[pandora.user.level] },
             {},
             { id: 'selectall', title: Ox._('Select All {0}', [listItemsName]), disabled: !canSelect, keyboard: 'control a' },
             { id: 'selectnone', title: Ox._('Select None'), disabled: !canSelect, keyboard: 'shift control a' },