Update 'Images' button to link to ISO releases

The 'Images' button in the user GUI now provides links for releases of PC and kiosk image ISOs. Previously, ISO images were uploaded to the running admin-site container and displayed in the GUI.

With this change, only URLs to the releases are configured and supplied during startup, streamlining the process.

Author: henrikmagni

admin_site/os2borgerpc_admin/context_processors.py

@@ -0,0 +1,10 @@
+from django.conf import settings
+
+def iso_urls(request):
+    """
+    Adds PC and Kiosk ISO URLs to the context for all templates.
+    """
+    return {
+        "pc_image_releases_url": getattr(settings, "PC_IMAGE_RELEASES_URL", ""),
+        "kiosk_image_releases_url": getattr(settings, "KIOSK_IMAGE_RELEASES_URL", ""),
+    }

admin_site/os2borgerpc_admin/settings.py

@@ -24,6 +24,9 @@
     else None
 )
 
+PC_IMAGE_RELEASES_URL = os.environ.get("PC_IMAGE_RELEASES_URL")
+KIOSK_IMAGE_RELEASES_URL = os.environ.get("KIOSK_IMAGE_RELEASES_URL")
+
 MANAGERS = ADMINS
 
 # Template settings
@@ -41,6 +44,7 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
+                'os2borgerpc_admin.context_processors.iso_urls',
             ],
             "builtins": [
                 "system.templatetags.custom_tags",

admin_site/system/views.py

@@ -3934,7 +3934,6 @@ def get_context_data(self, **kwargs):  # noqa
 
         return context
 
-
 class ImageVersionRedirect(RedirectView):
     def get_redirect_url(self, **kwargs):
         site = get_object_or_404(Site, uid=kwargs["slug"])

admin_site/templates/site_with_navigation.html

@@ -117,9 +117,31 @@ <h2 class="text-light">{% translate "Users & Images" %}</h2>
     </a>
 
     {% set_css_class_active request.resolver_match.url_name "images" as current_url_images %}
-    <a class="nav-link link-light {{ current_url_images }}" href="{% url 'images' slug=site.url %}">
-      <span class="material-icons"> cloud_download </span> {% translate "Images" %}
-    </a>
+    <div class="nav-item dropdown">
+      <a 
+          class="nav-link link-light dropdown-toggle" 
+          href="#" 
+          id="imageDropdown" 
+          role="button" 
+          data-bs-toggle="dropdown" 
+          aria-expanded="false"
+      >
+          <span class="material-icons"> cloud_download </span> {% translate "Images" %}
+      </a>
+      <ul class="dropdown-menu" aria-labelledby="imageDropdown">
+          <li>
+              <a class="dropdown-item" href="{{ pc_image_releases_url }}" target="_blank" rel="noopener noreferrer">
+                  PC Image releases
+              </a>
+          </li>
+          <li>
+              <a class="dropdown-item" href="{{ kiosk_image_releases_url }}" target="_blank" rel="noopener noreferrer">
+                  Kiosk Image releases
+              </a>
+          </li>
+      </ul>
+    </div>
+  
     <hr>
 
     <h2 class="text-light">{% translate "Documentation" %}</h2>

compose.yaml

@@ -22,6 +22,8 @@ services:
             ALLOWED_HOSTS: "*"
             CORE_SCRIPT_COMMIT_HASH: db319672efdcc0f7402c4a7370aa763be9960c38
             CORE_SCRIPT_VERSION_TAG: v0.1.4
+            PC_IMAGE_RELEASES_URL: https://github.com/OS2borgerPC/os2borgerpc-image/releases
+            KIOSK_IMAGE_RELEASES_URL: https://github.com/OS2borgerPC/os2borgerpc-kiosk-image/releases
             DEBUG: True
             SECRET_KEY: v3rys1kr3t
             # Admin contact - fill in your own name and email as desired.