From 6f037b20760575f2e0002627f4a53aa299f2249e Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geo-solutions.it>
Date: Fri, 20 Jan 2017 17:46:14 +0100
Subject: [PATCH 1/2] Update the configuration to enable feature grid

 - updates the configuration to include feature grid/search by default
---
 web/client/localConfig.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/client/localConfig.json b/web/client/localConfig.json
index 4fa3a2544d..38013db94e 100644
--- a/web/client/localConfig.json
+++ b/web/client/localConfig.json
@@ -283,6 +283,7 @@
           "collapsible": false
         },
         "excludeOptions": [
+            "search",
             "links",
             "allowedSRS",
             "title",
@@ -317,9 +318,15 @@
         }
     }, {
         "name": "Home"
+    },{
+      "name": "FeatureGrid",
+      "cfg": {
+        "pagination": true
+      }
     }, {
         "name": "TOC",
         "cfg": {
+          "activateQueryTool": true,
           "visibilityCheckType": "glyph",
           "settingsOptions": {
             "includeCloseButton": false,
@@ -611,6 +618,7 @@
                "marginBottom": 0
            },
            "excludeOptions": [
+              "search",
               "links",
               "allowedSRS",
               "title",
@@ -651,7 +659,7 @@
               "alwaysVisible": true
             }
           }
-      }, "FeatureGrid", {
+      }, {
           "name": "TOC",
           "cfg": {
             "visibilityCheckType": "glyph",

From 372d6e43c56eb424ef240b86f9a9455982f89f50 Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geo-solutions.it>
Date: Fri, 20 Jan 2017 17:53:59 +0100
Subject: [PATCH 2/2] Deactivate query tool by default

Feature Grid is not mandatory, so the query tool should not be enabled by default.
---
 web/client/plugins/TOC.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/plugins/TOC.jsx b/web/client/plugins/TOC.jsx
index d847c7e184..6e64be6421 100644
--- a/web/client/plugins/TOC.jsx
+++ b/web/client/plugins/TOC.jsx
@@ -184,7 +184,7 @@ const LayerTree = React.createClass({
             activateZoomTool: true,
             activateSettingsTool: true,
             activateRemoveLayer: true,
-            activateQueryTool: true,
+            activateQueryTool: false,
             visibilityCheckType: "checkbox",
             settingsOptions: {},
             querypanelEnabled: false