From 997f5d267b6aeb9264e136252705bffc667a086a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Br=C3=BCckmann?= <64bit@posteo.de> Date: Mon, 25 Jan 2021 09:59:10 +0100 Subject: [PATCH] Properly add css --- fdroidserver/common.py | 1 + fdroidserver/index.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a19795a0..4a5a39df 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -3764,6 +3764,7 @@ def is_repo_file(filename): and not filename.endswith(b'.idsig') \ and not filename.endswith(b'.log.gz') \ and os.path.basename(filename) not in [ + b'index.css', b'index.jar', b'index_unsigned.jar', b'index.xml', diff --git a/fdroidserver/index.py b/fdroidserver/index.py index 76f92030..5465573d 100644 --- a/fdroidserver/index.py +++ b/fdroidserver/index.py @@ -149,7 +149,7 @@ def make_website(apps, repodir, repodict): {name} - + @@ -160,16 +160,20 @@ def make_website(apps, repodir, repodict):

{name}

-

-QR: {name} +

+QR: {name} {description}
{details}

+

+ {link} + +

""".format(name=name, description=description, -details="Currently it serves {} apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:".format(len(apps)), +details="Currently it serves {} apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:".format(len(apps)), link=link)) css_file = os.path.join(repodir, "index.css") @@ -286,7 +290,6 @@ fieldset select, fieldset input, #reposelect select, #reposelect input { font-si } """) - #qrcode.make(repodir["address"]).save(os.path.join(repodir, "images", "fdroid_repo_qr.png")) images_dir = os.path.join(repodir, "images") if not os.path.exists(images_dir): os.makedirs(images_dir)