From 1018fbf40ddd120fc7ee560bb7ebb5fbbb03fcfe Mon Sep 17 00:00:00 2001 From: jaredb7 Date: Fri, 7 Apr 2023 19:19:05 +1000 Subject: [PATCH 1/8] Fix Excluded Species search for Chrome Appears to be a issue scrolling a select list option into view and then setting it's selected state to true (as if the user had clicked on it) this seems to break all future calls of scrollIntoView on any options, regardless if the selected state if removed from all options. scrollIntoView works perfectly otherwise and opted to apply a style to visually highlight the option. This turned out way better --- homepage/style.css | 6 ++++++ scripts/exclude_list.php | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/homepage/style.css b/homepage/style.css index fff058a..69c350a 100644 --- a/homepage/style.css +++ b/homepage/style.css @@ -828,6 +828,12 @@ pre#timer.bash { background-color: #9fe29b; } +.exclude_species_list_option_highlight { + color: black; + background-color: rgb(119, 196, 135); + font-weight: bolder; +} + #ddnewline::before { content: none; } \ No newline at end of file diff --git a/scripts/exclude_list.php b/scripts/exclude_list.php index d3d496f..f719679 100644 --- a/scripts/exclude_list.php +++ b/scripts/exclude_list.php @@ -7,6 +7,8 @@

All Species Labels

+
+ Once the desired species has been highlighted, select it and click ADD to have it excluded. Date: Fri, 7 Apr 2023 19:21:13 +1000 Subject: [PATCH 2/8] Update .gitignore to skip JetBrains IDE files We don't really need JetBrains IDE files in the repo --- .gitignore | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.gitignore b/.gitignore index 99afbb4..21161ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,29 @@ +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml +.idea + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + *.pyc *.flac .vscode From d16d4f60a361711d6dc5726892ccba129dbe27c4 Mon Sep 17 00:00:00 2001 From: jaredb7 Date: Sat, 8 Apr 2023 11:14:04 +1000 Subject: [PATCH 3/8] Fix error when restarting the Live Stream service Changed command to use systemctl to restart the icecast2 service, the error wasn't fatal but just made it look like restarting the live stream service had failed. --- homepage/views.php | 8 ++++---- scripts/service_controls.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/homepage/views.php b/homepage/views.php index 6581111..21304fe 100644 --- a/homepage/views.php +++ b/homepage/views.php @@ -271,10 +271,10 @@ if(isset($_GET['view'])){ } else { $submittedpwd = $_SERVER['PHP_AUTH_PW']; $submitteduser = $_SERVER['PHP_AUTH_USER']; - $allowedCommands = array('sudo systemctl stop livestream.service && sudo /etc/init.d/icecast2 stop', - 'sudo systemctl restart livestream.service && sudo /etc/init.d/icecast2 restart', - 'sudo systemctl disable --now livestream.service && sudo systemctl disable icecast2 && sudo /etc/init.d/icecast2 stop', - 'sudo systemctl enable icecast2 && sudo /etc/init.d/icecast2 start && sudo systemctl enable --now livestream.service', + $allowedCommands = array('sudo systemctl stop livestream.service && sudo systemctl stop icecast2.service', + 'sudo systemctl restart livestream.service && sudo systemctl restart icecast2.service', + 'sudo systemctl disable --now livestream.service && sudo systemctl disable icecast2 && sudo systemctl stop icecast2.service', + 'sudo systemctl enable icecast2 && sudo systemctl start icecast2.service && sudo systemctl enable --now livestream.service', 'sudo systemctl stop web_terminal.service', 'sudo systemctl restart web_terminal.service', 'sudo systemctl disable --now web_terminal.service', diff --git a/scripts/service_controls.php b/scripts/service_controls.php index faf4da4..1888599 100644 --- a/scripts/service_controls.php +++ b/scripts/service_controls.php @@ -25,10 +25,10 @@ function service_status($name) {

Live Audio Stream

- - - - + + + +

Web Terminal

From 4e882e3eef9ada7a733a7ac3ad5b46a29f7fa258 Mon Sep 17 00:00:00 2001 From: jaredb7 Date: Sat, 8 Apr 2023 13:58:42 +1000 Subject: [PATCH 4/8] Dynamic style,css cache busting Keeps the existing format used to version the style sheet but it's now based off the file modification time. --- homepage/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homepage/index.php b/homepage/index.php index 957a9fd..eeae423 100644 --- a/homepage/index.php +++ b/homepage/index.php @@ -37,7 +37,7 @@ body::-webkit-scrollbar { display:none } - +