diff --git a/public_html/index.html b/public_html/index.html
index 17a2151..ad56ad2 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -212,124 +212,125 @@
-
+
-
-
Columns
-
-
-
Select/Deselect All
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Select/Deselect All
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public_html/script.js b/public_html/script.js
index b8aec7d..b5628de 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -320,25 +320,7 @@ function initialize() {
customAltitudeColors = false;
}
- // Accordian display logic for additional config buttons
- var acc = document.getElementsByClassName("accordion");
- var i;
- for (i = 0; i < acc.length; i++) {
- acc[i].addEventListener("click", function() {
- /* Toggle between adding and removing the "active" class,
- to highlight the button that controls the panel */
- this.classList.toggle("active");
-
- /* Toggle between hiding and showing the active panel */
- var panel = this.nextElementSibling;
- if (panel.style.display === "block") {
- panel.style.display = "none";
- } else {
- panel.style.display = "block";
- }
- });
- }
$("#altitude_filter_reset_button").click(onResetAltitudeFilter);
@@ -354,14 +336,6 @@ function initialize() {
$('#settings_infoblock').toggle();
});
- $('#column_select').on('click', function() {
- $('#column_select_window').toggle();
- });
-
- $('#column_select_close_box').on('click', function() {
- $('#column_select_window').hide();
- });
-
$('#settings_close').on('click', function() {
$('#settings_infoblock').hide();
});
@@ -416,6 +390,15 @@ function initialize() {
refreshDataSourceFilters();
})
+ $('#column_select_button').on('click', function() {
+ $('#column_select_panel').toggle();
+ });
+
+
+ $('#filter_button').on('click', function() {
+ $('#filter_panel').toggle();
+ });
+
// Event handlers for to column checkboxes
checkbox_div_map.forEach(function (checkbox, div) {
$(div).on('click', function() {
diff --git a/public_html/style.css b/public_html/style.css
index 472fc09..cf72855 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -55,48 +55,6 @@ html, body {
overflow-x: scroll;
}
-#column_select {
- position: relative;
- float: right;
- background-color: #002F5D;
- color: #FFFFFF;
- width: 125px;
-}
-
-#column_select_window {
- position: absolute;
- right: 1px;
- top: 80px;
- width: 150px;
- min-height: 180px;
- background: #ffffff;
- box-shadow: 4px 4px 10px #444444;
- padding: 20px;
- z-index: 9999;
- display: none;
-}
-
-#column_select_header {
- display: table;
- background-color: #002F5D;
- color: #ffffff;
- font-size: smaller;
- padding: 5px;
- text-align: center;
- width: 120px;
-}
-
-#column_select_close_box {
- position: absolute;
- right: 15px;
- top: 21px;
- background-image: url('images/close-settings.png');
- background-size: cover;
- width: 20px;
- height: 20px;
- cursor: pointer;
-}
-
.columnOptionContainer {
position: relative;
display: table;
@@ -887,28 +845,36 @@ select.error, textarea.error, input.error {
}
}
-/* Style the buttons that are used to open and close the accordion panel */
-.accordion {
+.config_button {
position: relative;
- background-color: #002F5D;
- color: #FFFFFF;
+ background-color: #FEBC11;
+ color: #002F5D;
cursor: pointer;
text-align: center;
width: 125px;
}
-.active, .accordion:hover, #column_select:hover {
+.config_button:hover {
background-color: #abcad8;
}
- /* Style the accordion panel. Note: hidden by default */
-.panel {
- padding: 0 2px;
- background-color: #E5F6FC;
- display: none;
- overflow: hidden;
+.config_button_row {
+ position: relative;
+ margin-top: 5px;
+ padding: 3px 0 3px 0;
+
}
-.config_button_row {
- margin-top: 5px;
-}
\ No newline at end of file
+.panel {
+ position: relative;
+ padding: 3px 3px 6px 3px;
+ display: none;
+ margin-bottom: 5px;
+ border: solid;
+ border-color: #002F5D;
+}
+
+.wrapper {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ }
\ No newline at end of file