From 76186e513feab8e7cd51cdefc977c9fe97076324 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 10 May 2015 14:59:08 +0200
Subject: [PATCH] Tweaks.

---
 src/_h5ai/client/css/inc/ext/download.less | 3 ---
 src/_h5ai/client/js/inc/ext/download.js    | 1 +
 src/_h5ai/client/js/inc/view/viewmode.js   | 7 +++++--
 src/_h5ai/conf/options.json                | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 src/_h5ai/client/css/inc/ext/download.less

diff --git a/src/_h5ai/client/css/inc/ext/download.less b/src/_h5ai/client/css/inc/ext/download.less
deleted file mode 100644
index 129f43d3..00000000
--- a/src/_h5ai/client/css/inc/ext/download.less
+++ /dev/null
@@ -1,3 +0,0 @@
-#download {
-    display: none;
-}
diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js
index c7ea7713..4c031ff2 100644
--- a/src/_h5ai/client/js/inc/ext/download.js
+++ b/src/_h5ai/client/js/inc/ext/download.js
@@ -60,6 +60,7 @@ modulejs.define('ext/download', ['_', '$', 'core/event', 'core/location', 'core/
         }
 
         $download = $(template)
+            .hide()
             .appendTo('#toolbar')
             .on('click', onClick);
 
diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js
index b2f9a4cb..f3edce3d 100644
--- a/src/_h5ai/client/js/inc/view/viewmode.js
+++ b/src/_h5ai/client/js/inc/view/viewmode.js
@@ -1,5 +1,8 @@
-modulejs.define('view/viewmode', ['_', '$', 'core/event', 'core/resource', 'view/sidebar', 'view/topbar', 'view/view'], function (_, $, event, resource, sidebar, topbar, view) {
+modulejs.define('view/viewmode', ['_', '$', 'core/event', 'core/resource', 'core/settings', 'view/sidebar', 'view/topbar', 'view/view'], function (_, $, event, resource, allsettings, sidebar, topbar, view) {
 
+    var settings = _.extend({
+            viewmodeToggle: false
+        }, allsettings.view);
     var tplSettings =
             '<div id="viewmode-settings" class="block"><h1 class="l10n-view">View</h1></div>';
     var tplMode =
@@ -68,7 +71,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/event', 'core/resource', 'view
 
     function addToggle() {
 
-        if (modes.length > 1) {
+        if (settings.viewmodeToggle && modes.length > 1) {
             $(tplToggle)
                 .on('click', onToggle)
                 .appendTo(topbar.$toolbar);
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index 03cc3b2b..59cf94d2 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -29,6 +29,7 @@ Options
     - theme: string, name of one of the folders in "_{{pkg.name}}/images/themes", defaults to "default"
     - unmanaged: array of strings, don't manage folders containing one of those files
     - unmanagedInNewWindow: boolean, open unmanaged links in new window/tab
+    - viewmodeToggle: boolean, show a view mode toggle in the toolbar
     */
     "view": {
         "binaryPrefix": false,
@@ -42,7 +43,8 @@ Options
         "sizes": [20, 40, 60, 80, 100, 150, 200, 250, 300, 350, 400],
         "theme": "",
         "unmanaged": ["index.html", "index.htm", "index.php"],
-        "unmanagedInNewWindow": false
+        "unmanagedInNewWindow": false,
+        "viewmodeToggle": false
     },