From 25cfc133f5060760570e552e07ed2c6d04402f73 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Mon, 25 May 2015 15:01:34 +0100
Subject: [PATCH] Move content filter into Filters sidebar tab.

Gives a little bit more vertical space to the plugin list, and it's more
organised. With the filter being in the plugin menu, it could also be
incorrectly inferred that the filter was acting only on the plugins in
the sidebar above it.
---
 resources/report/css/style.css |  9 +++--
 resources/report/report.html   | 65 +++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/resources/report/css/style.css b/resources/report/css/style.css
index 1f455ea7..40a93e21 100644
--- a/resources/report/css/style.css
+++ b/resources/report/css/style.css
@@ -99,18 +99,21 @@ paper-item > a:hover {
 }
 #searchBox {
     display: block;
-    margin: 0 16px;
+    line-height: initial;
 }
 #filters {
     padding: 8px 0;
     overflow: hidden;
 }
-#filters > * {
+#filters > paper-checkbox,
+#filters > core-tooltip,
+#filters > div:not(.divider) {
     padding: 0 16px;
     height: 48px;
     line-height: 48px;
 }
-#filters > paper-checkbox {
+#filters > paper-checkbox,
+#filters > core-tooltip {
     display: block;
 }
 
diff --git a/resources/report/report.html b/resources/report/report.html
index 465e1ea2..d4c14e48 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -51,40 +51,39 @@
                     <paper-tab data-id="filters">Filters</paper-tab>
                 </paper-tabs>
             </div>
-            <div flex layout vertical>
-                <core-pages selected="cardsNav" valueattr="id" flex>
-                    <core-list  id="cardsNav" class="tab-content" flex>
-                        <template>
-                            <loot-plugin-item data-id="{{model.id}}" data="{{model}}" data-index="{{index}}">
-                                {{model.name}}
-                            </loot-plugin-item>
-                        </template>
-                        <!-- Generated <loot-plugin-item> elements go here. -->
-                    </core-list>
-                    <div id="filters" class="tab-content" flex>
-                        <paper-checkbox id="hideVersionNumbers" data-class="version" label="Hide version numbers"></paper-checkbox>
-                        <paper-checkbox id="hideCRCs" data-class="crc" label="Hide CRCs"></paper-checkbox>
-                        <paper-checkbox id="hideBashTags" data-class="tag" label="Hide Bash Tags"></paper-checkbox>
-                        <paper-checkbox id="hideNotes" label="Hide notes"></paper-checkbox>
-                        <paper-checkbox id="hideDoNotCleanMessages" label="Hide 'Do not clean' messages"></paper-checkbox>
-                        <paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></paper-checkbox>
-                        <paper-checkbox id="hideInactivePlugins" label="Hide inactive plugins"></paper-checkbox>
-                        <paper-checkbox id="hideMessagelessPlugins" label="Hide messageless plugins"></paper-checkbox>
-                        <div center horizontal layout>
-                            <div id="hiddenPluginsTxt" flex>Hidden plugins:</div>
-                            <div><span id="hiddenPluginNo">0</span> / <span id="filterTotalPluginNo">0</span></div>
-                        </div>
-                        <div center horizontal layout>
-                            <div id="hiddenMessagesTxt" flex>Hidden messages:</div>
-                            <div><span id="hiddenMessageNo">0</span> / <span id="filterTotalMessageNo">0</span></div>
-                        </div>
+            <core-pages selected="cardsNav" valueattr="id" flex>
+                <core-list  id="cardsNav" class="tab-content" flex>
+                    <template>
+                        <loot-plugin-item data-id="{{model.id}}" data="{{model}}" data-index="{{index}}">
+                            {{model.name}}
+                        </loot-plugin-item>
+                    </template>
+                    <!-- Generated <loot-plugin-item> elements go here. -->
+                </core-list>
+                <div id="filters" class="tab-content" layout vertical flex>
+                    <paper-checkbox id="hideVersionNumbers" data-class="version" label="Hide version numbers"></paper-checkbox>
+                    <paper-checkbox id="hideCRCs" data-class="crc" label="Hide CRCs"></paper-checkbox>
+                    <paper-checkbox id="hideBashTags" data-class="tag" label="Hide Bash Tags"></paper-checkbox>
+                    <paper-checkbox id="hideNotes" label="Hide notes"></paper-checkbox>
+                    <paper-checkbox id="hideDoNotCleanMessages" label="Hide 'Do not clean' messages"></paper-checkbox>
+                    <paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></paper-checkbox>
+                    <paper-checkbox id="hideInactivePlugins" label="Hide inactive plugins"></paper-checkbox>
+                    <paper-checkbox id="hideMessagelessPlugins" label="Hide messageless plugins"></paper-checkbox>
+                    <core-tooltip label="Press Enter or click outside the input to set the filter." position="bottom" noarrow>
+                        <paper-input id="searchBox" label="Filter content..."></paper-input>
+                    </core-tooltip>
+                    <div flex></div>
+                    <div class="divider"></div>
+                    <div center horizontal layout>
+                        <div id="hiddenPluginsTxt" flex>Hidden plugins:</div>
+                        <div><span id="hiddenPluginNo">0</span> / <span id="filterTotalPluginNo">0</span></div>
                     </div>
-                </core-pages>
-                <div class="divider"></div>
-                <core-tooltip label="Press Enter or click outside the input to set the filter." position="top" noarrow>
-                    <paper-input id="searchBox" label="Filter content..."></paper-input>
-                </core-tooltip>
-            </div>
+                    <div center horizontal layout>
+                        <div id="hiddenMessagesTxt" flex>Hidden messages:</div>
+                        <div><span id="hiddenMessageNo">0</span> / <span id="filterTotalMessageNo">0</span></div>
+                    </div>
+                </div>
+            </core-pages>
         </div>
         <div main layout vertical>
             <core-toolbar id="mainToolbar">