Merge branch 'develop' into feature/notification-date-start-end

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+liberapay: jierka
+custom: https://paypal.me/jierka

docs/setup-run-headless.md

@@ -6,9 +6,10 @@
 
 
 ---
-## 📡 Run the manager
+## 📡 Run the studio instance
 
-### with docker run (for test)
+### with docker run
+> ⚠️ `docker ... --rm` option is not suitable for production use because it won't survive a reboot. However, it's okay for quick testing. You need to use --restart=always instead to ensure that it persists.
 ```bash
 # (Optional) Install docker if needed
 curl -sSL get.docker.com | sh && sudo usermod -aG docker $(whoami) && logout # then login again
@@ -17,7 +18,7 @@ curl -sSL get.docker.com | sh && sudo usermod -aG docker $(whoami) && logout # t
 cd ~ && mkdir -p obscreen/data/db obscreen/data/uploads && cd obscreen
 
 # Run the Docker container
-docker run --rm --name obscreen --pull=always \
+docker run --restart=always --name obscreen --pull=always \
   -e DEBUG=false \
   -e PORT=5000 \
   -e PLAYER_AUTOSTART_FILE=/app/var/run/play \
@@ -67,12 +68,13 @@ cp .env.dist .env
 - Server configuration is editable in `.env` file.
 - Application configuration will be available at `http://localhost:5000/settings` page after run.
 
-#### Start server (for test)
+#### Start server
+> ⚠️ Not suitable for production use because it won't survive a reboot. However, it's okay for quick testing. You need to use `systemd` (detailed in next section) to ensure that it persists.
 ```bash
 python ./obscreen.py
 ```
 
-#### Start server forever with systemctl
+#### Start server forever with systemd
 ```bash
 cat "$(pwd)/system/obscreen-studio.service" | sed "s#/home/pi#$HOME#g" | sed "s#=pi#=$USER#g" | sudo tee /etc/systemd/system/obscreen-studio.service
 sudo systemctl daemon-reload
@@ -93,7 +95,7 @@ sudo journalctl -u obscreen-studio -f
 
 
 ---
-## 📺 Run the player
+## 📺 Run the player instance
 ### Manually on any device capable of running chromium
 When you run the browser yourself don't forget to use these flags for chromium browser:
 ```bash

docs/setup-run-on-rpi.md

@@ -13,16 +13,17 @@
 
 ---
 
-## 📺 Run the player
+## 📺 Run the player instance
 Install player autorun by executing following script
 ```bash
 curl -fsSL https://raw.githubusercontent.com/jr-k/obscreen/master/system/install-autorun-rpi.sh | sudo bash -s -- $USER $HOME
 ```
 
 ---
-## 📡 Run the manager
+## 📡 Run the studio instance
 
-### with docker run (for test)
+### with docker run
+> ⚠️ `docker ... --rm` option is not suitable for production use because it won't survive a reboot. However, it's okay for quick testing. You need to use --restart=always instead to ensure that it persists.
 ```bash
 # (Optional) Install docker if needed
 curl -sSL get.docker.com | sh && sudo usermod -aG docker $(whoami) && logout # then login again
@@ -84,7 +85,8 @@ cp .env.dist .env
 - Server configuration is editable in `.env` file.
 - Application configuration will be available at `http://raspberrypi.local:5000/settings` page after run.
 
-#### Start server (for test)
+#### Start server
+> ⚠️ Not suitable for production use because it won't survive a reboot. However, it's okay for quick testing. You need to use `systemd` (detailed in next section) to ensure that it persists.
 ```bash
 python ./obscreen.py
 ```

version.txt

@@ -1 +1 @@
-1.19.3
+1.19.5

views/base.jinja.html

@@ -28,7 +28,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="{{ STATIC_PREFIX }}css/lib/fontawesome.min.css" />
     <link rel="stylesheet" href="{{ STATIC_PREFIX }}css/compiled/main-studio.css" />
     {% block add_css %}{% endblock %}
     {{ HOOK(H_ROOT_CSS) }}
@@ -145,7 +145,7 @@
         'js_sysinfo_restart_loading': '{{ l.js_sysinfo_restart_loading }}'
     };
 </script>
-<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
+<script src="{{ STATIC_PREFIX }}js/lib/jquery.min.js"></script>
 <script src="{{ STATIC_PREFIX }}js/utils.js"></script>
 <script src="{{ STATIC_PREFIX }}js/global.js"></script>
 {{ HOOK(H_ROOT_JAVASCRIPT) }}

views/fleet/player-group/component/table.jinja.html

@@ -57,7 +57,7 @@
                 {% endif %}
             </td>
             <td class="actions tac">
-                {% if node_player_group.playlist_id and playlists[node_player_group.playlist_id] %}
+                {% if node_player_group.id %}
                     <a href="javascript:void(0);" class="item-edit node-player-group-edit">
                         <i class="fa fa-pencil"></i>
                     </a>