From 2f26146228e90fe8b022219104922f74eb2d7b68 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Fri, 17 Apr 2015 23:51:48 +0200
Subject: [PATCH] Remove #settings div.

---
 src/_h5ai/client/css/inc/sidebar.less                    | 3 ---
 src/_h5ai/client/images/ui/{settings.svg => sidebar.svg} | 0
 src/_h5ai/client/js/inc/ext/info.js                      | 2 +-
 src/_h5ai/client/js/inc/ext/l10n.js                      | 2 +-
 src/_h5ai/client/js/inc/ext/tree.js                      | 2 +-
 src/_h5ai/client/js/inc/view/sidebar.js                  | 4 ++--
 src/_h5ai/client/js/inc/view/viewmode.js                 | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)
 rename src/_h5ai/client/images/ui/{settings.svg => sidebar.svg} (100%)

diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less
index 64d87879..811da127 100644
--- a/src/_h5ai/client/css/inc/sidebar.less
+++ b/src/_h5ai/client/css/inc/sidebar.less
@@ -6,9 +6,6 @@
     order: 0;
     background: #fafafa;
     border-right: 1px solid rgba(0,0,0,0.08);
-}
-
-#settings {
     padding: 16px;
 
     .block {
diff --git a/src/_h5ai/client/images/ui/settings.svg b/src/_h5ai/client/images/ui/sidebar.svg
similarity index 100%
rename from src/_h5ai/client/images/ui/settings.svg
rename to src/_h5ai/client/images/ui/sidebar.svg
diff --git a/src/_h5ai/client/js/inc/ext/info.js b/src/_h5ai/client/js/inc/ext/info.js
index 87451846..01c414c0 100644
--- a/src/_h5ai/client/js/inc/ext/info.js
+++ b/src/_h5ai/client/js/inc/ext/info.js
@@ -139,7 +139,7 @@ modulejs.define('ext/info', ['_', '$', 'modernizr', 'core/settings', 'core/resou
         }
 
         $(settingsTemplate)
-            .appendTo('#settings')
+            .appendTo('#sidebar')
             .find('#view-info')
             .on('click', function (ev) {
 
diff --git a/src/_h5ai/client/js/inc/ext/l10n.js b/src/_h5ai/client/js/inc/ext/l10n.js
index 797665a5..fdd710cf 100644
--- a/src/_h5ai/client/js/inc/ext/l10n.js
+++ b/src/_h5ai/client/js/inc/ext/l10n.js
@@ -119,7 +119,7 @@ modulejs.define('ext/l10n', ['_', '$', 'core/settings', 'core/langs', 'core/form
                 .appendTo($select);
         });
 
-        $block.appendTo('#settings');
+        $block.appendTo('#sidebar');
     }
 
     function init() {
diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js
index 19025698..6d277067 100644
--- a/src/_h5ai/client/js/inc/ext/tree.js
+++ b/src/_h5ai/client/js/inc/ext/tree.js
@@ -193,7 +193,7 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/s
             .on('click', '.indicator', createOnIndicatorClick());
 
         $(settingsTemplate)
-            .appendTo('#settings')
+            .appendTo('#sidebar')
             .find('#view-tree')
             .on('click', function (ev) {
 
diff --git a/src/_h5ai/client/js/inc/view/sidebar.js b/src/_h5ai/client/js/inc/view/sidebar.js
index bb8bdbc6..d3443013 100644
--- a/src/_h5ai/client/js/inc/view/sidebar.js
+++ b/src/_h5ai/client/js/inc/view/sidebar.js
@@ -3,7 +3,7 @@ modulejs.define('view/sidebar', ['$', 'core/resource', 'core/store'], function (
     var storekey = 'sidebarIsVisible';
     var toggleTemplate =
             '<div id="sidebar-toggle" class="tool">' +
-                '<img alt="settings"/>' +
+                '<img alt="sidebar"/>' +
             '</div>';
 
 
@@ -25,7 +25,7 @@ modulejs.define('view/sidebar', ['$', 'core/resource', 'core/store'], function (
             $sidebar.show();
         } else {
             $toggle.removeClass('current');
-            $img.attr('src', resource.image('settings'));
+            $img.attr('src', resource.image('sidebar'));
             $sidebar.hide();
         }
     }
diff --git a/src/_h5ai/client/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js
index 1a478fb4..0c3d2740 100644
--- a/src/_h5ai/client/js/inc/view/viewmode.js
+++ b/src/_h5ai/client/js/inc/view/viewmode.js
@@ -130,7 +130,7 @@ modulejs.define('view/viewmode', ['_', '$', 'core/settings', 'core/resource', 'c
                 .appendTo($viewBlock);
         }
 
-        $viewBlock.appendTo('#settings');
+        $viewBlock.appendTo('#sidebar');
     }
 
     function init() {