diff options
Diffstat (limited to 'templates')
22 files changed, 120 insertions, 110 deletions
diff --git a/templates/mirrors/error_table.html.jinja b/templates/mirrors/error_table.html index 132aae63..03de4944 100644 --- a/templates/mirrors/error_table.html.jinja +++ b/templates/mirrors/error_table.html @@ -1,3 +1,5 @@ +{% load flags %} + <table id="errorlog_mirrors" class="results"> <thead> <tr> @@ -11,14 +13,14 @@ </tr> </thead> <tbody> - {% for log in error_logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> + {% for log in error_logs %}<tr class="{% cycle 'odd' 'even' %}"> <td>{{ log.url.url }}</td> <td>{{ log.url.protocol.protocol }}</td> - <td class="country">{{ country_flag(log.url.country) }}{{ log.url.country.name }}</td> + <td class="country">{% country_flag log.url.country %}{{ log.url.country.name }}</td> <td class="wrap">{{ log.error|linebreaksbr }}</td> - <td>{{ log.last_occurred|date('Y-m-d H:i') }}</td> + <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> <td>{{ log.error_count }}</td> - <td><a href="{{ log.url.get_absolute_url() }}">details</a></td> + <td><a href="{{ log.url.get_absolute_url }}">details</a></td> </tr>{% endfor %} </tbody> </table> diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 3220195d..55bd85e8 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -90,10 +90,10 @@ </table> <h3>Available URLs</h3> - {% include "mirrors/mirror_details_urls.html.jinja" %} + {% include "mirrors/mirror_details_urls.html" %} <h3>Error Log</h3> - {% include "mirrors/error_table.html.jinja" %} + {% include "mirrors/error_table.html" %} </div> <div class="box"> diff --git a/templates/mirrors/mirror_details_urls.html.jinja b/templates/mirrors/mirror_details_urls.html index 7ab1548b..4cada31e 100644 --- a/templates/mirrors/mirror_details_urls.html.jinja +++ b/templates/mirrors/mirror_details_urls.html @@ -1,3 +1,5 @@ +{% load flags %} + <table id="available_urls" class="results"> <thead> <tr> @@ -17,18 +19,18 @@ </thead> <tbody> {% for m_url in urls %} - <tr class="{{ loop.cycle('odd', 'even') }}"> + <tr class="{% cycle 'odd' 'even' %}"> <td>{% if m_url.protocol.is_download %}<a href="{{ m_url.url }}">{{ m_url.url }}</a>{% else %}{{ m_url.url }}{% endif %}</td> <td>{{ m_url.protocol }}</td> - <td class="country">{{ country_flag(m_url.country) }}{{ m_url.country.name }}</td> + <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td> <td>{{ m_url.has_ipv4|yesno|capfirst }}</td> <td>{{ m_url.has_ipv6|yesno|capfirst }}</td> - <td>{{ m_url.last_sync|date('Y-m-d H:i')|default('unknown') }}</td> - <td>{{ m_url.completion_pct|percentage(1) }}</td> - <td>{{ m_url.delay|duration|default('unknown') }}</td> - <td>{{ m_url.duration_avg|floatvalue(2) }}</td> - <td>{{ m_url.duration_stddev|floatvalue(2) }}</td> - <td>{{ m_url.score|floatvalue(1)|default('∞') }}</td> + <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td> + <td>{{ m_url.completion_pct|percentage:1 }}</td> + <td>{{ m_url.delay|duration|default:'unknown' }}</td> + <td>{{ m_url.duration_avg|floatvalue:2 }}</td> + <td>{{ m_url.duration_stddev|floatvalue:2 }}</td> + <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td> <td><a href="{{ m_url.id }}/">Details</a></td> </tr> {% endfor %} diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index f11d57ca..250d9bad 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -60,18 +60,18 @@ <a name="outofsync" id="outofsync"></a> <h3>Out of Sync Mirrors</h3> {% with urls=bad_urls table_id='outofsync_mirrors' %} - {% include "mirrors/status_table.html.jinja" %} + {% include "mirrors/status_table.html" %} {% endwith %} <a name="successful" id="successful"></a> <h3>Successfully Syncing Mirrors</h3> {% with urls=good_urls table_id='successful_mirrors' %} - {% include "mirrors/status_table.html.jinja" %} + {% include "mirrors/status_table.html" %} {% endwith %} <a name="errorlog" id="errorlog"></a> <h3>Mirror Syncing Error Log</h3> - {% include "mirrors/error_table.html.jinja" %} + {% include "mirrors/error_table.html" %} </div> {% endblock %} diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html new file mode 100644 index 00000000..3f8cd2d9 --- /dev/null +++ b/templates/mirrors/status_table.html @@ -0,0 +1,29 @@ +{% load flags %} +<table id="{{ table_id }}" class="results"> + <thead> + <tr> + <th>Mirror URL</th> + <th>Protocol</th> + <th>Country</th> + <th>Completion %</th> + <th>μ Delay (hh:mm)</th> + <th>μ Duration (s)</th> + <th>σ Duration (s)</th> + <th>Mirror Score</th> + <th></th> + </tr> + </thead> + <tbody> + {% for m_url in urls %}<tr class="{% cycle 'odd' 'even' }}"> + <td>{{ m_url.url }}</td> + <td>{{ m_url.protocol }}</td> + <td class="country">{% country_flag m_url.country %}{{ m_url.country.name }}</td> + <td>{{ m_url.completion_pct|percentage:1 }}</td> + <td>{{ m_url.delay|duration|default:unknown }}</td> + <td>{{ m_url.duration_avg|floatvalue:2 }}</td> + <td>{{ m_url.duration_stddev|floatvalue:2 }}</td> + <td>{{ m_url.score|floatvalue:1|default:'∞' }}</td> + <td><a href="{{ m_url.get_absolute_url }}">details</a></td> + </tr>{% endfor %} + </tbody> +</table> diff --git a/templates/mirrors/status_table.html.jinja b/templates/mirrors/status_table.html.jinja deleted file mode 100644 index 598a1af0..00000000 --- a/templates/mirrors/status_table.html.jinja +++ /dev/null @@ -1,28 +0,0 @@ -<table id="{{ table_id }}" class="results"> - <thead> - <tr> - <th>Mirror URL</th> - <th>Protocol</th> - <th>Country</th> - <th>Completion %</th> - <th>μ Delay (hh:mm)</th> - <th>μ Duration (s)</th> - <th>σ Duration (s)</th> - <th>Mirror Score</th> - <th></th> - </tr> - </thead> - <tbody> - {% for m_url in urls %}<tr class="{{ loop.cycle('odd', 'even') }}"> - <td>{{ m_url.url }}</td> - <td>{{ m_url.protocol }}</td> - <td class="country">{{ country_flag(m_url.country) }}{{ m_url.country.name }}</td> - <td>{{ m_url.completion_pct|percentage(1) }}</td> - <td>{{ m_url.delay|duration|default('unknown') }}</td> - <td>{{ m_url.duration_avg|floatvalue(2) }}</td> - <td>{{ m_url.duration_stddev|floatvalue(2) }}</td> - <td>{{ m_url.score|floatvalue(1)|default('∞') }}</td> - <td><a href="{{ m_url.get_absolute_url() }}">details</a></td> - </tr>{% endfor %} - </tbody> -</table> diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html index 96fcc49d..dd83a56c 100644 --- a/templates/mirrors/url_details.html +++ b/templates/mirrors/url_details.html @@ -57,7 +57,7 @@ </table> <h3>Check Logs</h3> - {% include "mirrors/url_details_logs.html.jinja" %} + {% include "mirrors/url_details_logs.html" %} </div> {% endblock %} diff --git a/templates/mirrors/url_details_logs.html.jinja b/templates/mirrors/url_details_logs.html index 51f54931..a87e58d4 100644 --- a/templates/mirrors/url_details_logs.html.jinja +++ b/templates/mirrors/url_details_logs.html @@ -1,3 +1,5 @@ +{% load flags %} + <table id="check_logs" class="results"> <thead> <tr> @@ -12,11 +14,11 @@ </tr> </thead> <tbody> - {% for log in logs %}<tr class="{{ loop.cycle('odd', 'even') }}"> - <td>{{ log.check_time|date('Y-m-d H:i') }}</td> - <td class="country">{% if log.location %}{{ country_flag(log.location.country) }}{{ log.location.country.name }}{% else %}Unknown{% endif %}</td> + {% for log in logs %}<tr class="{% cycle 'odd' 'even' %}"> + <td>{{ log.check_time|date:'Y-m-d H:i' }}</td> + <td class="country">{% if log.location %}{% country_flag log.location.country %}{{ log.location.country.name }}{% else %}Unknown{% endif %}</td> <td>{% if log.location %}{{ log.location.source_ip }}{% else %}Unknown{% endif %}</td> - <td>{{ log.last_sync|date('Y-m-d H:i') }}</td> + <td>{{ log.last_sync|date:'Y-m-d H:i' }}</td> <td>{{ log.delay|duration }}</td> <td>{{ log.duration|floatvalue }}</td> <td>{{ log.is_success|yesno|capfirst }}</td> diff --git a/templates/news/news_email_notification.txt b/templates/news/news_email_notification.txt new file mode 100644 index 00000000..6bc8f821 --- /dev/null +++ b/templates/news/news_email_notification.txt @@ -0,0 +1,3 @@ +{{ news.content }} + +URL: {{ WEB_URL }}{{ news.get_absolute_url }} diff --git a/templates/packages/details.html b/templates/packages/details.html index 82f2c604..aa737287 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -5,7 +5,7 @@ {% block navbarclass %}anb-packages{% endblock %} {% block content %} -{% include "packages/details.html.jinja" %} +{% include "packages/package_details.html" %} {% endblock %} {% block script_block %} diff --git a/templates/packages/details_depend.html.jinja b/templates/packages/details_depend.html index a2d3a010..f471bc66 100644 --- a/templates/packages/details_depend.html.jinja +++ b/templates/packages/details_depend.html @@ -1,8 +1,8 @@ -{% import 'packages/details_link.html.jinja' as details %}<li>{% if depend.pkg == None %} -{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} <span class="virtual-dep">({% for pkg in depend.providers %}{{ details.details_link(pkg) }}{% if not loop.last %}, {% endif %}{% endfor %})</span> -{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} <span class="virtual-dep">(virtual)</span> +{% load details_link %}<li>{% if depend.pkg == None %} +{% if depend.providers %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">({% for pkg in depend.providers %}{% details_link pkg %}{% if not forloop.last %}, {% endif %}{% endfor %})</span> +{% else %}{{ depend.dep.name }}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} <span class="virtual-dep">(virtual)</span> {% endif %}{% else %} -{{ details.details_link(depend.pkg) }}{{ depend.dep.comparison|default("", true) }}{{ depend.dep.version|default("", true) }} +{% details_link depend.pkg %}{{ depend.dep.comparison|default:"" }}{{ depend.dep.version|default:"" }} {% if depend.pkg.repo.testing %} <span class="testing-dep"> (testing)</span> {% endif %}{% if depend.pkg.repo.staging %} <span class="staging-dep"> (staging)</span> {% endif %}{% endif %} diff --git a/templates/packages/details_link.html b/templates/packages/details_link.html new file mode 100644 index 00000000..87d66d6a --- /dev/null +++ b/templates/packages/details_link.html @@ -0,0 +1 @@ +<a href="{{ pkg.get_absolute_url }}" title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a> diff --git a/templates/packages/details_link.html.jinja b/templates/packages/details_link.html.jinja deleted file mode 100644 index b7e75fe5..00000000 --- a/templates/packages/details_link.html.jinja +++ /dev/null @@ -1 +0,0 @@ -{% macro details_link(pkg) %}<a href="{{ pkg.get_absolute_url() }}" title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a>{% endmacro %} diff --git a/templates/packages/details_relatedto.html b/templates/packages/details_relatedto.html new file mode 100644 index 00000000..560a67f8 --- /dev/null +++ b/templates/packages/details_relatedto.html @@ -0,0 +1,3 @@ +{% load details_link %}{% for related in all_related %}{% with best_satisfier=related.get_best_satisfier %} +<span class="related">{% if best_satisfier == None %}{{ related.name }}{% else %}{% details_link best_satisfier %}{% endif %}{{ related.comparison|default:'' }}{{ related.version|default:'' }}{% if not forloop.last %}, {% endif %}</span> +{% endwith %}{% endfor %} diff --git a/templates/packages/details_relatedto.html.jinja b/templates/packages/details_relatedto.html.jinja deleted file mode 100644 index 818224de..00000000 --- a/templates/packages/details_relatedto.html.jinja +++ /dev/null @@ -1,3 +0,0 @@ -{% import 'packages/details_link.html.jinja' as details %}{% for related in all_related %}{% with best_satisfier = related.get_best_satisfier() %} -<span class="related">{% if best_satisfier == None %}{{ related.name }}{% else %}{{ details.details_link(best_satisfier) }}{% endif %}{{ related.comparison|default('', true) }}{{ related.version|default('', true) }}{% if not loop.last %}, {% endif %}</span> -{% endwith %}{% endfor %} diff --git a/templates/packages/details_requiredby.html.jinja b/templates/packages/details_requiredby.html index b083a7fc..c8084649 100644 --- a/templates/packages/details_requiredby.html.jinja +++ b/templates/packages/details_requiredby.html @@ -1,4 +1,4 @@ -{% import 'packages/details_link.html.jinja' as details %}<li>{{ details.details_link(req.pkg) }} +{% load details_link %}<li>{% details_link req.pkg %} {% if req.name != pkg.pkgname %}<span class="virtual-dep"> (requires {{ req.name }})</span> {% endif %}{% if req.pkg.repo.testing %}<span class="testing-dep"> (testing)</span> {% endif %}{% if req.pkg.repo.staging %}<span class="staging-dep"> (staging)</span> diff --git a/templates/packages/files.html b/templates/packages/files.html index 667a77cb..e2987e5f 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -9,7 +9,7 @@ <p>Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.</p> <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p> <div id="metadata"><div id="pkgfilelist"> - {% include "packages/files_list.html.jinja" %} + {% include "packages/files_list.html" %} </div></div> </div> diff --git a/templates/packages/files_list.html.jinja b/templates/packages/files_list.html index ab3e1210..ab3e1210 100644 --- a/templates/packages/files_list.html.jinja +++ b/templates/packages/files_list.html diff --git a/templates/packages/details.html.jinja b/templates/packages/package_details.html index 80508392..f79667a0 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/package_details.html @@ -1,4 +1,4 @@ -{% import 'packages/details_link.html.jinja' as details %} +{% load details_link %} <div id="pkgdetails" class="box"> <h2>{{ pkg.pkgname }} {{ pkg.full_version }}</h2> @@ -7,20 +7,20 @@ <h4>Package Actions</h4> <ul class="small"> <li> - <a href="{{ scm_link(pkg, 'tree') }}" title="View source files for {{ pkg.pkgname }}">Source Files</a> / - <a href="{{ scm_link(pkg, 'log') }}" title="View changes for {{ pkg.pkgname }}">View Changes</a> + <a href="{% scm_link pkg 'tree' %}" title="View source files for {{ pkg.pkgname }}">Source Files</a> / + <a href="{% scm_link pkg 'log' %}" title="View changes for {{ pkg.pkgname }}">View Changes</a> </li> <li> - <a href="{{ bugs_list(pkg) }}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a> / - <a href="{{ bug_report(pkg) }}" title="Report new bug for {{ pkg.pkgname }}">Add New Bug</a> - / <a href="{{ flag_unfree(pkg) }}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a> + <a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a> / + <a href="{% bug_report pkg %}" title="Report new bug for {{ pkg.pkgname }}">Add New Bug</a> + / <a href="{% flag_unfree pkg %}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a> </li> - <li><a href="{{ wiki_link(pkg) }}" title="Search wiki for {{ pkg.pkgname }}">Search Wiki</a></li> + <li><a href="{% wiki_link pkg %}" title="Search wiki for {{ pkg.pkgname }}">Search Wiki</a></li> {% if pkg.flag_date %} <li><span class="flagged">Flagged out-of-date on {{ pkg.flag_date|date }}</span></li> - {% with tp = pkg.in_testing() %}{% if tp %} + {% with tp=pkg.in_testing %}{% if tp %} <li><span class="flagged">Version - <a href="{{ tp.get_absolute_url() }}" + <a href="{{ tp.get_absolute_url }}" title="Testing package details for {{ tp.pkgname }}">{{ tp.full_version }}</a> in testing</span></li> {% endif %}{% endwith %} @@ -56,12 +56,12 @@ {% endif %} </div> - {% with others = pkg.elsewhere() %}{% if others %} + {% with others=pkg.elsewhere %}{% if others %} <div id="elsewhere" class="widget"> <h4>Versions Elsewhere</h4> <ul> {% for o in others %} - <li><a href="{{ o.get_absolute_url() }}" + <li><a href="{{ o.get_absolute_url }}" title="Package details for {{ o.pkgname }}">{{ o.pkgname }} {{ o.full_version }} [{{ o.repo.name|lower }}] ({{ o.arch.name }})</a></li> {% endfor %} </ul> @@ -74,11 +74,11 @@ <meta itemprop="version" content="{{ pkg.full_version|escape }}"/> <meta itemprop="softwareVersion" content="{{ pkg.full_version|escape }}"/> <meta itemprop="fileSize" content="{{ pkg.compressed_size }}"/> - <meta itemprop="dateCreated" content="{{ pkg.build_date|date("Y-m-d") }}"/> - <meta itemprop="datePublished" content="{{ pkg.last_update|date("Y-m-d") }}"/> + <meta itemprop="dateCreated" content="{{ pkg.build_date|date:"Y-m-d" }}"/> + <meta itemprop="datePublished" content="{{ pkg.last_update|date:"Y-m-d" }}"/> <meta itemprop="operatingSystem" content="{{ BRANDING_DISTRONAME }}"/> {% if pkg.packager %}<div style="display:none" itemprop="provider" itemscope itemtype="http://schema.org/Person"> - <meta itemprop="name" content="{{ pkg.packager.get_full_name()|escape }}"/> + <meta itemprop="name" content="{{ pkg.packager.get_full_name|escape }}"/> </div>{% endif %} <table id="pkginfo"> <tr> @@ -91,17 +91,17 @@ title="Browse the {{ pkg.repo.name|capfirst }} repository">{{ pkg.repo.name|capfirst }}</a></td> </tr> {% if pkg.pkgname == pkg.pkgbase %} - {% with splits = pkg.split_packages() %}{% if splits %} + {% with splits=pkg.split_packages %}{% if splits %} <tr> <th>Split Packages:</th> - <td class="wrap relatedto">{% for s in splits %}<span class="related">{{ details.details_link(s) }}{% if not loop.last %}, {% endif %}</span>{% endfor %}</td> + <td class="wrap relatedto">{% for s in splits %}<span class="related">{% details_link s %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td> </tr> {% endif %}{% endwith %} {% else %} <tr> <th>Base Package:</th> - {% with base = pkg.base_package() %}{% if base %} - <td>{{ details.details_link(base) }}</td> + {% with base=pkg.base_package %}{% if base %} + <td>{% details_link base %}</td> {% else %} <td><a href="../{{ pkg.pkgbase }}/" title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td> @@ -110,55 +110,55 @@ {% endif %} <tr> <th>Description:</th> - <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default("", true) }}</td> + <td class="wrap" itemprop="description">{{ pkg.pkgdesc|default:"" }}</td> </tr><tr> <th>Upstream URL:</th> <td>{% if pkg.url %}<a itemprop="url" href="{{ pkg.url }}" title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url|url_unquote }}</a>{% endif %}</td> </tr><tr> <th>License(s):</th> - <td class="wrap">{{ pkg.licenses.all()|join(", ") }}</td> + <td class="wrap">{{ pkg.licenses.all|join:", " }}</td> </tr> - {% with groups = pkg.groups.all() %}{% if groups %} + {% with groups=pkg.groups.all %}{% if groups %} <tr> <th>Groups:</th> <td class="wrap">{% for g in groups %} <a href="/groups/{{ pkg.arch.name }}/{{ g.name }}/" - title="Group details for {{ g.name }}">{{ g.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %} + title="Group details for {{ g.name }}">{{ g.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %} </td> </tr> {% endif %}{% endwith %} - {% with all_related = pkg.provides.all() %}{% if all_related %} + {% with all_related=pkg.provides.all %}{% if all_related %} <tr> <th>Provides:</th> - <td class="wrap relatedto">{% include "packages/details_relatedto.html.jinja" %}</td> + <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} - {% with all_related = pkg.replaces.all() %}{% if all_related %} + {% with all_related=pkg.replaces.all %}{% if all_related %} <tr> <th>Replaces:</th> - <td class="wrap relatedto">{% include "packages/details_relatedto.html.jinja" %}</td> + <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} - {% with all_related = pkg.conflicts.all() %}{% if all_related %} + {% with all_related=pkg.conflicts.all %}{% if all_related %} <tr> <th>Conflicts:</th> - <td class="wrap relatedto">{% include "packages/details_relatedto.html.jinja" %}</td> + <td class="wrap relatedto">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} - {% with rev_conflicts = pkg.reverse_conflicts() %}{% if rev_conflicts %} + {% with rev_conflicts=pkg.reverse_conflicts %}{% if rev_conflicts %} <tr> <th>Reverse Conflicts:</th> <td class="wrap relatedto">{% for conflict in rev_conflicts %} - <span class="related">{{ details.details_link(conflict) }}{% if not loop.last %}, {% endif %}</span>{% endfor %}</td> + <span class="related">{% details_link conflict %}{% if not forloop.last %}, {% endif %}</span>{% endfor %}</td> </tr> {% endif %}{% endwith %} <tr> <th>Maintainers:</th> - {% with maints = pkg.maintainers %} + {% with maints=pkg.maintainers %} <td>{% if maints %}{% for m in maints %} <a href="/packages/?maintainer={{ m.username }}" - title="View packages maintained by {{ m.get_full_name() }}">{{ m.get_full_name() }}</a><br/> + title="View packages maintained by {{ m.get_full_name }}">{{ m.get_full_name }}</a><br/> {% endfor %}{% else %}Orphan{% endif %} </td> {% endwith %} @@ -170,50 +170,50 @@ <td>{{ pkg.installed_size|filesizeformat }}</td> </tr><tr> <th>Last Packager:</th> - <td>{% with pkgr = pkg.packager %}{% if pkgr %} + <td>{% with pkgr=pkg.packager %}{% if pkgr %} <a href="/packages/?packager={{ pkgr.username }}" - title="View packages packaged by {{ pkgr.get_full_name() }}">{{ pkgr.get_full_name() }}</a> + title="View packages packaged by {{ pkgr.get_full_name }}">{{ pkgr.get_full_name }}</a> {% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}</td> </tr><tr> <th>Build Date:</th> - <td>{{ pkg.build_date|date("DATETIME_FORMAT") }} UTC</td> + <td>{{ pkg.build_date|date:"DATETIME_FORMAT" }} UTC</td> </tr>{% if pkg.signature %}<tr> <th>Signed By:</th> - <td>{% with signer = pkg.signer %}{% if signer %}{{ pgp_key_link(pkg.signature.key_id, signer.get_full_name())|safe }}{% else %}Unknown ({{ pgp_key_link(pkg.signature.key_id)|safe }}){% endif %}{% endwith %}</td> + <td>{% with signer=pkg.signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name|safe %}{% else %}Unknown ({% pgp_key_link pkg.signature.key_id|safe %}){% endif %}{% endwith %}</td> </tr><tr> <th>Signature Date:</th> - <td>{{ pkg.signature.creation_time|date("DATETIME_FORMAT") }} UTC</td> + <td>{{ pkg.signature.creation_time|date:"DATETIME_FORMAT" }} UTC</td> </tr>{% else %}<tr> <th>Signed By:</th> <td>Unsigned</td> </tr>{% endif %}<tr> <th>Last Updated:</th> - <td>{{ pkg.last_update|date("DATETIME_FORMAT") }} UTC</td> + <td>{{ pkg.last_update|date:"DATETIME_FORMAT" }} UTC</td> </tr> - {% if user.is_authenticated() %}{% with flag_request = pkg.flag_request() %}{% if flag_request %}<tr> + {% if user.is_authenticated %}{% with flag_request=pkg.flag_request %}{% if flag_request %}<tr> <th>Last Flag Request:</th> - <td class="wrap">From {{ flag_request.who() }} on {{ flag_request.created|date }}:<br/> - <div class="userdata">{{ flag_request.message|linebreaksbr|default("{no message}", true) }}</div></td> + <td class="wrap">From {{ flag_request.who }} on {{ flag_request.created|date }}:<br/> + <div class="userdata">{{ flag_request.message|linebreaksbr|default:"{no message}" }}</div></td> </tr>{% endif %}{% endwith %}{% endif %} </table> </div> <div id="metadata"> - {% with deps = pkg.get_depends() %} + {% with deps=pkg.get_depends %} <div id="pkgdeps" class="listing"> <h3 title="{{ pkg.pkgname }} has the following dependencies"> Dependencies ({{deps|length}})</h3> {% if deps %}<ul id="pkgdepslist"> - {% for depend in deps %}{% include "packages/details_depend.html.jinja" %}{% endfor %} + {% for depend in deps %}{% include "packages/details_depend.html" %}{% endfor %} </ul>{% endif %} </div> {% endwith %} - {% with rqdby = pkg.get_requiredby() %} + {% with rqdby=pkg.get_requiredby %} <div id="pkgreqs" class="listing"> <h3 title="Packages that require {{ pkg.pkgname }}"> Required By ({{rqdby|length}})</h3> {% if rqdby %}<ul id="pkgreqslist"> - {% for req in rqdby %}{% include "packages/details_requiredby.html.jinja" %}{% endfor %} + {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %} </ul>{% endif %} </div> {% endwith %} diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe index a604227f..f8e94f8b 100644 --- a/templates/releng/archlinux.ipxe +++ b/templates/releng/archlinux.ipxe @@ -10,7 +10,7 @@ imgtrust # initial options set bootarch ${cpuarch} set release {{ releases.0 }} -set extrabootoptions ip=dhcp net.ifnames=0 +set extrabootoptions ip=dhcp net.ifnames=0 BOOTIF=01-${netX/mac} set countrycode :main diff --git a/templates/sitemaps/news_sitemap.xml.jinja b/templates/sitemaps/news_sitemap.xml index cbd86578..e9ef2bb2 100644 --- a/templates/sitemaps/news_sitemap.xml.jinja +++ b/templates/sitemaps/news_sitemap.xml @@ -2,12 +2,12 @@ <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9"> {% for url in urlset %}<url> <loc>{{ url.location }}</loc> -{% if url.lastmod %}<lastmod>{{ url.lastmod|date("Y-m-d") }}</lastmod>{% endif %} +{% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %} {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %} {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %} <news:news> <news:publication><news:name>{{ BRANDING_DISTRONAME }} News</news:name><news:language>en</news:language></news:publication> - {% if url.item.postdate %}<news:publication_date>{{ url.item.postdate|date("c") }}</news:publication_date>{% endif %} + {% if url.item.postdate %}<news:publication_date>{{ url.item.postdate|date:"c" }}</news:publication_date>{% endif %} {% if url.item.title %}<news:title>{{ url.item.title }}</news:title>{% endif %} </news:news> </url>{% endfor %} diff --git a/templates/sitemaps/sitemap.xml.jinja b/templates/sitemaps/sitemap.xml index 0808a7de..50a95237 100644 --- a/templates/sitemaps/sitemap.xml.jinja +++ b/templates/sitemaps/sitemap.xml @@ -2,7 +2,7 @@ <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> {% for url in urlset %}<url> <loc>{{ url.location }}</loc> -{% if url.lastmod %}<lastmod>{{ url.lastmod|date("Y-m-d") }}</lastmod>{% endif %} +{% if url.lastmod %}<lastmod>{{ url.lastmod|date:"Y-m-d" }}</lastmod>{% endif %} {% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %} {% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %} </url>{% endfor %} |