From 35a17bde259436b6a07a7dec0c0fce94e6989448 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Fri, 2 May 2025 15:06:19 +0100 Subject: [PATCH] Fixed jinja formatting --- .../templates/invenio_theme_iform/423.html | 2 +- .../accounts/accounts_base.html | 12 +- .../accounts/login_user.html | 6 +- .../accounts/register_user.html | 10 +- .../templates/invenio_theme_iform/base.html | 145 +++++++++--------- .../invenio_theme_iform/benefits.html | 28 ++-- .../invenio_theme_iform/contact_us.html | 20 +-- .../invenio_theme_iform/default_error.html | 6 +- .../templates/invenio_theme_iform/footer.html | 60 ++++---- .../frontpage_overview.html | 8 +- .../templates/invenio_theme_iform/header.html | 8 +- .../templates/invenio_theme_iform/index.html | 14 +- .../invenio_theme_iform/macros/authors.html | 2 +- .../templates/invenio_theme_iform/navbar.html | 69 +++++---- .../invenio_theme_iform/overview.html | 16 +- .../invenio_theme_iform/recent_uploads.html | 2 +- 16 files changed, 205 insertions(+), 203 deletions(-) diff --git a/invenio_theme_iform/templates/invenio_theme_iform/423.html b/invenio_theme_iform/templates/invenio_theme_iform/423.html index e838ece..88ec245 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/423.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/423.html @@ -1,7 +1,7 @@ {# Copyright (C) 2024 Graz University of Technology. - invenio-theme-iform is free software; you can redistribute it and/or + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html index 795519a..41c3641 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/accounts_base.html @@ -1,7 +1,7 @@ {# Copyright (C) 2020-2021 Graz University of Technology. - invenio-theme-iform is free software; you can redistribute it and/or + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} @@ -46,7 +46,7 @@ {%- block header %}{% endblock header %} {%- block css %} {{ webpack['theme.css'] }} - {{ webpack['invenio-theme-iform-theme.css'] }} + {{ webpack['invenio-theme-tugraz-theme.css'] }} {%- block flashmessages %} {%- from "invenio_theme/macros/messages.html" import flashed_messages with context -%} @@ -79,7 +79,7 @@ {%- endblock %} {%- endblock navbar_header %} - + {# {%- block page_header %} {% include config.THEME_HEADER_TEMPLATE %} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html index 65439f4..1a63997 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/login_user.html @@ -1,12 +1,12 @@ {# Copyright (C) 2020-2021 Graz University of Technology. - invenio-theme-iform is free software; you can redistribute it and/or + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} -{% extends config.INVENIO_THEME_IFORM_ACCOUNT_BASE %} +{% extends config.INVENIO_THEME_TUGRAZ_ACCOUNT_BASE %} {% from "invenio_accounts/_macros.html" import render_field, form_errors %} @@ -37,7 +37,7 @@ {{ _('Log in with %(title)s', title=config.SSO_SAML_IDPS[name]['title']|default("SAML", true)) }} - + {% endfor %} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html b/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html index 3c15501..9a13114 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/accounts/register_user.html @@ -1,12 +1,12 @@ {# Copyright (C) 2020 Graz University of Technology. - invenio-theme-iform is free software; you can redistribute it and/or + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} -{% extends config.INVENIO_THEME_IFORM_ACCOUNT_BASE %} +{% extends config.INVENIO_THEME_TUGRAZ_ACCOUNT_BASE %} {% from "invenio_accounts/_macros.html" import render_field, form_errors %} @@ -38,11 +38,11 @@
{# Sigup with SSO #} - {%- if config.INVENIO_CONFIG_IFORM_SHIBBOLETH %} + {%- if config.INVENIO_CONFIG_TUGRAZ_SHIBBOLETH %}
{{_ ("Or") }}
{%- endif %} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/base.html b/invenio_theme_iform/templates/invenio_theme_iform/base.html index fdabf1b..6103b49 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/base.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/base.html @@ -1,96 +1,97 @@ {# -Copyright (C) 2020-2023 Graz University of Technology. + Copyright (C) 2020-2023 Graz University of Technology. -invenio-theme-iform is free software; you can redistribute it and/or -modify it under the terms of the MIT License; see LICENSE file for more -details. + invenio-theme-tugraz is free software; you can redistribute it and/or + modify it under the terms of the MIT License; see LICENSE file for more + details. #} + + {%- block head %} + {%- block head_meta %} + + + - - {%- block head %} - {%- block head_meta %} - - - + {%- if description %} + + {% endif %} - {%- if description %} - - {% endif %} + {%- if keywords %} + + {% endif %} - {%- if keywords %} - - {% endif %} + {%- if config.get("THEME_GOOGLE_SITE_VERIFICATION", None) %} + {%- for google_id in config.THEME_GOOGLE_SITE_VERIFICATION %} + + {%- endfor %} + {%- endif %} + {%- endblock head_meta %} - {%- if config.get("THEME_GOOGLE_SITE_VERIFICATION", None) %} - {%- for google_id in config.THEME_GOOGLE_SITE_VERIFICATION %} - - {%- endfor %} - {%- endif %} - {%- endblock head_meta %} + {%- block head_title %} + {%- set title = title or _(config.THEME_SITENAME) or _("Invenio") %} + {{title}} + {%- endblock head_title %} - {%- block head_title %} - {%- set title = title or _(config.THEME_SITENAME) or _("Invenio") %} - {{title}} - {%- endblock head_title %} + {%- block head_links %} + - {%- block head_links %} - + {%- if keywords %} + + {% endif %} - {%- if keywords %} - - {% endif %} + {%- block head_links_langs %} + {%- if alternate_urls %} + {%- for alt_ln, alternate_url in alternate_urls.items() %} + + {%- endfor %} + {%- endif %} + {%- endblock %} + {%- endblock head_links %} - {%- block head_links_langs %} - {%- if alternate_urls %} - {%- for alt_ln, alternate_url in alternate_urls.items() %} - - {%- endfor %} - {%- endif %} - {%- endblock %} - {%- endblock head_links %} + {%- block header %}{% endblock header %} - {%- block header %}{% endblock header %} + {%- block css %} + {{ webpack["theme.css"] }} + {{ webpack["invenio-theme-tugraz-theme.css"] }} + {%- endblock css %} + {%- endblock head %} + - {%- block css %} - {{ webpack["theme.css"] }} - {{ webpack["invenio-theme-iform-theme.css"] }} - {%- endblock css %} - {%- endblock head %} - - - - {%- block body %} - {%- block browserupgrade %} - - {%- endblock browserupgrade %} + {%- endblock browserupgrade %} - {%- block body_inner %} - {%- block page_header %} - {% include config.THEME_HEADER_TEMPLATE %} - {%- endblock page_header %} + {%- block body_inner %} + {%- block page_header %} + {% include config.THEME_HEADER_TEMPLATE %} + {%- endblock page_header %} - {%- block page_body %} - {% include "invenio_theme/body.html" %} - {%- endblock page_body %} + {%- block page_body %} + {% include "invenio_theme/body.html" %} + {%- endblock page_body %} - {%- block page_footer %} - {% include config.THEME_FOOTER_TEMPLATE %} - {%- endblock page_footer %} - {%- endblock body_inner %} + {%- block page_footer %} + {% include config.THEME_FOOTER_TEMPLATE %} + {%- endblock page_footer %} + {%- endblock body_inner %} - {%- block javascript %} - {% include config.THEME_JAVASCRIPT_TEMPLATE %} - {%- endblock javascript %} - - {%- block trackingcode %} - {% include config.THEME_TRACKINGCODE_TEMPLATE %} - {%- endblock %} - {%- endblock body %} - + {%- block javascript %} + {% include config.THEME_JAVASCRIPT_TEMPLATE %} + {%- endblock javascript %} + {%- block trackingcode %} + {% include config.THEME_TRACKINGCODE_TEMPLATE %} + {%- endblock %} + {%- endblock body %} + + + + diff --git a/invenio_theme_iform/templates/invenio_theme_iform/benefits.html b/invenio_theme_iform/templates/invenio_theme_iform/benefits.html index 431d64b..1e37332 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/benefits.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/benefits.html @@ -1,27 +1,21 @@ {# -Copyright (C) 2020-2024 Graz University of Technology. + Copyright (C) 2020-2024 Graz University of Technology. -invenio-theme-iform is free software; you can redistribute it and/or -modify it under the terms of the MIT License; see LICENSE file for more -details. + invenio-theme-tugraz is free software; you can redistribute it and/or + modify it under the terms of the MIT License; see LICENSE file for more + details. #}
-

{{ _("Good reasons to use the I-Form Repository") }}

+

{{ _("Good reasons to use the Repository of the TU Graz") }}

  • {{_("Safe") }} — {{_("Your research results are permanently available.") }}
    • -
  • {{_("Trusted") }} — {{_("A service from I-Form, developed in cooperation with CERN.") }} -
    • -
  • {{_("Citeable") }} — {{_("Every upload is assigned a Digital Object Identifier (DOI).") - }}
    • -
  • {{_("No waiting time") }} — {{_("Uploads are made available online as soon as you hit - publish. Your DOI is registered within seconds.") }}
    • -
  • {{_("Open or closed") }} — {{_("You determine the visibility of your uploads. A - restricted access mode is possible.") }}
    • -
  • {{_("Versioning") }} — {{_("Easily update your dataset with the versioning feature.") }} -
    • -
  • {{_("Usage statistics") }} — {{ _("All uploads display standards compliant usage - statistics. ") }} ({{ _("More") }})
    • +
  • {{_("Trusted") }} — {{_("A service from TU Graz, developed in cooperation with CERN.") }}
    • +
  • {{_("Citeable") }} — {{_("Every upload is assigned a Digital Object Identifier (DOI).") }}
    • +
  • {{_("No waiting time") }} — {{_("Uploads are made available online as soon as you hit publish. Your DOI is registered within seconds.") }}
    • +
  • {{_("Open or closed") }} — {{_("You determine the visibility of your uploads. A restricted access mode is possible.") }}
    • +
  • {{_("Versioning") }} — {{_("Easily update your dataset with the versioning feature.") }}
    • +
  • {{_("Usage statistics") }} — {{ _("All uploads display standards compliant usage statistics. ") }} ({{ _("More") }})
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/contact_us.html b/invenio_theme_iform/templates/invenio_theme_iform/contact_us.html index e2943f6..34ea9fe 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/contact_us.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/contact_us.html @@ -1,20 +1,20 @@ {# -Copyright (C) 2020-2024 Graz University of Technology. + Copyright (C) 2020-2024 Graz University of Technology. -invenio-theme-iform is free software; you can redistribute it and/or -modify it under the terms of the MIT License; see LICENSE file for more -details. + invenio-theme-tugraz is free software; you can redistribute it and/or + modify it under the terms of the MIT License; see LICENSE file for more + details. #}

{{ _("Need help?") }}

- {%- if config.THEME_IFORM_CONTACT_FORM %} -
- - {{ _("Contact us") }} - -
+ {%- if config.THEME_TUGRAZ_CONTACT_FORM %} +
+ + {{ _("Contact us") }} + +
{%- endif %}

{{ _("We can help with:") }} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/default_error.html b/invenio_theme_iform/templates/invenio_theme_iform/default_error.html index 3cfcc53..d6f2bfa 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/default_error.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/default_error.html @@ -1,7 +1,7 @@ {# Copyright (C) 2024 Graz University of Technology. - - invenio-theme-iform is free software; you can redistribute it and/or + + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} @@ -14,7 +14,7 @@ {{ _( 'Please contact our support to let us know about this error.' - ).format(support_email=config.THEME_IFORM_SUPPORT_EMAIL) + ).format(support_email=config.THEME_TUGRAZ_SUPPORT_EMAIL) }}

{# TODO: provide g.sentry_event_id here once sentry is configured, cf. invenio_theme/500.html #} diff --git a/invenio_theme_iform/templates/invenio_theme_iform/footer.html b/invenio_theme_iform/templates/invenio_theme_iform/footer.html index d552bc4..f6ae2b9 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/footer.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/footer.html @@ -1,17 +1,17 @@ {# -Copyright (C) 2020-2023 Graz University of Technology. + Copyright (C) 2020-2023 Graz University of Technology. -invenio-theme-iform is free software; you can redistribute it and/or -modify it under the terms of the MIT License; see LICENSE file for more -details. + invenio-theme-tugraz is free software; you can redistribute it and/or + modify it under the terms of the MIT License; see LICENSE file for more + details. #} {%- block css %} -{{ webpack['invenio-theme-iform-theme.css'] }} + {{ webpack['invenio-theme-tugraz-theme.css'] }} {%- endblock %} {%- block javascript %} -{{ webpack['invenio-theme-iform-js.js'] }} + {{ webpack['invenio-theme-tugraz-js.js'] }} {%- endblock javascript %}
@@ -25,33 +25,36 @@ details.
- {{ _("Documentation") }} + target="_blank"> + {{ _("Documentation") }}
- - {{ _("Reference Guide") }} + + {{ _("Reference Guide") }}
- - {{ _("Search Guide") }} + + {{ _("Search Guide") }}
- - {{ _("Data Protection") }} + + {{ _("Data Protection") }}
- - {{ _("Terms and Conditions") }} + + {{ _("Terms and Conditions") }}
@@ -118,8 +121,9 @@ details.
Powered by - InvenioRDM logo + InvenioRDM logo
@@ -127,8 +131,9 @@ details.
Enabled by - Fair Data Austria + Fair Data Austria
@@ -137,8 +142,9 @@ details.
Supported by - Open Education Austria + Open Education Austria
@@ -150,10 +156,10 @@ details.
Listed on - - Registry of Research Data Repositories + + Registry of Research Data Repositories
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/frontpage_overview.html b/invenio_theme_iform/templates/invenio_theme_iform/frontpage_overview.html index 83f57e8..073b572 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/frontpage_overview.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/frontpage_overview.html @@ -1,9 +1,9 @@ {# -Copyright (C) 2020-2023 Graz University of Technology. + Copyright (C) 2020-2023 Graz University of Technology. -invenio-theme-iform is free software; you can redistribute it and/or -modify it under the terms of the MIT License; see LICENSE file for more -details. + invenio-theme-tugraz is free software; you can redistribute it and/or + modify it under the terms of the MIT License; see LICENSE file for more + details. #}
diff --git a/invenio_theme_iform/templates/invenio_theme_iform/header.html b/invenio_theme_iform/templates/invenio_theme_iform/header.html index 64480d9..71cb09f 100644 --- a/invenio_theme_iform/templates/invenio_theme_iform/header.html +++ b/invenio_theme_iform/templates/invenio_theme_iform/header.html @@ -1,12 +1,12 @@ {# Copyright (C) 2020-2023 Graz University of Technology. - invenio-theme-iform is free software; you can redistribute it and/or + invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more details. #} -{% if not config.THEME_IFORM_PRODUCTION %} +{% if not config.THEME_TUGRAZ_PRODUCTION %}

{{ _("Test Instance") }}

{{ _("This is the test instance of the TU Graz Repository.") }}

@@ -23,14 +23,14 @@ {%- block navbar %}