Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI : convert checkbox to toggleswitch #207

Closed
wants to merge 94 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
546a4b0
Fix : set testbtn as css style for species change dropdown (align wit…
alexbelgium Jul 1, 2024
e85fa06
First version
alexbelgium Jul 3, 2024
fe0cabf
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Jul 3, 2024
cf62c5b
Add confirmation switch to recordings
alexbelgium Jul 3, 2024
e646d7a
Update
alexbelgium Jul 3, 2024
94f1027
Use confirmed_species_list
alexbelgium Jul 3, 2024
0c8ef49
Allow absence of file
alexbelgium Jul 3, 2024
df1be68
Allow ' in birdnames
alexbelgium Jul 3, 2024
9ac5b86
New icon
alexbelgium Jul 3, 2024
9935b61
Improve question icon
alexbelgium Jul 3, 2024
c76cd1e
Improve icon size
alexbelgium Jul 3, 2024
556bb0e
Remove message
alexbelgium Jul 3, 2024
106274f
Allow confirmation for individual species
alexbelgium Jul 4, 2024
27dcda2
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Jul 22, 2024
83d67fe
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Jul 25, 2024
e61769b
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Jul 29, 2024
b4f16e8
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Aug 7, 2024
eac8248
Only show confirmation of species if enabled
alexbelgium Aug 7, 2024
f70cfc7
Add confirm_species config
alexbelgium Aug 8, 2024
38b7779
Align with value of 0/1 instead of true/false
alexbelgium Aug 8, 2024
dc7ac06
Add CONFIRM_SPECIES to update_birdnet_snippets.sh
alexbelgium Aug 8, 2024
8aef867
Add CONFIRM_SPECIES to install_config.sh
alexbelgium Aug 8, 2024
4f01f83
Avoid unecessary <br>
alexbelgium Aug 9, 2024
781fbc1
Attach icon to text to improve readability on smaller screens
alexbelgium Aug 9, 2024
26fc547
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Aug 15, 2024
6005d03
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Aug 26, 2024
01a2b93
Potential specific confidence for confirmed species
alexbelgium Sep 6, 2024
d06c67e
Add detection confidence for confirmed species
alexbelgium Sep 6, 2024
fe6a5de
Update advanced.php
alexbelgium Sep 6, 2024
6e28bbf
CONFIDENCE_CONFIRMED is the correct variable
alexbelgium Sep 6, 2024
2317ea4
Add default DETECTION_CONFIRMED
alexbelgium Sep 6, 2024
a5d388c
Ignore confirmed detection levels if confirmed_species_list disabled …
alexbelgium Sep 7, 2024
1fea677
Update install_config.sh
alexbelgium Sep 7, 2024
7b3e590
Avoid setting a default value for DETECTION_CONFIRMED
alexbelgium Sep 7, 2024
f04200b
Add explanation to new variables
alexbelgium Sep 7, 2024
24bae70
Correct name of variable CONFIDENCE_CONFIRMED
alexbelgium Sep 7, 2024
8e842cb
Integer, not string
alexbelgium Sep 7, 2024
7e5df09
Specific section for confirmed species in options
alexbelgium Sep 9, 2024
f658049
Improve error messaging
alexbelgium Sep 9, 2024
9d697aa
Apply sciname_comname to confirmed species
alexbelgium Sep 9, 2024
402f417
Remove group by sciname, much faster
alexbelgium Sep 9, 2024
d289e42
Optimize code
alexbelgium Sep 9, 2024
a7a5ace
Revert to count method
alexbelgium Sep 9, 2024
d9b937f
Align count method
alexbelgium Sep 9, 2024
248cece
Correct code
alexbelgium Sep 9, 2024
e48ba80
Correct
alexbelgium Sep 9, 2024
99ded20
Also align confirmed_species for by_date
alexbelgium Sep 9, 2024
45b0d63
Remove CONFIDENCE_CONFIRMED
alexbelgium Sep 13, 2024
10c9e10
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Sep 14, 2024
b284cdf
Merge branch 'Nachtzuster:main' into confirmed_species
alexbelgium Sep 14, 2024
a62591d
Move chart to center
alexbelgium Sep 17, 2024
f9e10fd
Align css
alexbelgium Sep 17, 2024
0ab758d
Align dark-style.css
alexbelgium Sep 17, 2024
bde72af
Add stats title
alexbelgium Sep 17, 2024
79fe8c7
Removed title : cleaner look
alexbelgium Sep 17, 2024
75e7e90
Shorter titles for stats
alexbelgium Sep 17, 2024
64b7305
Shorter title, unique is implicit
alexbelgium Sep 17, 2024
ec68073
Invert Species Total and Today
alexbelgium Sep 17, 2024
9563542
Add sort by max confidence
alexbelgium Sep 23, 2024
d6d46a0
Add files via upload
alexbelgium Sep 23, 2024
6b5736b
Align the sort by confidence buttons
alexbelgium Sep 23, 2024
1749536
Remove useless added text
alexbelgium Sep 23, 2024
465c14f
Align sort_date with other icons
alexbelgium Sep 23, 2024
6ef4116
Merge pull request #11 from alexbelgium/Overview-UI
alexbelgium Sep 23, 2024
d2e7713
Merge pull request #12 from alexbelgium/sort_by_confidence
alexbelgium Sep 23, 2024
24e9b6d
Merge branch 'main' into confirmed_species
alexbelgium Sep 23, 2024
c7aec20
Merge pull request #13 from alexbelgium/confirmed_species
alexbelgium Sep 23, 2024
b26b2e0
Switch to alexbelgium fork
alexbelgium Sep 23, 2024
6e6b052
Add confidence values
alexbelgium Sep 24, 2024
c8fcef0
Distinct not needed
alexbelgium Sep 24, 2024
342bc91
Merge branch 'main' into sort_by_confidence
alexbelgium Sep 24, 2024
1439e6e
Merge pull request #14 from alexbelgium/sort_by_confidence
alexbelgium Sep 24, 2024
2e8e5e5
Fix showing species in occurence sort mode
alexbelgium Sep 24, 2024
68f8081
Initialize variable
alexbelgium Sep 24, 2024
0f3d7ff
Merge pull request #15 from alexbelgium/sort_by_confidence
alexbelgium Sep 24, 2024
a07fc50
Sci_Name needed for confirmed species
alexbelgium Sep 24, 2024
3b32a7e
Fix confirmed
alexbelgium Sep 24, 2024
bebcaba
New daily from from @jmtmp
alexbelgium Sep 25, 2024
d3742f6
Align to independent fort
alexbelgium Sep 25, 2024
3701cde
Remove background from labels
alexbelgium Sep 25, 2024
ed43dad
Align title
alexbelgium Sep 25, 2024
fd16388
No axis
alexbelgium Sep 25, 2024
d4cd306
Clean
alexbelgium Sep 25, 2024
1cc92e4
Color heatmaps dark
alexbelgium Sep 25, 2024
e35253e
Add comment
alexbelgium Sep 26, 2024
e11deee
Add selector for confirmed vs unconfirmed
alexbelgium Sep 30, 2024
af98335
Merge branch 'main' into confirmed_species
alexbelgium Sep 30, 2024
0da1c05
Merge pull request #18 from alexbelgium/confirmed_species
alexbelgium Sep 30, 2024
45bda07
Only keep Unconfirmed check
alexbelgium Oct 1, 2024
d790ca8
improve unconfirmed button
alexbelgium Oct 1, 2024
a4d8e1d
Update play.php
alexbelgium Oct 1, 2024
7bcc707
Convert checkbox to toggleswitch
alexbelgium Oct 1, 2024
0d042b0
Update sort_conf.svg
alexbelgium Oct 1, 2024
a216e91
Merge branch 'main' into switch_toggle_purge
alexbelgium Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Please note that installing BirdNET-Pi on top of other servers is not supported.

The system can be installed with:
```
curl -s https://raw.githubusercontent.com/Nachtzuster/BirdNET-Pi/main/newinstaller.sh | bash
curl -s https://raw.githubusercontent.com/alexbelgium/BirdNET-Pi/main/newinstaller.sh | bash
```
The installer takes care of any and all necessary updates, so you can run that as the very first command upon the first boot, if you'd like.

Expand Down Expand Up @@ -149,7 +149,7 @@ Please note that upgrading your underlying OS to Bookworm is not going to work.
Run these commands to migrate to this repo:
```
git remote remove origin
git remote add origin https://github.com/Nachtzuster/BirdNET-Pi.git
git remote add origin https://github.com/alexbelgium/BirdNET-Pi.git
./scripts/update_birdnet.sh
```
## Troubleshooting and Ideas
Expand Down
4 changes: 4 additions & 0 deletions homepage/images/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions homepage/images/question.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 21 additions & 43 deletions homepage/images/sort_date.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions homepage/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<div class="banner">
<div class="logo">
<?php if(isset($_GET['logo'])) {
echo "<a href=\"https://github.com/Nachtzuster/BirdNET-Pi.git\" target=\"_blank\"><img style=\"width:60;height:60;\" src=\"images/bird.png\"></a>";
echo "<a href=\"https://github.com/alexbelgium/BirdNET-Pi.git\" target=\"_blank\"><img style=\"width:60;height:60;\" src=\"images/bird.png\"></a>";
} else {
echo "<a href=\"https://github.com/Nachtzuster/BirdNET-Pi.git\" target=\"_blank\"><img src=\"images/bird.png\"></a>";
echo "<a href=\"https://github.com/alexbelgium/BirdNET-Pi.git\" target=\"_blank\"><img src=\"images/bird.png\"></a>";
}?>
</div>

Expand Down
2 changes: 0 additions & 2 deletions homepage/static/dark-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ button:hover {

.right-column {
flex: 90%;
margin-right: 10%;
}

.stats td {
Expand Down Expand Up @@ -515,7 +514,6 @@ button:hover {
overflow-x: hidden;
}
.overview .right-column .chart img {
margin-left: 5%;
margin-right: auto;
margin-top: 10px;
opacity: 0.7;
Expand Down
3 changes: 1 addition & 2 deletions homepage/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ button:hover {

.right-column {
flex: 90%;
margin-right: 10%;
}

.stats td {
Expand Down Expand Up @@ -491,7 +490,7 @@ button:hover {
overflow-x: hidden;
}
.overview .right-column .chart img {
margin-left: 5%;
margin-left: auto;
margin-right: auto;
margin-top: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion newinstaller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [[ ! -z $PACKAGES_MISSING ]] ; then
fi

branch=main
git clone -b $branch --depth=1 https://github.com/Nachtzuster/BirdNET-Pi.git ${HOME}/BirdNET-Pi &&
git clone -b $branch --depth=1 https://github.com/alexbelgium/BirdNET-Pi.git ${HOME}/BirdNET-Pi &&

$HOME/BirdNET-Pi/scripts/install_birdnet.sh
if [ ${PIPESTATUS[0]} -eq 0 ];then
Expand Down
24 changes: 20 additions & 4 deletions scripts/advanced.php
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,15 @@
$contents = preg_replace("/RAW_SPECTROGRAM=.*/", "RAW_SPECTROGRAM=0", $contents);
}

if(isset($_GET["confirm_species"])) {
$confirm_species = 1;
if(strcmp($CONFIRM_SPECIES,$config['CONFIRM_SPECIES']) !== 0) {
$contents = preg_replace("/CONFIRM_SPECIES=.*/", "CONFIRM_SPECIES=$confirm_species", $contents);
}
} else {
$contents = preg_replace("/CONFIRM_SPECIES=.*/", "CONFIRM_SPECIES=0", $contents);
}

if(isset($_GET["custom_image"])) {
$custom_image = $_GET["custom_image"];
if(strcmp($custom_image,$config['CUSTOM_IMAGE']) !== 0) {
Expand Down Expand Up @@ -428,12 +437,19 @@ function collectrtspUrls() {
<table class="settingstable"><tr><td>
<h2>Options</h2>
<label for="silence_update_indicator">Silence Update Indicator: </label>
<input type="checkbox" name="silence_update_indicator" <?php if($newconfig['SILENCE_UPDATE_INDICATOR'] == 1) { echo "checked"; };?> ><br>
<p>This allows you to quiet the display of how many commits your installation is behind by relative to the Github repo. This number appears next to "Tools" when you're 50 or more commits behind.</p>
<input type="checkbox" name="silence_update_indicator" <?php if($newconfig['SILENCE_UPDATE_INDICATOR'] == 1) { echo "checked"; };?> >
<p>This allows you to quiet the display of how many commits your installation is behind by relative to the Github repo. This number appears next to "Tools" when you're 50 or more commits behind.</p><br>

<label for="raw_spectrogram">Minimalist Spectrograms: </label>
<input type="checkbox" name="raw_spectrogram" <?php if($newconfig['RAW_SPECTROGRAM'] == 1) { echo "checked"; };?> ><br>
<p>This allows you to remove the axes and labels of the spectrograms that are generated by Sox for each detection for a cleaner appearance.</p>
<input type="checkbox" name="raw_spectrogram" <?php if($newconfig['RAW_SPECTROGRAM'] == 1) { echo "checked"; };?> >
<p>This allows you to remove the axes and labels of the spectrograms that are generated by Sox for each detection for a cleaner appearance.</p><br>
</td></tr></table><br>

<table class="settingstable"><tr><td>
<h2>Option : Confirmed Species</h2>
<label for="confirm_species">Confirmation of species: </label>
<input type="checkbox" name="confirm_species" <?php if($newconfig['CONFIRM_SPECIES'] == 1) { echo "checked"; };?> >
<p>This allows to visually mark species that were manually confirmed as existing in the area. A new question mark appears next to species names in the Recordings page. Clicking it changes the icon to a checkmark, and add the species to the file confirmed_species_list.txt</p>
</td></tr></table><br>

<table class="settingstable"><tr><td>
Expand Down
1 change: 1 addition & 0 deletions scripts/clear_all_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ echo "Re-creating necessary directories"
sudo -u ${USER} ln -fs $(dirname $my_dir)/exclude_species_list.txt $my_dir
sudo -u ${USER} ln -fs $(dirname $my_dir)/include_species_list.txt $my_dir
sudo -u ${USER} ln -fs $(dirname $my_dir)/whitelist_species_list.txt $my_dir
sudo -u ${USER} ln -fs $(dirname $my_dir)/confirmed_species_list.txt $my_dir
sudo -u ${USER} ln -fs $(dirname $my_dir)/homepage/* ${EXTRACTED}
sudo -u ${USER} ln -fs $(dirname $my_dir)/model/labels.txt ${my_dir}
sudo -u ${USER} ln -fs $my_dir ${EXTRACTED}
Expand Down
Loading
Loading