Merge branch 'upstream'

We need to allow html to be passed into format_html.

main/templatetags/pgp.py

@@ -59,7 +59,7 @@ def pgp_key_link(key_id, link_text=None):
     return format_html('<a href="{url}" title="PGP key search for {key}">{content}</a>',
                        url=url,
                        key=format_key(key_id),
-                       content=link_text)
+                       content=mark_safe(link_text))
 
 
 @register.simple_tag

requirements.txt

@@ -1,5 +1,5 @@
 -e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==5.1.10
+Django==5.1.13
 IPy==1.1
 Markdown==3.3.7
 bencode.py==4.0.0

sitestatic/archweb.css

@@ -1207,12 +1207,12 @@ ul.signoff-list {
 
     /* style input as a normal anchor */
     input {
-      background: none!important;
+      background: none !important;
       border: none;
-      padding: 0!important;
+      padding: 0 0.5em !important;
-      /*optional*/
+      /* optional */
       font-family: arial, sans-serif;
-      font-size: 0.9em;
+      font-size: 100%;
       /*input has OS specific font-family*/
       color: #07b;
     }

todolists/templatetags/todolists.py

@@ -13,7 +13,7 @@ def todopkg_details_link(todopkg):
     pkg = todopkg.pkg
     if not pkg:
         return todopkg.pkgname
-    link = '<a href={url}s" title="View package details for {pkgname}">{pkgname}</a>'
+    link = '<a href="{url}" title="View package details for {pkgname}">{pkgname}</a>'
     url = pkg_absolute_url(todopkg.repo, todopkg.arch, pkg.pkgname)
     return format_html(link, url=url, pkgname=pkg.pkgname)