From fad7422d21c55941a50d3a2bf2e948e88f8737a2 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 25 May 2015 16:33:56 +0100 Subject: [PATCH] Added search toolbar. For #428. Search is functional, though there is no highlighting of results, and it may interact oddly with filters. --- resources/report/css/material.css | 2 +- resources/report/css/style.css | 7 +- resources/report/html/loot-search.html | 158 +++++++++++++++++++++++++ resources/report/js/events.js | 10 ++ resources/report/report.html | 7 +- 5 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 resources/report/html/loot-search.html diff --git a/resources/report/css/material.css b/resources/report/css/material.css index 69d5781f..9bd464cb 100644 --- a/resources/report/css/material.css +++ b/resources/report/css/material.css @@ -26,7 +26,7 @@ html /deep/ paper-button::shadow .button-content ::content a { } /* paper-icon-button */ -paper-icon-button[disabled] { +html /deep/ paper-icon-button[disabled] { color: rgba(255, 255, 255, 0.30); } diff --git a/resources/report/css/style.css b/resources/report/css/style.css index 31ff030d..b2875018 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -61,10 +61,15 @@ core-toolbar, div[drawer] > div:first-child { color: white; height: 56px; } -#mainToolbar { +#mainToolbar, +#searchBar { box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); z-index: 1; } +#mainToolbar:not(.search) + #searchBar, +#mainToolbar.search { + display: none; +} #gameMenu { margin-top: -0.5em; } diff --git a/resources/report/html/loot-search.html b/resources/report/html/loot-search.html new file mode 100644 index 00000000..043a621b --- /dev/null +++ b/resources/report/html/loot-search.html @@ -0,0 +1,158 @@ + + + + + + + + + + diff --git a/resources/report/js/events.js b/resources/report/js/events.js index 469d34e7..f42719d7 100644 --- a/resources/report/js/events.js +++ b/resources/report/js/events.js @@ -646,6 +646,12 @@ function onContentRefresh(evt) { closeProgressDialog(); }).catch(processCefError); } +function onSearchOpen(evt) { + document.getElementById('mainToolbar').classList.add('search'); +} +function onSearchClose(evt) { + document.getElementById('mainToolbar').classList.remove('search'); +} function setupEventHandlers() { /*Set up handlers for filters.*/ document.getElementById('hideVersionNumbers').addEventListener('change', onToggleDisplayCSS, false); @@ -686,6 +692,10 @@ function setupEventHandlers() { document.getElementById('sidebarTabs').addEventListener('core-select', onSwitchSidebarTab, false); document.getElementById('jumpToGeneralInfo').addEventListener('click', onJumpToGeneralInfo, false); + + document.getElementById('showSearch').addEventListener('click', onSearchOpen, false); + document.getElementById('searchBar').addEventListener('loot-search-close', onSearchClose, false); + /* Set up event handlers for settings dialog. */ var settings = document.getElementById('settingsDialog'); settings.getElementsByClassName('accept')[0].addEventListener('click', onCloseSettingsDialog, false); diff --git a/resources/report/report.html b/resources/report/report.html index 6b6ba15f..a0c3b0bd 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -15,6 +15,7 @@ + @@ -103,6 +104,9 @@ + + + @@ -150,6 +154,7 @@ +

General Information

@@ -201,7 +206,7 @@
- +