From 9b8c9b2b2d86da01f6ba792ce2fb532d81523edd Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Sun, 5 Sep 2021 05:27:58 +0300 Subject: [PATCH] migration of jinja tempaltes to bootstrap (#30) --- package/etc/ahriman.ini | 3 +- package/share/ahriman/build-status.jinja2 | 142 ++++++++---- package/share/ahriman/email-index.jinja2 | 44 ++++ package/share/ahriman/login-form-hide.jinja2 | 9 - package/share/ahriman/login-form.jinja2 | 18 -- package/share/ahriman/repo-index.jinja2 | 126 +++++----- package/share/ahriman/search-line.jinja2 | 3 - package/share/ahriman/search.jinja2 | 26 --- package/share/ahriman/sorttable.jinja2 | 1 - package/share/ahriman/style.jinja2 | 216 +----------------- setup.py | 4 +- src/ahriman/application/ahriman.py | 2 +- src/ahriman/core/configuration.py | 16 +- src/ahriman/core/report/email.py | 10 +- src/ahriman/core/report/html.py | 3 +- src/ahriman/core/report/jinja_template.py | 12 +- src/ahriman/models/build_status.py | 15 ++ src/ahriman/web/views/index.py | 2 + .../handlers/test_handler_key_import.py | 2 +- tests/ahriman/core/report/test_email.py | 15 ++ .../core/report/test_jinja_tempalte.py | 11 +- tests/ahriman/core/sign/test_gpg.py | 6 +- tests/ahriman/core/test_configuration.py | 21 ++ tests/ahriman/core/upload/test_s3.py | 6 +- tests/ahriman/models/test_build_status.py | 12 + 25 files changed, 313 insertions(+), 412 deletions(-) create mode 100644 package/share/ahriman/email-index.jinja2 delete mode 100644 package/share/ahriman/login-form-hide.jinja2 delete mode 100644 package/share/ahriman/login-form.jinja2 delete mode 100644 package/share/ahriman/search-line.jinja2 delete mode 100644 package/share/ahriman/search.jinja2 delete mode 100644 package/share/ahriman/sorttable.jinja2 diff --git a/package/etc/ahriman.ini b/package/etc/ahriman.ini index a0872e17..767bcbe1 100644 --- a/package/etc/ahriman.ini +++ b/package/etc/ahriman.ini @@ -29,8 +29,9 @@ target = target = [email] +full_template_path = /usr/share/ahriman/repo-index.jinja2 no_empty_report = yes -template_path = /usr/share/ahriman/repo-index.jinja2 +template_path = /usr/share/ahriman/email-index.jinja2 ssl = disabled [html] diff --git a/package/share/ahriman/build-status.jinja2 b/package/share/ahriman/build-status.jinja2 index ddfe798f..56073485 100644 --- a/package/share/ahriman/build-status.jinja2 +++ b/package/share/ahriman/build-status.jinja2 @@ -3,14 +3,18 @@ {{ repository }} - {% include "style.jinja2" %} + - {% include "sorttable.jinja2" %} - {% include "search.jinja2" %} + + + + + {% include "style.jinja2" %} -
+ +

ahriman {% if authorized %} {{ version }} @@ -18,58 +22,100 @@ {{ service.status }} {% endif %}

+
- {% include "login-form.jinja2" %} - {% include "login-form-hide.jinja2" %} - {% include "search-line.jinja2" %} - -
- - - - - - - +
+
package basepackagesversionlast updatestatus
+ + + + + + + + - {% if authorized %} - {% for package in packages %} - - - - - - - - {% endfor %} - {% else %} - - + + {% if authorized %} + {% for package in packages %} + + + + + + - {% endif %} -
package basepackagesversionlast updatestatus
{{ package.version }}{{ package.timestamp }}{{ package.status }}
In order to see statuses you must login first
{{ package.base }}{{ package.packages|join("
"|safe) }}
{{ package.version }}{{ package.timestamp }}{{ package.status }}
-
+ {% endfor %} + {% else %} + + In order to see statuses you must login first + + {% endif %} + + +
-