From fc51167c0493416e0ac38260c64cf84a21625510 Mon Sep 17 00:00:00 2001 From: jeroen Date: Tue, 6 Sep 2022 13:44:41 +0200 Subject: [PATCH] ENHANCEMENT: Setting version tag in footer --- templates/base.html.twig | 12 +++++------- templates/footer.html.twig | 12 ++++++++++++ templates/security/login.html.twig | 12 +++++------- translations/messages.en-l33t.yaml | 5 ++++- translations/messages.en.yaml | 5 ++++- translations/messages.nl.yaml | 6 ++++-- version | 1 + 7 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 templates/footer.html.twig create mode 100644 version diff --git a/templates/base.html.twig b/templates/base.html.twig index 7401d4c..723bb00 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,5 +1,5 @@ - + @@ -11,8 +11,8 @@ - -
+ +
@@ -27,18 +27,16 @@
  • {{ 'menu.add' | trans }}
  • {{ 'menu.logout' | trans }}
    • -
    - {% if (kernelProjectDir ~ "/version") is ondisk %}{{ (kernelProjectDir ~ "/version") | contents }}{% else %}dev-main{% endif %} -
    {{ include('flashes.html.twig') }} {% block content %}{% endblock %}
    -
    +
    {% block extrahtml %}{% endblock %} + {{ include('footer.html.twig') }} diff --git a/templates/footer.html.twig b/templates/footer.html.twig new file mode 100644 index 0000000..3479aee --- /dev/null +++ b/templates/footer.html.twig @@ -0,0 +1,12 @@ +
    +
    +
    +
    + {{ 'footer.title' | trans}} {% if (kernelProjectDir ~ "/version") is ondisk %}{{ (kernelProjectDir ~ "/version") | contents }}{% else %}dev-main{% endif %} +
    +
    + {{ 'footer.source' | trans}} +
    +
    +
    +
    \ No newline at end of file diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig index b76b177..5b26f06 100755 --- a/templates/security/login.html.twig +++ b/templates/security/login.html.twig @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ {{ encore_entry_script_tags('security.login') }} - -
    + +
    {{ include('flashes.html.twig') }} @@ -47,11 +47,9 @@

    {{ 'demomode.credentials.password' | trans }}: {{ app.request.server.get('DEMO_PASS') }}

    {% endif %} -
    - {% if (kernelProjectDir ~ "/version") is ondisk %}{{ (kernelProjectDir ~ "/version") | contents }}{% else %}dev-main{% endif %} -
    -
    + + {{ include('footer.html.twig') }} \ No newline at end of file diff --git a/translations/messages.en-l33t.yaml b/translations/messages.en-l33t.yaml index c70ba8d..bdb56bc 100644 --- a/translations/messages.en-l33t.yaml +++ b/translations/messages.en-l33t.yaml @@ -197,4 +197,7 @@ job: add: label: "4dd variable" submit: - label: "Subm1t!" \ No newline at end of file + label: "Subm1t!" +footer: + title: "W3bcr0n m4n4g3m3nt" + source: "S0urc3" \ No newline at end of file diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 9b4898f..f418225 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -197,4 +197,7 @@ job: add: label: "Add variable" submit: - label: "Submit!" \ No newline at end of file + label: "Submit!" +footer: + title: "Webcron Management" + source: "Source" \ No newline at end of file diff --git a/translations/messages.nl.yaml b/translations/messages.nl.yaml index 345cdb8..ca852a2 100644 --- a/translations/messages.nl.yaml +++ b/translations/messages.nl.yaml @@ -194,9 +194,11 @@ job: placeholder: "Naam" value: placeholder: "Waarde" - helptext: "Je kan variabelen gebruiken via {variabele-naam} in de job details" + helptext: "Je kan variabelen gebruiken via {variabele-naam} in de taak details" add: label: "Variable toevoegen" submit: label: "Verzend!" - +footer: + title: "Webcron Management" + source: "Broncode" diff --git a/version b/version new file mode 100644 index 0000000..11a182d --- /dev/null +++ b/version @@ -0,0 +1 @@ +v1.1-dev \ No newline at end of file