Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions main/templatetags/cdn.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
@register.simple_tag
def jquery():
version = '3.6.0'
filename = 'jquery-%s.min.js' % version
filename = f'jquery-{version}.min.js'
link = staticfiles_storage.url(filename)
return mark_safe('<script type="text/javascript" src="%s"></script>' % link)
return mark_safe(f'<script type="text/javascript" src="{link}"></script>')


@register.simple_tag
def jquery_tablesorter():
version = '2.31.0'
filename = 'jquery.tablesorter-%s.min.js' % version
filename = f'jquery.tablesorter-{version}.min.js'
link = staticfiles_storage.url(filename)
return format_html('<script type="text/javascript" src="%s"></script>' % link)
return format_html('<script type="text/javascript" src="{link}"></script>', link=link)


@register.simple_tag
def d3js():
version = '3.5.0'
filename = 'd3-%s.min.js' % version
filename = f'd3-{version}.min.js'
link = staticfiles_storage.url(filename)
return format_html('<script type="text/javascript" src="%s"></script>' % link)
return format_html('<script type="text/javascript" src="{link}"></script>', link=link)

# vim: set ts=4 sw=4 et:
7 changes: 5 additions & 2 deletions main/templatetags/flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
def country_flag(country):
if not country:
return ''
return format_html('<span class="fam-flag fam-flag-%s" title="%s"></span> ' % (
str(country.code).lower(), str(country.name)))
return format_html(
'<span class="fam-flag fam-flag-{country_code}" title="{country_name}"></span> ',
country_code=str(country.code).lower(),
country_name=str(country.name),
)


# vim: set ts=4 sw=4 et:
6 changes: 4 additions & 2 deletions main/templatetags/pgp.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ def pgp_key_link(key_id, link_text=None):
key_id)
if link_text is None:
link_text = '0x%s' % key_id[-8:]
values = (url, format_key(key_id), link_text)
return format_html('<a href="%s" title="PGP key search for %s">%s</a>' % values)
return format_html('<a href="{url}" title="PGP key search for {key}">{content}</a>',
url=url,
key=format_key(key_id),
content=link_text)


@register.simple_tag
Expand Down
4 changes: 2 additions & 2 deletions packages/templatetags/package_extras.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def pkg_details_link(pkg, link_title=None, honor_flagged=False):
link_content = link_title
if honor_flagged and pkg.flag_date:
link_content = '<span class="flagged">%s</span>' % link_title
link = '<a href="%s" title="View package details for %s">%s</a>'
return format_html(link % (pkg.get_absolute_url(), pkg.pkgname, link_content))
link = '<a href="{link}" title="View package details for {pkgname}">{content}</a>'
return format_html(link, link=pkg.get_absolute_url(), pkgname=pkg.pkgname, content=link_content)


# vim: set ts=4 sw=4 et:
6 changes: 6 additions & 0 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,10 @@

INSTALLED_APPS = [*list(INSTALLED_APPS), 'django_prometheus']

# Assume all URLField will be HTTPS if not specified.
# NOTE: this can be removed once we bump Django to 6.x
# where `https` becomes the default.
FORMS_URLFIELD_ASSUME_HTTPS = True


# vim: set ts=4 sw=4 et:
5 changes: 3 additions & 2 deletions todolists/templatetags/todolists.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ def todopkg_details_link(todopkg):
pkg = todopkg.pkg
if not pkg:
return todopkg.pkgname
link = '<a href="%s" title="View package details for %s">%s</a>'
link = '<a href={url}s" title="View package details for {pkgname}">{pkgname}</a>'
url = pkg_absolute_url(todopkg.repo, todopkg.arch, pkg.pkgname)
return format_html(link % (url, pkg.pkgname, pkg.pkgname))
return format_html(link, url=url, pkgname=pkg.pkgname)


# vim: set ts=4 sw=4 et: