[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] 03/05: handle head properly in users.html.j2, modi
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] 03/05: handle head properly in users.html.j2, modify header |
|
Date: |
Sun, 25 Feb 2024 04:23:12 +0100 |
This is an automated email from the git hooks/post-receive script.
nora pushed a commit to branch master
in repository taler-ops-www.
commit 0f20bd0e1d4bc4e1c9766e501b44abc704917652
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sun Feb 25 04:15:00 2024 +0100
handle head properly in users.html.j2, modify header
---
common/base.j2 | 2 +-
common/header.j2.inc | 3 -
common/navigation-items.j2.inc | 20 -----
common/navigation.j2.inc | 78 -----------------
common/navigation/index.j2.inc | 28 +++++++
common/navigation/items.j2.inc | 14 ++++
common/navigation/lang-select.j2.inc | 34 ++++++++
locale/de/LC_MESSAGES/messages.po | 98 +++++++++++-----------
locale/en/LC_MESSAGES/messages.po | 98 +++++++++++-----------
locale/fr/LC_MESSAGES/messages.po | 98 +++++++++++-----------
locale/messages.pot | 98 +++++++++++-----------
static/js/{toggle.js => toggle.ts} | 0
static/scss/global.scss | 3 +-
static/scss/navigation/_index.scss | 3 +
static/scss/navigation/lang.scss | 0
static/scss/navigation/nav.scss | 0
.../scss/{navigation.scss => navigation/skip.scss} | 2 +-
static/scss/util.scss | 3 +
template/users.html.j2 | 9 +-
19 files changed, 290 insertions(+), 301 deletions(-)
diff --git a/common/base.j2 b/common/base.j2
index 872e4bd..444388c 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -31,7 +31,7 @@
<body class="font-sans font-normal">
<div id="page-container">
<div id="content-wrap">
- {% include "common/navigation.j2.inc" %} {% block body_content %}{%
+ {% include "common/navigation/index.j2.inc" %} {% block body_content
%}{%
endblock %} {% include "common/footer.j2.inc" %}
</div>
</div>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 36602e7..127269f 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -39,11 +39,8 @@
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
-<meta name="description" content="" />
-<meta name="author" content="" />
<script src="{{ url_static('js/jquerymin.js') }}"></script>
-<script src="{{ url_static('js/toggle.js') }}" defer></script>
<link href="{{ url_static('scss/global.scss') }}" rel="stylesheet" />
diff --git a/common/navigation-items.j2.inc b/common/navigation-items.j2.inc
deleted file mode 100644
index e64d319..0000000
--- a/common/navigation-items.j2.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<ul class="navbar-nav menu_sec">
- <li>
- <a href="{{ url_localized('index.html') }}"
- >{% trans %}Home{% endtrans %}</a
- >
- </li>
- <li>
- <a href="{{ url_localized('merchants.html') }}"
- >{% trans %}For Merchants{% endtrans %}</a
- >
- </li>
- <li>
- <a href="{{ url_localized('users.html') }}"
- >{% trans %}For Users{% endtrans %}</a
- >
- </li>
- <li>
- <a href="{{ url_localized('fees.html') }}">{% trans %}Fees{% endtrans
%}</a>
- </li>
-</ul>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
deleted file mode 100644
index 6ab006e..0000000
--- a/common/navigation.j2.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-<header class="header_sec newheader">
- <a
- id="skip"
- tabindex="0"
- href="#maincontent"
- role="link"
- aria-label="Skip to the main content of the page"
- >{%trans%}Skip to main content{%endtrans%}</a
- >
- <div class="container">
- <nav class="navbar navbar-expand-md navbar-light nav_top">
- <a class="navbar-brand" href="{{ url_localized('index.html') }}"
- ><img
- src="{{ url_static('images/unsorted/logo.png') }}"
- alt="Taler Operations SA"
- /></a>
- <button
- class="navbar-toggler"
- type="button"
- data-toggle="collapse"
- data-target="#navbarSupportedContent"
- aria-controls="navbarSupportedContent"
- aria-expanded="false"
- aria-label="Toggle navigation"
- >
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <div
- class="collapse navbar-collapse justify-content-end"
- id="navbarSupportedContent"
- >
- {% include "common/navigation-items.j2.inc" %}
- <div class="nav-item dropdown">
- <button
- class="btn btn-light dropdown-toggle"
- type="button"
- id="dropdownMenu1"
- data-toggle="dropdown"
- aria-haspopup="true"
- aria-expanded="true"
- >
- <img
- src="{{ url_static('images/unsorted/languageicon.svg') }}"
- height="35"
- alt="[{{lang}}]"
- />
- {{ lang_full }} [{{ lang }}]
- </button>
- <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
- {# TODO: look into if it's cleaner to show all langs alongside some
- kind of indicator of which one is active within the dropdown #} {%
- if lang != 'en' %}
- <li>
- <a class="dropdown-item" href="{{ self_localized('en') }}"
- >English [en]</a
- >
- </li>
- {% endif %} {% if lang != 'de' %}
- <li>
- <a class="dropdown-item" href="{{ self_localized('de') }}"
- >Deutsch [de]</a
- >
- </li>
- {% endif %} {% if lang != 'fr' %}
- <li>
- <a class="dropdown-item" href="{{ self_localized('fr') }}"
- >Français [fr]</a
- >
- </li>
- {% endif %}
- </ul>
- </div>
- </div>
- </nav>
- </div>
-</header>
diff --git a/common/navigation/index.j2.inc b/common/navigation/index.j2.inc
new file mode 100644
index 0000000..a1d6b9a
--- /dev/null
+++ b/common/navigation/index.j2.inc
@@ -0,0 +1,28 @@
+<a
+ id="skip"
+ tabindex="0"
+ href="#maincontent"
+ role="link"
+ aria-label="Skip to the main content of the page"
+ >{%trans%}Skip to main content{%endtrans%}</a
+>
+<header
+ class="navigation-menu w-screen bg-white bg-opacity-50 backdrop-blur-xl
sticky top-0 flex items-center justify-center py-4 px-8 md:px-16"
+>
+ <nav
+ class="navbar navbar-desktop hidden md:flex items-center flex-row
justify-between w-full max-w-screen-xl"
+ >
+ <div class="left">
+ <a class="navbar-brand" href="{{ url_localized('index.html') }}"
+ ><img
+ src="{{ url_static('images/logo/taler-full.svg') }}"
+ alt="Taler Operations SA"
+ style="width: 136px; height: 60.9px"
+ /></a>
+ </div>
+ <div class="right flex flex-row">
+ {% include "common/navigation/items.j2.inc" %} {# TODO: lang drop: {%
+ include 'common/navigation/lang-select.j2.inc' %} #}
+ </div>
+ </nav>
+</header>
diff --git a/common/navigation/items.j2.inc b/common/navigation/items.j2.inc
new file mode 100644
index 0000000..9aecd27
--- /dev/null
+++ b/common/navigation/items.j2.inc
@@ -0,0 +1,14 @@
+<nav class="flex flex-row gap-4">
+ <a class="link" href="{{ url_localized('index.html') }}"
+ >{% trans %}Home{% endtrans %}</a
+ >
+ <a class="link" href="{{ url_localized('merchants.html') }}"
+ >{% trans %}For Merchants{% endtrans %}</a
+ >
+ <a class="link" href="{{ url_localized('users.html') }}"
+ >{% trans %}For Users{% endtrans %}</a
+ >
+ <a class="link" href="{{ url_localized('fees.html') }}"
+ >{% trans %}Fees{% endtrans %}</a
+ >
+</nav>
diff --git a/common/navigation/lang-select.j2.inc
b/common/navigation/lang-select.j2.inc
new file mode 100644
index 0000000..08128cb
--- /dev/null
+++ b/common/navigation/lang-select.j2.inc
@@ -0,0 +1,34 @@
+TBA: Lang Drop
+<button
+ class="btn btn-light dropdown-toggle"
+ type="button"
+ id="dropdownMenu1"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="true"
+>
+ <img
+ src="{{ url_static('images/unsorted/languageicon.svg') }}"
+ height="35"
+ alt="[{{lang}}]"
+ />
+ {{ lang_full }} [{{ lang }}]
+</button>
+<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+ {# TODO: look into if it's cleaner to show all langs alongside some kind of
+ indicator of which one is active within the dropdown #} {% if lang != 'en' %}
+ <li>
+ <a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a>
+ </li>
+ {% endif %} {% if lang != 'de' %}
+ <li>
+ <a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a>
+ </li>
+ {% endif %} {% if lang != 'fr' %}
+ <li>
+ <a class="dropdown-item" href="{{ self_localized('fr') }}"
+ >Français [fr]</a
+ >
+ </li>
+ {% endif %}
+</ul>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index d62ed26..22f6144 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 03:50+0100\n"
+"POT-Creation-Date: 2024-02-25 04:14+0100\n"
"PO-Revision-Date: 2024-02-24 20:06+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -37,12 +37,12 @@ msgid "Taler Operations AG Homepage"
msgstr "Taler Operations AG Startseite"
#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
-#: common/navigation-items.j2.inc:4
+#: common/navigation/items.j2.inc:3
msgid "Home"
msgstr "Startseite"
#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
-#: common/navigation-items.j2.inc:18 template/fees.html.j2:2
+#: common/navigation/items.j2.inc:12 template/fees.html.j2:2
#: template/fees.html.j2:7 template/fees.html.j2:22
msgid "Fees"
msgstr "Gebührenordnung"
@@ -133,18 +133,18 @@ msgstr ""
"Besuchern. Diese werden jedoch ausschließlich zur Fehlersuche und "
"Problembehebung ausgewertet."
-#: common/navigation-items.j2.inc:9 template/index.html.j2:77
+#: common/navigation/index.j2.inc:7
+msgid "Skip to main content"
+msgstr "Navigationsmenü überspringen"
+
+#: common/navigation/items.j2.inc:6 template/index.html.j2:77
msgid "For Merchants"
msgstr "Für Händler"
-#: common/navigation-items.j2.inc:14 template/index.html.j2:59
+#: common/navigation/items.j2.inc:9 template/index.html.j2:59
msgid "For Users"
msgstr "Für Kunden"
-#: common/navigation.j2.inc:8
-msgid "Skip to main content"
-msgstr "Navigationsmenü überspringen"
-
#: template/fees.html.j2:10
msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
msgstr ""
@@ -208,7 +208,7 @@ msgstr "Integration"
msgid "Taler for Merchants"
msgstr "Für Händler"
-#: template/merchants.html.j2:9 template/users.html.j2:10
+#: template/merchants.html.j2:9 template/users.html.j2:17
#, fuzzy
#| msgid "<span>Prerequisites</span>"
msgid "Prerequisites"
@@ -386,180 +386,180 @@ msgstr "Sprechen Sie mit uns am Telefon"
msgid "Have a question?"
msgstr "Wir beantworten gern Ihre Fragen unter"
-#: template/users.html.j2:2
+#: template/users.html.j2:4
#, fuzzy
#| msgid "For Users"
msgid "Taler for Users"
msgstr "Für Kunden"
-#: template/users.html.j2:14
+#: template/users.html.j2:21
msgid "What do I need to use Taler for payments?"
msgstr "Was braucht man zur Nutzung?"
-#: template/users.html.j2:20
+#: template/users.html.j2:27
#, fuzzy
#| msgid "<b>SWISS BANK ACCOUNT</b> with an IBAN beginning with CH**"
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr "<b>SCHWEIZER BANKKONTO</b> bei einer Bank, deren IBAN mit CH** beginnt"
-#: template/users.html.j2:24
+#: template/users.html.j2:31
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:28
+#: template/users.html.j2:35
#, fuzzy
#| msgid "Installation guide for users"
msgid "Installation of a"
msgstr "Installationsanleitung für Kunden"
-#: template/users.html.j2:33
+#: template/users.html.j2:40
#, fuzzy
#| msgid "Install Wallet"
msgid "Taler wallet"
msgstr "Installation"
-#: template/users.html.j2:95 template/users.html.j2:127
-#: template/users.html.j2:155 template/users.html.j2:203
-#: template/users.html.j2:248 template/users.html.j2:278
-#: template/users.html.j2:308 template/users.html.j2:339
-#: template/users.html.j2:386
+#: template/users.html.j2:102 template/users.html.j2:134
+#: template/users.html.j2:162 template/users.html.j2:210
+#: template/users.html.j2:255 template/users.html.j2:285
+#: template/users.html.j2:315 template/users.html.j2:346
+#: template/users.html.j2:393
msgid "Step"
msgstr ""
-#: template/users.html.j2:96
+#: template/users.html.j2:103
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:99
+#: template/users.html.j2:106
msgid ""
"Initially, you may need to add Taler Operations as a payment service "
"provider. The easiest way to do so is to scan the QR code on the right, "
"which will also initiate the withdrawal process."
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:112
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:128
+#: template/users.html.j2:135
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:131
+#: template/users.html.j2:138
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:134
+#: template/users.html.j2:141
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:156
+#: template/users.html.j2:163
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:159
+#: template/users.html.j2:166
msgid "Please read the Terms of Service and accept them."
msgstr ""
"Bitte lesen Sie die Allgemeinen Geschäftsbedingungen (AGB) und bestätigen "
"diese (einmalig bei der ersten Abhebung bei einem Systembetreiber und im "
"Fall von AGB-Änderungen)."
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:204
+#: template/users.html.j2:211
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:213
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:208
+#: template/users.html.j2:215
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:256
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:252
+#: template/users.html.j2:259
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:263
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:279
+#: template/users.html.j2:286
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:282
+#: template/users.html.j2:289
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:287
+#: template/users.html.j2:294
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:309
+#: template/users.html.j2:316
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:312
+#: template/users.html.j2:319
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:317
+#: template/users.html.j2:324
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:340
+#: template/users.html.j2:347
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:343
+#: template/users.html.j2:350
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:354
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:387
+#: template/users.html.j2:394
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:397
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:394
+#: template/users.html.j2:401
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:420
+#: template/users.html.j2:427
msgid "Frequently Asked Questions"
msgstr "FAQs (Frequently Asked Questions)"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index bc3832f..78c4fb6 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 03:50+0100\n"
+"POT-Creation-Date: 2024-02-25 04:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,12 +35,12 @@ msgid "Taler Operations AG Homepage"
msgstr ""
#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
-#: common/navigation-items.j2.inc:4
+#: common/navigation/items.j2.inc:3
msgid "Home"
msgstr ""
#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
-#: common/navigation-items.j2.inc:18 template/fees.html.j2:2
+#: common/navigation/items.j2.inc:12 template/fees.html.j2:2
#: template/fees.html.j2:7 template/fees.html.j2:22
msgid "Fees"
msgstr ""
@@ -109,16 +109,16 @@ msgid ""
"exclusively for troubleshooting or problem mitigation."
msgstr ""
-#: common/navigation-items.j2.inc:9 template/index.html.j2:77
-msgid "For Merchants"
+#: common/navigation/index.j2.inc:7
+msgid "Skip to main content"
msgstr ""
-#: common/navigation-items.j2.inc:14 template/index.html.j2:59
-msgid "For Users"
+#: common/navigation/items.j2.inc:6 template/index.html.j2:77
+msgid "For Merchants"
msgstr ""
-#: common/navigation.j2.inc:8
-msgid "Skip to main content"
+#: common/navigation/items.j2.inc:9 template/index.html.j2:59
+msgid "For Users"
msgstr ""
#: template/fees.html.j2:10
@@ -174,7 +174,7 @@ msgstr ""
msgid "Taler for Merchants"
msgstr ""
-#: template/merchants.html.j2:9 template/users.html.j2:10
+#: template/merchants.html.j2:9 template/users.html.j2:17
msgid "Prerequisites"
msgstr ""
@@ -337,168 +337,168 @@ msgstr ""
msgid "Have a question?"
msgstr ""
-#: template/users.html.j2:2
+#: template/users.html.j2:4
msgid "Taler for Users"
msgstr ""
-#: template/users.html.j2:14
+#: template/users.html.j2:21
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:20
+#: template/users.html.j2:27
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:24
+#: template/users.html.j2:31
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:28
+#: template/users.html.j2:35
msgid "Installation of a"
msgstr ""
-#: template/users.html.j2:33
+#: template/users.html.j2:40
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:95 template/users.html.j2:127
-#: template/users.html.j2:155 template/users.html.j2:203
-#: template/users.html.j2:248 template/users.html.j2:278
-#: template/users.html.j2:308 template/users.html.j2:339
-#: template/users.html.j2:386
+#: template/users.html.j2:102 template/users.html.j2:134
+#: template/users.html.j2:162 template/users.html.j2:210
+#: template/users.html.j2:255 template/users.html.j2:285
+#: template/users.html.j2:315 template/users.html.j2:346
+#: template/users.html.j2:393
msgid "Step"
msgstr ""
-#: template/users.html.j2:96
+#: template/users.html.j2:103
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:99
+#: template/users.html.j2:106
msgid ""
"Initially, you may need to add Taler Operations as a payment service "
"provider. The easiest way to do so is to scan the QR code on the right, "
"which will also initiate the withdrawal process."
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:112
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:128
+#: template/users.html.j2:135
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:131
+#: template/users.html.j2:138
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:134
+#: template/users.html.j2:141
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:156
+#: template/users.html.j2:163
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:159
+#: template/users.html.j2:166
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:204
+#: template/users.html.j2:211
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:213
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:208
+#: template/users.html.j2:215
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:256
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:252
+#: template/users.html.j2:259
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:263
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:279
+#: template/users.html.j2:286
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:282
+#: template/users.html.j2:289
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:287
+#: template/users.html.j2:294
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:309
+#: template/users.html.j2:316
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:312
+#: template/users.html.j2:319
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:317
+#: template/users.html.j2:324
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:340
+#: template/users.html.j2:347
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:343
+#: template/users.html.j2:350
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:354
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:387
+#: template/users.html.j2:394
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:397
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:394
+#: template/users.html.j2:401
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:420
+#: template/users.html.j2:427
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index a8d5260..72b0a89 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 03:50+0100\n"
+"POT-Creation-Date: 2024-02-25 04:14+0100\n"
"PO-Revision-Date: 2024-02-12 18:13+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: French <https://weblate.taler.net/projects/taler-ops/website/";
@@ -37,12 +37,12 @@ msgid "Taler Operations AG Homepage"
msgstr "Page d'accueil Taler Operations AG"
#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
-#: common/navigation-items.j2.inc:4
+#: common/navigation/items.j2.inc:3
msgid "Home"
msgstr "Accueil"
#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
-#: common/navigation-items.j2.inc:18 template/fees.html.j2:2
+#: common/navigation/items.j2.inc:12 template/fees.html.j2:2
#: template/fees.html.j2:7 template/fees.html.j2:22
msgid "Fees"
msgstr "Frais"
@@ -125,18 +125,18 @@ msgstr ""
"Toutefois, celles-ci ne sont consultées exclusivement pour des besoins de "
"dépannages ou de résolution de problème."
-#: common/navigation-items.j2.inc:9 template/index.html.j2:77
+#: common/navigation/index.j2.inc:7
+msgid "Skip to main content"
+msgstr "Aller au menu principal"
+
+#: common/navigation/items.j2.inc:6 template/index.html.j2:77
msgid "For Merchants"
msgstr ""
-#: common/navigation-items.j2.inc:14 template/index.html.j2:59
+#: common/navigation/items.j2.inc:9 template/index.html.j2:59
msgid "For Users"
msgstr ""
-#: common/navigation.j2.inc:8
-msgid "Skip to main content"
-msgstr "Aller au menu principal"
-
#: template/fees.html.j2:10
msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
msgstr ""
@@ -194,7 +194,7 @@ msgstr ""
msgid "Taler for Merchants"
msgstr "Taler Operations AG - Pour marchands"
-#: template/merchants.html.j2:9 template/users.html.j2:10
+#: template/merchants.html.j2:9 template/users.html.j2:17
msgid "Prerequisites"
msgstr ""
@@ -357,172 +357,172 @@ msgstr ""
msgid "Have a question?"
msgstr ""
-#: template/users.html.j2:2
+#: template/users.html.j2:4
#, fuzzy
#| msgid "Taler Operations AG - Users"
msgid "Taler for Users"
msgstr "Taler Operations AG - Pour les clients"
-#: template/users.html.j2:14
+#: template/users.html.j2:21
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:20
+#: template/users.html.j2:27
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:24
+#: template/users.html.j2:31
msgid ""
"<b>Mobile phone number</b> beginning with \"+41\" to receive P2P payments"
msgstr ""
-#: template/users.html.j2:28
+#: template/users.html.j2:35
#, fuzzy
msgid "Installation of a"
msgstr "Guide d'installation utilisateur"
-#: template/users.html.j2:33
+#: template/users.html.j2:40
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:95 template/users.html.j2:127
-#: template/users.html.j2:155 template/users.html.j2:203
-#: template/users.html.j2:248 template/users.html.j2:278
-#: template/users.html.j2:308 template/users.html.j2:339
-#: template/users.html.j2:386
+#: template/users.html.j2:102 template/users.html.j2:134
+#: template/users.html.j2:162 template/users.html.j2:210
+#: template/users.html.j2:255 template/users.html.j2:285
+#: template/users.html.j2:315 template/users.html.j2:346
+#: template/users.html.j2:393
msgid "Step"
msgstr ""
-#: template/users.html.j2:96
+#: template/users.html.j2:103
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:99
+#: template/users.html.j2:106
msgid ""
"Initially, you may need to add Taler Operations as a payment service "
"provider. The easiest way to do so is to scan the QR code on the right, "
"which will also initiate the withdrawal process."
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:112
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, you "
"can also just click on the \"add\" button on the \"CHF balance\" screen."
msgstr ""
-#: template/users.html.j2:128
+#: template/users.html.j2:135
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:131
+#: template/users.html.j2:138
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:134
+#: template/users.html.j2:141
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:156
+#: template/users.html.j2:163
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:159
+#: template/users.html.j2:166
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:204
+#: template/users.html.j2:211
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:213
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:208
+#: template/users.html.j2:215
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:256
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:252
+#: template/users.html.j2:259
msgid ""
"The wallet will show you the subject, target account and amount to transfer."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:263
msgid ""
"Copy the information into your online banking application and wire the funds "
"to the payment service provider."
msgstr ""
-#: template/users.html.j2:279
+#: template/users.html.j2:286
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:282
+#: template/users.html.j2:289
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:287
+#: template/users.html.j2:294
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep "
"the wallet open."
msgstr ""
-#: template/users.html.j2:309
+#: template/users.html.j2:316
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:312
+#: template/users.html.j2:319
msgid ""
"When shopping, the wallet may be launched automatically or you may need to "
"click a link, scan a QR code or even select the wallet extension manually "
"depending on the context."
msgstr ""
-#: template/users.html.j2:317
+#: template/users.html.j2:324
msgid ""
"The QR code scanner button can also be held to manually enter a \"taler://\"-"
"URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:340
+#: template/users.html.j2:347
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:343
+#: template/users.html.j2:350
msgid ""
"The wallet will show you details about what you are buying, including the "
"price and applicable fees."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:354
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:387
+#: template/users.html.j2:394
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:397
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:394
+#: template/users.html.j2:401
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:420
+#: template/users.html.j2:427
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 9932671..48530f0 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 03:50+0100\n"
+"POT-Creation-Date: 2024-02-25 04:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,12 +34,12 @@ msgid "Taler Operations AG Homepage"
msgstr ""
#: common/footer.j2.inc:35 common/footer.old.j2.inc:29
-#: common/navigation-items.j2.inc:4
+#: common/navigation/items.j2.inc:3
msgid "Home"
msgstr ""
#: common/footer.j2.inc:44 common/footer.old.j2.inc:38
-#: common/navigation-items.j2.inc:18 template/fees.html.j2:2
+#: common/navigation/items.j2.inc:12 template/fees.html.j2:2
#: template/fees.html.j2:7 template/fees.html.j2:22
msgid "Fees"
msgstr ""
@@ -109,16 +109,16 @@ msgid ""
"exclusively for troubleshooting or problem mitigation."
msgstr ""
-#: common/navigation-items.j2.inc:9 template/index.html.j2:77
-msgid "For Merchants"
+#: common/navigation/index.j2.inc:7
+msgid "Skip to main content"
msgstr ""
-#: common/navigation-items.j2.inc:14 template/index.html.j2:59
-msgid "For Users"
+#: common/navigation/items.j2.inc:6 template/index.html.j2:77
+msgid "For Merchants"
msgstr ""
-#: common/navigation.j2.inc:8
-msgid "Skip to main content"
+#: common/navigation/items.j2.inc:9 template/index.html.j2:59
+msgid "For Users"
msgstr ""
#: template/fees.html.j2:10
@@ -174,7 +174,7 @@ msgstr ""
msgid "Taler for Merchants"
msgstr ""
-#: template/merchants.html.j2:9 template/users.html.j2:10
+#: template/merchants.html.j2:9 template/users.html.j2:17
msgid "Prerequisites"
msgstr ""
@@ -337,170 +337,170 @@ msgstr ""
msgid "Have a question?"
msgstr ""
-#: template/users.html.j2:2
+#: template/users.html.j2:4
msgid "Taler for Users"
msgstr ""
-#: template/users.html.j2:14
+#: template/users.html.j2:21
msgid "What do I need to use Taler for payments?"
msgstr ""
-#: template/users.html.j2:20
+#: template/users.html.j2:27
msgid "<b>Swiss bank account</b> with an IBAN beginning with \"CH\""
msgstr ""
-#: template/users.html.j2:24
+#: template/users.html.j2:31
msgid "<b>Mobile phone number</b> beginning with \"+41\" to receive P2P
payments"
msgstr ""
-#: template/users.html.j2:28
+#: template/users.html.j2:35
msgid "Installation of a"
msgstr ""
-#: template/users.html.j2:33
+#: template/users.html.j2:40
msgid "Taler wallet"
msgstr ""
-#: template/users.html.j2:95 template/users.html.j2:127
-#: template/users.html.j2:155 template/users.html.j2:203
-#: template/users.html.j2:248 template/users.html.j2:278
-#: template/users.html.j2:308 template/users.html.j2:339
-#: template/users.html.j2:386
+#: template/users.html.j2:102 template/users.html.j2:134
+#: template/users.html.j2:162 template/users.html.j2:210
+#: template/users.html.j2:255 template/users.html.j2:285
+#: template/users.html.j2:315 template/users.html.j2:346
+#: template/users.html.j2:393
msgid "Step"
msgstr ""
-#: template/users.html.j2:96
+#: template/users.html.j2:103
msgid "Select provider</span>"
msgstr ""
-#: template/users.html.j2:99
+#: template/users.html.j2:106
msgid ""
"Initially, you may need to add Taler Operations as a payment service "
"provider. The easiest way to do so is to scan the QR code on the right, "
"which will also initiate the withdrawal process."
msgstr ""
-#: template/users.html.j2:105
+#: template/users.html.j2:112
msgid ""
"If you already have a payment service provider for the \"CHF\" currency, "
"you can also just click on the \"add\" button on the \"CHF balance\" "
"screen."
msgstr ""
-#: template/users.html.j2:128
+#: template/users.html.j2:135
msgid "Enter amount</span>"
msgstr ""
-#: template/users.html.j2:131
+#: template/users.html.j2:138
msgid "Enter the desired amount to be withdrawn."
msgstr ""
-#: template/users.html.j2:134
+#: template/users.html.j2:141
msgid "Afterwards, select \"Withdraw\" from my bank account."
msgstr ""
-#: template/users.html.j2:156
+#: template/users.html.j2:163
msgid "Accept terms</span>"
msgstr ""
-#: template/users.html.j2:159
+#: template/users.html.j2:166
msgid "Please read the Terms of Service and accept them."
msgstr ""
-#: template/users.html.j2:163
+#: template/users.html.j2:170
msgid ""
"You will only need to do so the first time, or when the terms have been "
"updated."
msgstr ""
-#: template/users.html.j2:204
+#: template/users.html.j2:211
msgid "Review</span>"
msgstr ""
-#: template/users.html.j2:206
+#: template/users.html.j2:213
msgid "Review and confirm the operation."
msgstr ""
-#: template/users.html.j2:208
+#: template/users.html.j2:215
msgid "Depending on the payment service provider, you may be shown fees."
msgstr ""
-#: template/users.html.j2:249
+#: template/users.html.j2:256
msgid "Wire transfer</span>"
msgstr ""
-#: template/users.html.j2:252
+#: template/users.html.j2:259
msgid ""
"The wallet will show you the subject, target account and amount to "
"transfer."
msgstr ""
-#: template/users.html.j2:256
+#: template/users.html.j2:263
msgid ""
"Copy the information into your online banking application and wire the "
"funds to the payment service provider."
msgstr ""
-#: template/users.html.j2:279
+#: template/users.html.j2:286
msgid "Wait!</span>"
msgstr ""
-#: template/users.html.j2:282
+#: template/users.html.j2:289
msgid ""
"The wallet will automatically receive the digital cash once your wire "
"transfer has arrived at the payment service provider."
msgstr ""
-#: template/users.html.j2:287
+#: template/users.html.j2:294
msgid ""
"Depending on your bank, this may take a few days. You do not need to keep"
" the wallet open."
msgstr ""
-#: template/users.html.j2:309
+#: template/users.html.j2:316
msgid "Shop</span>"
msgstr ""
-#: template/users.html.j2:312
+#: template/users.html.j2:319
msgid ""
"When shopping, the wallet may be launched automatically or you may need "
"to click a link, scan a QR code or even select the wallet extension "
"manually depending on the context."
msgstr ""
-#: template/users.html.j2:317
+#: template/users.html.j2:324
msgid ""
"The QR code scanner button can also be held to manually enter a "
"\"taler://\"-URI, for example if you received one via text message."
msgstr ""
-#: template/users.html.j2:340
+#: template/users.html.j2:347
msgid "Pay</span>"
msgstr ""
-#: template/users.html.j2:343
+#: template/users.html.j2:350
msgid ""
"The wallet will show you details about what you are buying, including the"
" price and applicable fees."
msgstr ""
-#: template/users.html.j2:347
+#: template/users.html.j2:354
msgid "Simply press \"Pay\" to make the payment."
msgstr ""
-#: template/users.html.j2:387
+#: template/users.html.j2:394
msgid "Manage</span>"
msgstr ""
-#: template/users.html.j2:390
+#: template/users.html.j2:397
msgid "The wallet keeps track of your transaction history."
msgstr ""
-#: template/users.html.j2:394
+#: template/users.html.j2:401
msgid "You can delete transactions, erasing any trace that you were the buyer."
msgstr ""
-#: template/users.html.j2:420
+#: template/users.html.j2:427
msgid "Frequently Asked Questions"
msgstr ""
diff --git a/static/js/toggle.js b/static/js/toggle.ts
similarity index 100%
rename from static/js/toggle.js
rename to static/js/toggle.ts
diff --git a/static/scss/global.scss b/static/scss/global.scss
index f4a8f17..17b5a4c 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -1,4 +1,5 @@
+@use './navigation';
@use './links.scss';
@use './fonts/fonts.scss';
@use './footer.scss';
-@use './navigation.scss';
+@use './util.scss';
diff --git a/static/scss/navigation/_index.scss
b/static/scss/navigation/_index.scss
new file mode 100644
index 0000000..87b0120
--- /dev/null
+++ b/static/scss/navigation/_index.scss
@@ -0,0 +1,3 @@
+@use './skip.scss';
+@use './lang.scss';
+@use './nav.scss';
diff --git a/static/scss/navigation/lang.scss b/static/scss/navigation/lang.scss
new file mode 100644
index 0000000..e69de29
diff --git a/static/scss/navigation/nav.scss b/static/scss/navigation/nav.scss
new file mode 100644
index 0000000..e69de29
diff --git a/static/scss/navigation.scss b/static/scss/navigation/skip.scss
similarity index 89%
rename from static/scss/navigation.scss
rename to static/scss/navigation/skip.scss
index 2b0312e..a8fec15 100644
--- a/static/scss/navigation.scss
+++ b/static/scss/navigation/skip.scss
@@ -1,4 +1,4 @@
-// Skip to content element
+// Skip to content tab-only element
#skip {
opacity: 0;
position: fixed;
diff --git a/static/scss/util.scss b/static/scss/util.scss
new file mode 100644
index 0000000..eab1ec8
--- /dev/null
+++ b/static/scss/util.scss
@@ -0,0 +1,3 @@
+main#maincontent:not(.no-full-width) {
+ @apply max-w-screen-xl px-8 md:px-16;
+}
diff --git a/template/users.html.j2 b/template/users.html.j2
index 7ced6c4..b396ac3 100644
--- a/template/users.html.j2
+++ b/template/users.html.j2
@@ -1,5 +1,12 @@
-{% extends "common/base.j2" %} {% block body_content %}
+{% extends "common/base.j2" %}
+{% block head_content %}
+<script src="{{ url_static('js/toggle.ts') }}" defer></script>
<title>{% trans %}Taler for Users{% endtrans %}</title>
+<meta name="description" content="" />
+<meta name="author" content="" />
+{% endblock %}
+
+{% block body_content %}
<main id="maincontent">
<section class="mid_sec mid_SecPanel">
<div class="container">
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ops-www] branch master updated (26a9e59 -> 6d06e9c), gnunet, 2024/02/24
- [taler-taler-ops-www] 01/05: extract nav items to file for sharing in 2 diff states, gnunet, 2024/02/24
- [taler-taler-ops-www] 03/05: handle head properly in users.html.j2, modify header,
gnunet <=
- [taler-taler-ops-www] 04/05: Improve opengraph tags everywhere, gnunet, 2024/02/24
- [taler-taler-ops-www] 02/05: move end to after main, gnunet, 2024/02/24
- [taler-taler-ops-www] 05/05: we want the individual pages to provide embed info!!!, gnunet, 2024/02/24