correct default option spelling and more fields to be hidden for not

extended reports
This commit is contained in:
Evgenii Alekseev 2021-04-06 05:42:43 +03:00
parent 21c5eae97d
commit 134cdea7f6
3 changed files with 17 additions and 13 deletions

View File

@ -27,7 +27,7 @@ target =
[email] [email]
template_path = /usr/share/ahriman/repo-index.jinja2 template_path = /usr/share/ahriman/repo-index.jinja2
use_tls = no ssl = disabled
[html] [html]
template_path = /usr/share/ahriman/repo-index.jinja2 template_path = /usr/share/ahriman/repo-index.jinja2

View File

@ -5,15 +5,17 @@
{% include "style.jinja2" %} {% include "style.jinja2" %}
{% if extended_report %}
{% include "sorttable.jinja2" %} {% include "sorttable.jinja2" %}
{% include "search.jinja2" %} {% include "search.jinja2" %}
{% endif %}
</head> </head>
<body> <body>
<div class="root"> <div class="root">
{% if extended_report %}
<h1>Archlinux user repository</h1> <h1>Archlinux user repository</h1>
{% if include_pacman_conf %}
<section class="element"> <section class="element">
{% if pgp_key is not none %} {% if pgp_key is not none %}
<p>This repository is signed with <a href="http://keys.gnupg.net/pks/lookup?search=0x{{ pgp_key|e }}&fingerprint=on&op=index" title="key search">{{ pgp_key|e }}</a> by default.</p> <p>This repository is signed with <a href="http://keys.gnupg.net/pks/lookup?search=0x{{ pgp_key|e }}&fingerprint=on&op=index" title="key search">{{ pgp_key|e }}</a> by default.</p>
@ -52,6 +54,7 @@
</table> </table>
</section> </section>
{% if extended_report %}
<footer> <footer>
<ul class="navigation"> <ul class="navigation">
{% if homepage is not none %} {% if homepage is not none %}
@ -59,6 +62,7 @@
{% endif %} {% endif %}
</ul> </ul>
</footer> </footer>
{% endif %}
</div> </div>
</body> </body>
</html> </html>

View File

@ -107,8 +107,8 @@ class JinjaTemplate:
comparator: Callable[[Dict[str, str]], str] = lambda item: item["filename"] comparator: Callable[[Dict[str, str]], str] = lambda item: item["filename"]
return template.render( return template.render(
extended_report=extended_report,
homepage=self.homepage, homepage=self.homepage,
include_pacman_conf=extended_report,
link_path=self.link_path, link_path=self.link_path,
has_package_signed=SignSettings.Packages in self.sign_targets, has_package_signed=SignSettings.Packages in self.sign_targets,
has_repo_signed=SignSettings.Repository in self.sign_targets, has_repo_signed=SignSettings.Repository in self.sign_targets,