[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated (babbed9 -> 28c4ed9)
From: |
gnunet |
Subject: |
[taler-taler-ops-www] branch master updated (babbed9 -> 28c4ed9) |
Date: |
Sun, 31 Mar 2024 17:12:29 +0200 |
This is an automated email from the git hooks/post-receive script.
nora-grothoff pushed a change to branch master
in repository taler-ops-www.
from babbed9 why tf does a file url have cors
new bcaa4cf parcel compiler forgets a semicolon, so let's break it into a
statement that doesnt need a preceeding one
new 28c4ed9 lang things
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
common/navigation/index.j2.inc | 17 ++++++++++++++---
common/navigation/items.j2.inc | 18 +++++++++++-------
locale/de/LC_MESSAGES/messages.po | 12 ++++++------
locale/en/LC_MESSAGES/messages.po | 12 ++++++------
locale/fr/LC_MESSAGES/messages.po | 12 ++++++------
locale/messages.pot | 12 ++++++------
static/js/group-selection.ts | 5 +++--
7 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/common/navigation/index.j2.inc b/common/navigation/index.j2.inc
index d467e48..e1298ae 100644
--- a/common/navigation/index.j2.inc
+++ b/common/navigation/index.j2.inc
@@ -12,16 +12,27 @@
<nav
class="navbar navbar-desktop flex items-center justify-between w-full
max-w-screen-xl md:flex-row flex-col gap-7"
>
- <div class="left" style="min-width: 136px; min-height: 60.9px;">
+ <div
+ class="left flex flex-wrap gap-7"
+ style="min-width: 136px; min-height: 60.9px"
+ >
<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;"
+ style="width: 136px; height: 60.9px"
/></a>
+ <div class="nav hidden lg:contents">
+ {% include "common/navigation/items.j2.inc" %}
+ </div>
</div>
<div class="right flex flex-row max-w-full">
- {% include "common/navigation/items.j2.inc" %}
+ <div class="nav contents lg:hidden">
+ {% include "common/navigation/items.j2.inc" %}
+ </div>
+ <div class="hidden lg:contents">
+ {% include 'common/navigation/lang-select.j2.inc' %}
+ </div>
</div>
</nav>
</header>
diff --git a/common/navigation/items.j2.inc b/common/navigation/items.j2.inc
index 932aca6..b1a2648 100644
--- a/common/navigation/items.j2.inc
+++ b/common/navigation/items.j2.inc
@@ -1,28 +1,32 @@
-<nav class="flex flex-row gap-4 font-medium flex-wrap items-center
justify-center text-center">
+<nav
+ class="flex flex-row gap-4 font-medium flex-wrap items-center justify-center
text-center"
+>
<a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all block h-max"
+ class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('index.html') }}"
>{% trans %}Home{% endtrans %}</a
>
<a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all block h-max"
+ class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('users.html') }}"
>{% trans %}Users{% endtrans %}</a
>
<a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all block h-max"
+ class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('merchants.html') }}"
>{% trans %}Merchants{% endtrans %}</a
>
<a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all block h-max"
+ class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="{{ url_localized('fees.html') }}"
>{% trans %}Fees{% endtrans %}</a
>
<a
- class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all block h-max"
+ class="no-underline hover:underline text-black text-opacity-50
hover:text-opacity-40 transition-all h-max block"
href="https://exchange.taler-ops.ch/terms"
>{% trans %}Terms of Service{% endtrans %}</a
>
- {% include 'common/navigation/lang-select.j2.inc' %}
+ <div class="contents lg:hidden">
+ {% include 'common/navigation/lang-select.j2.inc' %}
+ </div>
</nav>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 59c3350..c83f659 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-03-31 17:01+0200\n"
+"POT-Creation-Date: 2024-03-31 17:05+0200\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/"
@@ -36,15 +36,15 @@ msgstr "Seitenübersicht"
msgid "Taler Operations AG Homepage"
msgstr "Taler Operations AG Startseite"
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:5
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
msgid "Home"
msgstr "Startseite"
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:20
+#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
msgid "Fees"
msgstr "Gebührenordnung"
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:25
+#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
msgid "Terms of Service"
msgstr "AGB"
@@ -111,13 +111,13 @@ msgstr ""
msgid "Skip to main content"
msgstr "Navigationsmenü überspringen"
-#: common/navigation/items.j2.inc:10
+#: common/navigation/items.j2.inc:12
#, fuzzy
#| msgid "For Users"
msgid "Users"
msgstr "Für Kunden"
-#: common/navigation/items.j2.inc:15
+#: common/navigation/items.j2.inc:17
#, fuzzy
#| msgid "For Merchants"
msgid "Merchants"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 58cee69..52918bf 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-03-31 17:01+0200\n"
+"POT-Creation-Date: 2024-03-31 17:05+0200\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,15 +34,15 @@ msgstr ""
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:5
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:20
+#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:25
+#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
msgid "Terms of Service"
msgstr ""
@@ -98,11 +98,11 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10
+#: common/navigation/items.j2.inc:12
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15
+#: common/navigation/items.j2.inc:17
msgid "Merchants"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index bffa719..579218d 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-03-31 17:01+0200\n"
+"POT-Creation-Date: 2024-03-31 17:05+0200\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/"
@@ -36,15 +36,15 @@ msgstr "Liens directs"
msgid "Taler Operations AG Homepage"
msgstr "Page d'accueil Taler Operations AG"
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:5
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
msgid "Home"
msgstr "Accueil"
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:20
+#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
msgid "Fees"
msgstr "Frais"
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:25
+#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
msgid "Terms of Service"
msgstr "Conditions d'utilisation"
@@ -108,11 +108,11 @@ msgstr ""
msgid "Skip to main content"
msgstr "Aller au menu principal"
-#: common/navigation/items.j2.inc:10
+#: common/navigation/items.j2.inc:12
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15
+#: common/navigation/items.j2.inc:17
#, fuzzy
#| msgid "Taler Operations AG - Merchants"
msgid "Merchants"
diff --git a/locale/messages.pot b/locale/messages.pot
index f9afe01..d80f7c4 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-03-31 17:01+0200\n"
+"POT-Creation-Date: 2024-03-31 17:05+0200\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"
@@ -33,15 +33,15 @@ msgstr ""
msgid "Taler Operations AG Homepage"
msgstr ""
-#: common/footer.j2.inc:35 common/navigation/items.j2.inc:5
+#: common/footer.j2.inc:35 common/navigation/items.j2.inc:7
msgid "Home"
msgstr ""
-#: common/footer.j2.inc:44 common/navigation/items.j2.inc:20
+#: common/footer.j2.inc:44 common/navigation/items.j2.inc:22
msgid "Fees"
msgstr ""
-#: common/footer.j2.inc:49 common/navigation/items.j2.inc:25
+#: common/footer.j2.inc:49 common/navigation/items.j2.inc:27
msgid "Terms of Service"
msgstr ""
@@ -98,11 +98,11 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10
+#: common/navigation/items.j2.inc:12
msgid "Users"
msgstr ""
-#: common/navigation/items.j2.inc:15
+#: common/navigation/items.j2.inc:17
msgid "Merchants"
msgstr ""
diff --git a/static/js/group-selection.ts b/static/js/group-selection.ts
index 34ecfce..8e7f6be 100644
--- a/static/js/group-selection.ts
+++ b/static/js/group-selection.ts
@@ -3,7 +3,7 @@ type Key = 'firefox' | 'chrome' | 'android' | 'ios'; // an enum
might be better
// Declare the group selection function as a global
declare const selectGroup: (key: Key, scroll?: boolean) => void;
-(async () => {
+const main = async () => {
// Scope everything to not expose things that arent necessary
const disableGroup = (key: Key) => {
const group = document.querySelectorAll('.group-' + key);
@@ -77,4 +77,5 @@ declare const selectGroup: (key: Key, scroll?: boolean) =>
void;
// fall back to ff
selectGroup('firefox', false);
}
-})();
+};
+main();
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ops-www] branch master updated (babbed9 -> 28c4ed9),
gnunet <=