1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00

Properly add css

This commit is contained in:
Benedikt Brückmann 2021-01-25 09:59:10 +01:00
parent 44ee531426
commit 997f5d267b
2 changed files with 9 additions and 5 deletions

View File

@ -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',

View File

@ -149,7 +149,7 @@ def make_website(apps, repodir, repodict):
<META NAME="viewport" CONTENT="width=device-width; initial-scale=1.0; minimum-scale=0.5; maximum-scale=2.0; user-scalable=1;" />
<TITLE>{name}</TITLE>
<BASE HREF='index.html'/>
<!--<LINK REL='stylesheet' TYPE='text/css' HREF='index.css' />-->
<LINK REL='stylesheet' TYPE='text/css' HREF='index.css' />
<LINK REL='icon' HREF='icons/fdroid-icon.png' TYPE='image/png' />
<LINK REL='shortcut icon' HREF='icons/fdroid-icon.png' TYPE='image/png' />
<META property="og:site_name" content="{name}" />
@ -160,16 +160,20 @@ def make_website(apps, repodir, repodict):
</HEAD><BODY>
<h2>{name}</h2>
<div id='intro'>
<p style='margin-bottom:.2em;'><span style='float:right;width:50px;margin-left:.5em;'>
<a href='images/fdroid_repo_qr.png' title='QR: {name}'><img src='images/fdroid_repo_qr.png' alt='QR: {name}' width='50'></a>
<p style='margin-bottom:.2em;'><span style='float:right;width:100px;margin-left:.5em;'>
<a href='images/fdroid_repo_qr.png' title='QR: {name}'><img src='images/fdroid_repo_qr.png' alt='QR: {name}' width='100'></a>
</span>
{description}<br/>
{details}</p>
<p class="center" style="margin-top:.5em">
<a href="{link}">
<code style="color:#000000;font-weight:bold;">{link}</code>
</a>
</p>
</div>
</BODY>""".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 <kbd>{}</kbd> 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)