From 588522b0d5f67ff0d5b5abca995b0cce6e60f449 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Sun, 9 Nov 2014 19:12:19 +0000
Subject: [PATCH] Paper checkboxes now use their label attribute.

---
 resources/report/css/style.css | 13 ++-------
 resources/report/js/l10n.js    | 22 +++++++-------
 resources/report/report.html   | 53 +++++++---------------------------
 3 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/resources/report/css/style.css b/resources/report/css/style.css
index cea42c8d..cfadda16 100644
--- a/resources/report/css/style.css
+++ b/resources/report/css/style.css
@@ -203,17 +203,8 @@ plugin-card > ul {
     margin-left: 1.75em;
 }
 
-#settings > select {
-    float: right;
-    clear: both;
-    position:relative;
-    top:-0.15em;
-}
-#settings > label {
-    display: inline-block;
-    height: 18px;
-    padding: 1px;
-    margin: 2px;
+#settings > paper-checkbox, #settings > core-tooltip, #filters > paper-checkbox {
+    display: block;
 }
 paper-checkbox {
     padding: 0.5em 1em;
diff --git a/resources/report/js/l10n.js b/resources/report/js/l10n.js
index cb0f40c4..d349d92b 100644
--- a/resources/report/js/l10n.js
+++ b/resources/report/js/l10n.js
@@ -138,14 +138,14 @@
             document.getElementById('searchBox').parentElement.label = l10n.translate("Press Enter when searching to select the next match.").fetch();
 
             /* Filters */
-            document.getElementById('hideVersionNumbers').previousElementSibling.textContent = l10n.translate("Hide version numbers").fetch();
-            document.getElementById('hideCRCs').previousElementSibling.textContent = l10n.translate("Hide CRCs").fetch();
-            document.getElementById('hideBashTags').previousElementSibling.textContent = l10n.translate("Hide Bash Tags").fetch();
-            document.getElementById('hideNotes').previousElementSibling.textContent = l10n.translate("Hide notes").fetch();
-            document.getElementById('hideDoNotCleanMessages').previousElementSibling.textContent = l10n.translate("Hide 'Do not clean' messages").fetch();
-            document.getElementById('hideInactivePluginMessages').previousElementSibling.textContent = l10n.translate("Hide inactive plugin messages").fetch();
-            document.getElementById('hideAllPluginMessages').previousElementSibling.textContent = l10n.translate("Hide all plugin messages").fetch();
-            document.getElementById('hideMessagelessPlugins').previousElementSibling.textContent = l10n.translate("Hide messageless plugins").fetch();
+            document.getElementById('hideVersionNumbers').label = l10n.translate("Hide version numbers").fetch();
+            document.getElementById('hideCRCs').label = l10n.translate("Hide CRCs").fetch();
+            document.getElementById('hideBashTags').label = l10n.translate("Hide Bash Tags").fetch();
+            document.getElementById('hideNotes').label = l10n.translate("Hide notes").fetch();
+            document.getElementById('hideDoNotCleanMessages').label = l10n.translate("Hide 'Do not clean' messages").fetch();
+            document.getElementById('hideInactivePluginMessages').label = l10n.translate("Hide inactive plugin messages").fetch();
+            document.getElementById('hideAllPluginMessages').label = l10n.translate("Hide all plugin messages").fetch();
+            document.getElementById('hideMessagelessPlugins').label = l10n.translate("Hide messageless plugins").fetch();
             document.getElementById('hiddenPluginsTxt').textContent = l10n.translate("Hidden plugins:").fetch();
             document.getElementById('hiddenMessagesTxt').textContent = l10n.translate("Hidden messages:").fetch();
 
@@ -171,12 +171,12 @@
 
             document.getElementById('languageSelect').previousElementSibling.textContent = l10n.translate("Language").fetch();
 
-            document.getElementById('enableDebugLogging').nextElementSibling.textContent = l10n.translate("Enable debug logging").fetch();
+            document.getElementById('enableDebugLogging').label = l10n.translate("Enable debug logging").fetch();
             document.getElementById('enableDebugLogging').parentElement.label = l10n.translate("The output is logged to the LOOTDebugLog.txt file.").fetch();
 
-            document.getElementById('updateMasterlist').nextElementSibling.textContent = l10n.translate("Update masterlist before sorting").fetch();
+            document.getElementById('updateMasterlist').label = l10n.translate("Update masterlist before sorting").fetch();
 
-            document.getElementById('autoRefresh').nextElementSibling.textContent = l10n.translate("Automatically refresh content on window refocus").fetch();
+            document.getElementById('autoRefresh').label = l10n.translate("Automatically refresh content on window refocus").fetch();
 
             var gameTable = document.getElementById('gameTable');
             gameTable.querySelector('th:first-child').textContent = l10n.translate("Name").fetch();
diff --git a/resources/report/report.html b/resources/report/report.html
index 116e2b76..7f87ca17 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -79,38 +79,14 @@
                 <!-- Generated <loot-plugin-item> elements go here, containing # links to each plugin's section in the list. -->
             </core-menu>
             <core-menu id="filters" class="tab-content hidden" flex>
-                <div center horizontal layout>
-                    <div flex>Hide version numbers</div>
-                    <paper-checkbox id="hideVersionNumbers" data-class="version"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide CRCs</div>
-                    <paper-checkbox id="hideCRCs" data-class="crc"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide Bash Tags</div>
-                    <paper-checkbox id="hideBashTags" data-class="tag"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide notes</div>
-                    <paper-checkbox id="hideNotes"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide 'Do not clean' messages</div>
-                    <paper-checkbox id="hideDoNotCleanMessages"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide inactive plugin messages</div>
-                    <paper-checkbox id="hideInactivePluginMessages"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide all plugin messages</div>
-                    <paper-checkbox id="hideAllPluginMessages"></paper-checkbox>
-                </div>
-                <div center horizontal layout>
-                    <div flex>Hide messageless plugins</div>
-                    <paper-checkbox id="hideMessagelessPlugins"></paper-checkbox>
-                </div>
+                <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="hideInactivePluginMessages" label="Hide inactive plugin messages"></paper-checkbox>
+                <paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></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>
@@ -219,17 +195,10 @@ along with LOOT. If not, see &lt;http://www.gnu.org/licenses/&gt;.
             </loot-dropdown-menu>
         </div>
         <core-tooltip label="The output is logged to the LOOTDebugLog.txt file." center horizontal layout>
-            <paper-checkbox id="enableDebugLogging"></paper-checkbox>
-            <div>Enable debug logging</div>
+            <paper-checkbox id="enableDebugLogging" label="Enable debug logging"></paper-checkbox>
         </core-tooltip>
-        <div center horizontal layout>
-            <paper-checkbox id="updateMasterlist"></paper-checkbox>
-            <div>Update masterlist before sorting</div>
-        </div>
-        <div center horizontal layout>
-            <paper-checkbox id="autoRefresh"></paper-checkbox>
-            <div>Automatically refresh content on window refocus</div>
-        </div>
+        <paper-checkbox id="updateMasterlist" label="Update masterlist before sorting"></paper-checkbox>
+        <paper-checkbox id="autoRefresh" label="Automatically refresh content on window refocus"></paper-checkbox>
         <table is="editable-table" id="gameTable" data-template="gameRow">
             <thead>
                 <tr>