gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-ops-www] branch master updated: initial impl of merchants


From: gnunet
Subject: [taler-taler-ops-www] branch master updated: initial impl of merchants
Date: Sun, 25 Feb 2024 13:02: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.

The following commit(s) were added to refs/heads/master by this push:
     new 189d846  initial impl of merchants
     new b7e1078  Merge branch 'master' of git.taler.net:taler-ops-www
189d846 is described below

commit 189d8466d05dfbbbf58e6447873c06cf3e637bb1
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sun Feb 25 13:01:13 2024 +0100

    initial impl of merchants
---
 common/base.j2                                     |   2 +-
 locale/de/LC_MESSAGES/messages.po                  |  83 ++--
 locale/en/LC_MESSAGES/messages.po                  |  72 ++--
 locale/fr/LC_MESSAGES/messages.po                  |  83 ++--
 locale/messages.pot                                |  74 ++--
 .../scss/pages/{_faq-util.scss => faq-util.scss}   |   4 +-
 static/scss/pages/{users.scss => merchant.scss}    |   7 +-
 static/scss/pages/users.scss                       |   2 +-
 template/merchants.html.j2                         | 426 ++++++++++-----------
 9 files changed, 355 insertions(+), 398 deletions(-)

diff --git a/common/base.j2 b/common/base.j2
index 84fd2a9..3dd7bde 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="{{ lang }}" class="scroll-smooth">
   <head>
     <meta charset="UTF-8" />
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index fc442d6..a1b72f3 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 10:59+0100\n"
+"POT-Creation-Date: 2024-02-25 12:59+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/";
@@ -270,138 +270,138 @@ msgstr ""
 msgid "Integrate"
 msgstr "Integration"
 
-#: template/merchants.html.j2:2
+#: template/merchants.html.j2:2 template/users.html.j2:2
 #, fuzzy
-#| msgid "For Merchants"
-msgid "Taler for Merchants"
-msgstr "Für Händler"
+#| msgid "For Users"
+msgid "Taler for Users"
+msgstr "Für Kunden"
 
-#: template/merchants.html.j2:6
-msgid "Describes how merchants can use Taler."
+#: template/merchants.html.j2:6 template/users.html.j2:6
+msgid "Describes how to use taler"
 msgstr ""
 
-#: template/merchants.html.j2:15 template/users.html.j2:95
+#: template/merchants.html.j2:20 template/users.html.j2:95
 #, fuzzy
 #| msgid "<span>Prerequisites</span>"
 msgid "Prerequisites"
 msgstr "<span>Voraussetzungen</span>"
 
-#: template/merchants.html.j2:18
+#: template/merchants.html.j2:24
 msgid ""
 "Open Swiss bank account, ideally enabling <a href=\"https://www.ebics.org/";
 "\">EBICS</a>."
 msgstr ""
 
-#: template/merchants.html.j2:22
+#: template/merchants.html.j2:28
 msgid ""
 "Configure <a href=\"https://docs.taler.net/taler-merchant-manual.html\"; "
 ">Taler merchant backend</a > with the IBAN number."
 msgstr ""
 
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:35
 msgid "Modify payment processes to offer Taler as a payment option."
 msgstr ""
 
-#: template/merchants.html.j2:49
+#: template/merchants.html.j2:44
 msgid "For offline sales"
 msgstr ""
 
-#: template/merchants.html.j2:51
+#: template/merchants.html.j2:46
 msgid ""
 "The merchant backend can generate static QR codes customers can scan to pay "
 "you."
 msgstr ""
 
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:50
 msgid "You can hard-code a price or have the customer enter the price."
 msgstr ""
 
-#: template/merchants.html.j2:60
+#: template/merchants.html.j2:55
 msgid "Watch tutorial"
 msgstr ""
 
-#: template/merchants.html.j2:80
+#: template/merchants.html.j2:72
 msgid "For WooCommerce"
 msgstr ""
 
-#: template/merchants.html.j2:82
+#: template/merchants.html.j2:74
 msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
 msgstr ""
 
-#: template/merchants.html.j2:86 template/merchants.html.j2:118
-#: template/merchants.html.j2:149
+#: template/merchants.html.j2:78 template/merchants.html.j2:107
+#: template/merchants.html.j2:135
 msgid "You mostly need to configure access to your Taler merchant backend."
 msgstr ""
 
-#: template/merchants.html.j2:93
+#: template/merchants.html.j2:85
 msgid "WooCommerce&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:112
+#: template/merchants.html.j2:101
 msgid "For Pretix"
 msgstr ""
 
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:103
 msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
 msgstr ""
 
-#: template/merchants.html.j2:123
+#: template/merchants.html.j2:112
 msgid "Pretix&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:143
+#: template/merchants.html.j2:129
 msgid "For Joomla!"
 msgstr ""
 
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:131
 msgid ""
 "A payment plugin is availalbe to add GNU Taler support to Joomla! with "
 "Payage."
 msgstr ""
 
-#: template/merchants.html.j2:156
+#: template/merchants.html.j2:142
 msgid "Joomla!&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:158
 msgid "For points of sale"
 msgstr ""
 
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:160
 msgid ""
 "A point-of-sale App for Android can be used to quickly set up orders and "
 "handle payments."
 msgstr ""
 
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:164
 msgid ""
 "The App was designed for restaurants, but might be useful for other types of "
 "in-person sales."
 msgstr ""
 
-#: template/merchants.html.j2:188
+#: template/merchants.html.j2:171
 msgid "App manual"
 msgstr ""
 
-#: template/merchants.html.j2:208
+#: template/merchants.html.j2:194
 #, fuzzy
 #| msgid "For Users"
 msgid "For developers"
 msgstr "Für Kunden"
 
-#: template/merchants.html.j2:210
+#: template/merchants.html.j2:196
 msgid ""
 "The merchant backend offers a simple REST API to integrate GNU Taler into "
 "existing E-commerce systems."
 msgstr ""
 
-#: template/merchants.html.j2:215
+#: template/merchants.html.j2:200
 msgid ""
 "Documentation is available at <a href=\"https://docs.taler.net/\";>docs.taler."
 "net</a>."
 msgstr ""
 
-#: template/merchants.html.j2:221
+#: template/merchants.html.j2:205
 msgid "Watch tutorials"
 msgstr ""
 
@@ -464,16 +464,6 @@ msgstr "Sprechen Sie mit uns am Telefon"
 msgid "Have a question?"
 msgstr "Wir beantworten gern Ihre Fragen unter"
 
-#: template/users.html.j2:2
-#, fuzzy
-#| msgid "For Users"
-msgid "Taler for Users"
-msgstr "Für Kunden"
-
-#: template/users.html.j2:6
-msgid "Describes how to use taler"
-msgstr ""
-
 #: template/users.html.j2:97
 msgid "Here's what you need to get started paying with Taler:"
 msgstr ""
@@ -643,6 +633,11 @@ msgstr ""
 msgid "You can delete transactions, erasing any trace that you were the buyer."
 msgstr ""
 
+#, fuzzy
+#~| msgid "For Merchants"
+#~ msgid "Taler for Merchants"
+#~ msgstr "Für Händler"
+
 #~ 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 06766f0..b8775bd 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 10:59+0100\n"
+"POT-Creation-Date: 2024-02-25 12:59+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"
@@ -236,132 +236,132 @@ msgstr ""
 msgid "Integrate"
 msgstr ""
 
-#: template/merchants.html.j2:2
-msgid "Taler for Merchants"
+#: template/merchants.html.j2:2 template/users.html.j2:2
+msgid "Taler for Users"
 msgstr ""
 
-#: template/merchants.html.j2:6
-msgid "Describes how merchants can use Taler."
+#: template/merchants.html.j2:6 template/users.html.j2:6
+msgid "Describes how to use taler"
 msgstr ""
 
-#: template/merchants.html.j2:15 template/users.html.j2:95
+#: template/merchants.html.j2:20 template/users.html.j2:95
 msgid "Prerequisites"
 msgstr ""
 
-#: template/merchants.html.j2:18
+#: template/merchants.html.j2:24
 msgid ""
 "Open Swiss bank account, ideally enabling <a href=\"https://www.ebics.org/";
 "\">EBICS</a>."
 msgstr ""
 
-#: template/merchants.html.j2:22
+#: template/merchants.html.j2:28
 msgid ""
 "Configure <a href=\"https://docs.taler.net/taler-merchant-manual.html\"; "
 ">Taler merchant backend</a > with the IBAN number."
 msgstr ""
 
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:35
 msgid "Modify payment processes to offer Taler as a payment option."
 msgstr ""
 
-#: template/merchants.html.j2:49
+#: template/merchants.html.j2:44
 msgid "For offline sales"
 msgstr ""
 
-#: template/merchants.html.j2:51
+#: template/merchants.html.j2:46
 msgid ""
 "The merchant backend can generate static QR codes customers can scan to pay "
 "you."
 msgstr ""
 
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:50
 msgid "You can hard-code a price or have the customer enter the price."
 msgstr ""
 
-#: template/merchants.html.j2:60
+#: template/merchants.html.j2:55
 msgid "Watch tutorial"
 msgstr ""
 
-#: template/merchants.html.j2:80
+#: template/merchants.html.j2:72
 msgid "For WooCommerce"
 msgstr ""
 
-#: template/merchants.html.j2:82
+#: template/merchants.html.j2:74
 msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
 msgstr ""
 
-#: template/merchants.html.j2:86 template/merchants.html.j2:118
-#: template/merchants.html.j2:149
+#: template/merchants.html.j2:78 template/merchants.html.j2:107
+#: template/merchants.html.j2:135
 msgid "You mostly need to configure access to your Taler merchant backend."
 msgstr ""
 
-#: template/merchants.html.j2:93
+#: template/merchants.html.j2:85
 msgid "WooCommerce&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:112
+#: template/merchants.html.j2:101
 msgid "For Pretix"
 msgstr ""
 
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:103
 msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
 msgstr ""
 
-#: template/merchants.html.j2:123
+#: template/merchants.html.j2:112
 msgid "Pretix&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:143
+#: template/merchants.html.j2:129
 msgid "For Joomla!"
 msgstr ""
 
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:131
 msgid ""
 "A payment plugin is availalbe to add GNU Taler support to Joomla! with "
 "Payage."
 msgstr ""
 
-#: template/merchants.html.j2:156
+#: template/merchants.html.j2:142
 msgid "Joomla!&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:158
 msgid "For points of sale"
 msgstr ""
 
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:160
 msgid ""
 "A point-of-sale App for Android can be used to quickly set up orders and "
 "handle payments."
 msgstr ""
 
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:164
 msgid ""
 "The App was designed for restaurants, but might be useful for other types of "
 "in-person sales."
 msgstr ""
 
-#: template/merchants.html.j2:188
+#: template/merchants.html.j2:171
 msgid "App manual"
 msgstr ""
 
-#: template/merchants.html.j2:208
+#: template/merchants.html.j2:194
 msgid "For developers"
 msgstr ""
 
-#: template/merchants.html.j2:210
+#: template/merchants.html.j2:196
 msgid ""
 "The merchant backend offers a simple REST API to integrate GNU Taler into "
 "existing E-commerce systems."
 msgstr ""
 
-#: template/merchants.html.j2:215
+#: template/merchants.html.j2:200
 msgid ""
 "Documentation is available at <a href=\"https://docs.taler.net/\";>docs.taler."
 "net</a>."
 msgstr ""
 
-#: template/merchants.html.j2:221
+#: template/merchants.html.j2:205
 msgid "Watch tutorials"
 msgstr ""
 
@@ -411,14 +411,6 @@ msgstr ""
 msgid "Have a question?"
 msgstr ""
 
-#: template/users.html.j2:2
-msgid "Taler for Users"
-msgstr ""
-
-#: template/users.html.j2:6
-msgid "Describes how to use taler"
-msgstr ""
-
 #: template/users.html.j2:97
 msgid "Here's what you need to get started paying with Taler:"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 65145f4..a5af82c 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 10:59+0100\n"
+"POT-Creation-Date: 2024-02-25 12:59+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/";
@@ -256,134 +256,134 @@ msgstr ""
 msgid "Integrate"
 msgstr ""
 
-#: template/merchants.html.j2:2
+#: template/merchants.html.j2:2 template/users.html.j2:2
 #, fuzzy
-#| msgid "Taler Operations AG - Merchants"
-msgid "Taler for Merchants"
-msgstr "Taler Operations AG - Pour marchands"
+#| msgid "Taler Operations AG - Users"
+msgid "Taler for Users"
+msgstr "Taler Operations AG - Pour les clients"
 
-#: template/merchants.html.j2:6
-msgid "Describes how merchants can use Taler."
+#: template/merchants.html.j2:6 template/users.html.j2:6
+msgid "Describes how to use taler"
 msgstr ""
 
-#: template/merchants.html.j2:15 template/users.html.j2:95
+#: template/merchants.html.j2:20 template/users.html.j2:95
 msgid "Prerequisites"
 msgstr ""
 
-#: template/merchants.html.j2:18
+#: template/merchants.html.j2:24
 msgid ""
 "Open Swiss bank account, ideally enabling <a href=\"https://www.ebics.org/";
 "\">EBICS</a>."
 msgstr ""
 
-#: template/merchants.html.j2:22
+#: template/merchants.html.j2:28
 msgid ""
 "Configure <a href=\"https://docs.taler.net/taler-merchant-manual.html\"; "
 ">Taler merchant backend</a > with the IBAN number."
 msgstr ""
 
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:35
 msgid "Modify payment processes to offer Taler as a payment option."
 msgstr ""
 
-#: template/merchants.html.j2:49
+#: template/merchants.html.j2:44
 msgid "For offline sales"
 msgstr ""
 
-#: template/merchants.html.j2:51
+#: template/merchants.html.j2:46
 msgid ""
 "The merchant backend can generate static QR codes customers can scan to pay "
 "you."
 msgstr ""
 
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:50
 msgid "You can hard-code a price or have the customer enter the price."
 msgstr ""
 
-#: template/merchants.html.j2:60
+#: template/merchants.html.j2:55
 msgid "Watch tutorial"
 msgstr ""
 
-#: template/merchants.html.j2:80
+#: template/merchants.html.j2:72
 msgid "For WooCommerce"
 msgstr ""
 
-#: template/merchants.html.j2:82
+#: template/merchants.html.j2:74
 msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
 msgstr ""
 
-#: template/merchants.html.j2:86 template/merchants.html.j2:118
-#: template/merchants.html.j2:149
+#: template/merchants.html.j2:78 template/merchants.html.j2:107
+#: template/merchants.html.j2:135
 msgid "You mostly need to configure access to your Taler merchant backend."
 msgstr ""
 
-#: template/merchants.html.j2:93
+#: template/merchants.html.j2:85
 msgid "WooCommerce&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:112
+#: template/merchants.html.j2:101
 msgid "For Pretix"
 msgstr ""
 
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:103
 msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
 msgstr ""
 
-#: template/merchants.html.j2:123
+#: template/merchants.html.j2:112
 msgid "Pretix&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:143
+#: template/merchants.html.j2:129
 msgid "For Joomla!"
 msgstr ""
 
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:131
 msgid ""
 "A payment plugin is availalbe to add GNU Taler support to Joomla! with "
 "Payage."
 msgstr ""
 
-#: template/merchants.html.j2:156
+#: template/merchants.html.j2:142
 msgid "Joomla!&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:158
 msgid "For points of sale"
 msgstr ""
 
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:160
 msgid ""
 "A point-of-sale App for Android can be used to quickly set up orders and "
 "handle payments."
 msgstr ""
 
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:164
 msgid ""
 "The App was designed for restaurants, but might be useful for other types of "
 "in-person sales."
 msgstr ""
 
-#: template/merchants.html.j2:188
+#: template/merchants.html.j2:171
 msgid "App manual"
 msgstr ""
 
-#: template/merchants.html.j2:208
+#: template/merchants.html.j2:194
 msgid "For developers"
 msgstr ""
 
-#: template/merchants.html.j2:210
+#: template/merchants.html.j2:196
 msgid ""
 "The merchant backend offers a simple REST API to integrate GNU Taler into "
 "existing E-commerce systems."
 msgstr ""
 
-#: template/merchants.html.j2:215
+#: template/merchants.html.j2:200
 msgid ""
 "Documentation is available at <a href=\"https://docs.taler.net/\";>docs.taler."
 "net</a>."
 msgstr ""
 
-#: template/merchants.html.j2:221
+#: template/merchants.html.j2:205
 msgid "Watch tutorials"
 msgstr ""
 
@@ -435,16 +435,6 @@ msgstr ""
 msgid "Have a question?"
 msgstr ""
 
-#: template/users.html.j2:2
-#, fuzzy
-#| msgid "Taler Operations AG - Users"
-msgid "Taler for Users"
-msgstr "Taler Operations AG - Pour les clients"
-
-#: template/users.html.j2:6
-msgid "Describes how to use taler"
-msgstr ""
-
 #: template/users.html.j2:97
 msgid "Here's what you need to get started paying with Taler:"
 msgstr ""
@@ -606,6 +596,11 @@ msgstr ""
 msgid "You can delete transactions, erasing any trace that you were the buyer."
 msgstr ""
 
+#, fuzzy
+#~| msgid "Taler Operations AG - Merchants"
+#~ msgid "Taler for Merchants"
+#~ msgstr "Taler Operations AG - Pour marchands"
+
 #, fuzzy
 #~| msgid "Taler Operations AG, Biel, Switzerland"
 #~ msgid ""
diff --git a/locale/messages.pot b/locale/messages.pot
index ae4228a..02be1f2 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 11:07+0100\n"
+"POT-Creation-Date: 2024-02-25 12:59+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.12.1\n"
 
 #: common/base.j2:24 common/base.j2:28
 msgid "Taler Operations AG, Biel, Switzerland"
@@ -236,132 +236,132 @@ msgstr ""
 msgid "Integrate"
 msgstr ""
 
-#: template/merchants.html.j2:2
-msgid "Taler for Merchants"
+#: template/merchants.html.j2:2 template/users.html.j2:2
+msgid "Taler for Users"
 msgstr ""
 
-#: template/merchants.html.j2:6
-msgid "Describes how merchants can use Taler."
+#: template/merchants.html.j2:6 template/users.html.j2:6
+msgid "Describes how to use taler"
 msgstr ""
 
-#: template/merchants.html.j2:15 template/users.html.j2:95
+#: template/merchants.html.j2:20 template/users.html.j2:95
 msgid "Prerequisites"
 msgstr ""
 
-#: template/merchants.html.j2:18
+#: template/merchants.html.j2:24
 msgid ""
 "Open Swiss bank account, ideally enabling <a "
 "href=\"https://www.ebics.org/\";>EBICS</a>."
 msgstr ""
 
-#: template/merchants.html.j2:22
+#: template/merchants.html.j2:28
 msgid ""
 "Configure <a href=\"https://docs.taler.net/taler-merchant-manual.html\"; "
 ">Taler merchant backend</a > with the IBAN number."
 msgstr ""
 
-#: template/merchants.html.j2:29
+#: template/merchants.html.j2:35
 msgid "Modify payment processes to offer Taler as a payment option."
 msgstr ""
 
-#: template/merchants.html.j2:49
+#: template/merchants.html.j2:44
 msgid "For offline sales"
 msgstr ""
 
-#: template/merchants.html.j2:51
+#: template/merchants.html.j2:46
 msgid ""
 "The merchant backend can generate static QR codes customers can scan to "
 "pay you."
 msgstr ""
 
-#: template/merchants.html.j2:55
+#: template/merchants.html.j2:50
 msgid "You can hard-code a price or have the customer enter the price."
 msgstr ""
 
-#: template/merchants.html.j2:60
+#: template/merchants.html.j2:55
 msgid "Watch tutorial"
 msgstr ""
 
-#: template/merchants.html.j2:80
+#: template/merchants.html.j2:72
 msgid "For WooCommerce"
 msgstr ""
 
-#: template/merchants.html.j2:82
+#: template/merchants.html.j2:74
 msgid "A payment plugin is availalbe to add GNU Taler support to WooCommerce."
 msgstr ""
 
-#: template/merchants.html.j2:86 template/merchants.html.j2:118
-#: template/merchants.html.j2:149
+#: template/merchants.html.j2:78 template/merchants.html.j2:107
+#: template/merchants.html.j2:135
 msgid "You mostly need to configure access to your Taler merchant backend."
 msgstr ""
 
-#: template/merchants.html.j2:93
+#: template/merchants.html.j2:85
 msgid "WooCommerce&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:112
+#: template/merchants.html.j2:101
 msgid "For Pretix"
 msgstr ""
 
-#: template/merchants.html.j2:114
+#: template/merchants.html.j2:103
 msgid "A payment plugin is availalbe to add GNU Taler support to Pretix."
 msgstr ""
 
-#: template/merchants.html.j2:123
+#: template/merchants.html.j2:112
 msgid "Pretix&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:143
+#: template/merchants.html.j2:129
 msgid "For Joomla!"
 msgstr ""
 
-#: template/merchants.html.j2:145
+#: template/merchants.html.j2:131
 msgid ""
 "A payment plugin is availalbe to add GNU Taler support to Joomla! with "
 "Payage."
 msgstr ""
 
-#: template/merchants.html.j2:156
+#: template/merchants.html.j2:142
 msgid "Joomla!&nbsp;plugin"
 msgstr ""
 
-#: template/merchants.html.j2:175
+#: template/merchants.html.j2:158
 msgid "For points of sale"
 msgstr ""
 
-#: template/merchants.html.j2:177
+#: template/merchants.html.j2:160
 msgid ""
 "A point-of-sale App for Android can be used to quickly set up orders and "
 "handle payments."
 msgstr ""
 
-#: template/merchants.html.j2:181
+#: template/merchants.html.j2:164
 msgid ""
 "The App was designed for restaurants, but might be useful for other types"
 " of in-person sales."
 msgstr ""
 
-#: template/merchants.html.j2:188
+#: template/merchants.html.j2:171
 msgid "App manual"
 msgstr ""
 
-#: template/merchants.html.j2:208
+#: template/merchants.html.j2:194
 msgid "For developers"
 msgstr ""
 
-#: template/merchants.html.j2:210
+#: template/merchants.html.j2:196
 msgid ""
 "The merchant backend offers a simple REST API to integrate GNU Taler into"
 " existing E-commerce systems."
 msgstr ""
 
-#: template/merchants.html.j2:215
+#: template/merchants.html.j2:200
 msgid ""
 "Documentation is available at <a "
 "href=\"https://docs.taler.net/\";>docs.taler.net</a>."
 msgstr ""
 
-#: template/merchants.html.j2:221
+#: template/merchants.html.j2:205
 msgid "Watch tutorials"
 msgstr ""
 
@@ -411,14 +411,6 @@ msgstr ""
 msgid "Have a question?"
 msgstr ""
 
-#: template/users.html.j2:2
-msgid "Taler for Users"
-msgstr ""
-
-#: template/users.html.j2:6
-msgid "Describes how to use taler"
-msgstr ""
-
 #: template/users.html.j2:97
 msgid "Here's what you need to get started paying with Taler:"
 msgstr ""
diff --git a/static/scss/pages/_faq-util.scss b/static/scss/pages/faq-util.scss
similarity index 89%
rename from static/scss/pages/_faq-util.scss
rename to static/scss/pages/faq-util.scss
index ac412ff..0e01ec6 100644
--- a/static/scss/pages/_faq-util.scss
+++ b/static/scss/pages/faq-util.scss
@@ -16,11 +16,11 @@
     .text {
       @apply flex flex-col gap-2;
       h2 {
-        @apply font-medium text-2xl;
+        @apply font-medium text-2xl mb-1;
       }
       &,
       p {
-        @apply font-normal text-xl;
+        @apply font-normal text-lg;
       }
       b {
         @apply font-semibold;
diff --git a/static/scss/pages/users.scss b/static/scss/pages/merchant.scss
similarity index 70%
copy from static/scss/pages/users.scss
copy to static/scss/pages/merchant.scss
index fe126c6..651cbb1 100644
--- a/static/scss/pages/users.scss
+++ b/static/scss/pages/merchant.scss
@@ -1,5 +1,5 @@
-@use './faq-util' as faq;
-.users-page {
+@use './faq-util.scss' as faq;
+.merchant-page {
   .card {
     @apply flex w-max p-12 rounded-3xl;
   }
@@ -11,5 +11,8 @@
   }
   section {
     @include faq.section();
+    &:not(.prereq) {
+      @apply mt-8;
+    }
   }
 }
diff --git a/static/scss/pages/users.scss b/static/scss/pages/users.scss
index fe126c6..9922153 100644
--- a/static/scss/pages/users.scss
+++ b/static/scss/pages/users.scss
@@ -1,4 +1,4 @@
-@use './faq-util' as faq;
+@use './faq-util.scss' as faq;
 .users-page {
   .card {
     @apply flex w-max p-12 rounded-3xl;
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
index 53b3a1f..7e8ba38 100644
--- a/template/merchants.html.j2
+++ b/template/merchants.html.j2
@@ -1,237 +1,217 @@
 {% extends "common/base.j2" %} {% block head_content %}
-<title>{% trans %}Taler for Merchants{% endtrans %}</title>
+<title>{% trans %}Taler for Users{% endtrans %}</title>
 {# TODO: Provide a better opengraph description #}
 <meta
   name="description"
-  content="{% trans %}Describes how merchants can use Taler.{% endtrans %}"
+  content="{% trans %}Describes how to use taler{% endtrans %}"
 />
-{# <meta name="author" content="" /> #} {% endblock %} {% block body_content %}
-<main id="maincontent">
-  <section class="mid_sec mid_SecPanel">
-    <div class="container">
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}Prerequisites{% endtrans %}</h2>
-            <ul>
-              <li>
-                {% trans %}Open Swiss bank account, ideally enabling
-                <a href="https://www.ebics.org/";>EBICS</a>.{% endtrans %}
-              </li>
-              <li>
-                {% trans %}Configure
-                <a href="https://docs.taler.net/taler-merchant-manual.html";
-                  >Taler merchant backend</a
-                >
-                with the IBAN number.{% endtrans %}
-              </li>
-              <li>
-                {% trans %}Modify payment processes to offer Taler as a payment
-                option.{% endtrans %}
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <img
-              src="{{ url_static('images/unsorted/pica1.jpg') }}"
-              alt=""
-              width="400px"
-            />
-          </div>
-        </div>
+{# <meta name="author" content="" /> #}
+<script src="{{ url_static('js/toggle.ts') }}" defer></script>
+<link href="{{ url_static('scss/pages/merchant.scss') }}" rel="stylesheet" />
+{% endblock %} {% block body_content %}
+<main id="maincontent" class="merchant-page flex flex-col items-center gap-16">
+  <div
+    class="section prereq flex flex-col items-center justify-center w-max 
text-center min-h-max"
+  >
+    <div
+      class="inner flex flex-col items-center justify-center w-max text-center 
p-12 bg-gray-100 rounded-3xl"
+    >
+      <h2 class="text-xl font-medium mb-2">
+        {% trans %}Prerequisites{% endtrans %}
+      </h2>
+      <ul class="text-lg font-normal">
+        <li>
+          {% trans %}Open Swiss bank account, ideally enabling
+          <a href="https://www.ebics.org/";>EBICS</a>.{% endtrans %}
+        </li>
+        <li>
+          {% trans %}Configure
+          <a href="https://docs.taler.net/taler-merchant-manual.html";
+            >Taler merchant backend</a
+          >
+          with the IBAN number.{% endtrans %}
+        </li>
+        <li>
+          {% trans %}Modify payment processes to offer Taler as a payment
+          option.{% endtrans %}
+        </li>
+      </ul>
+    </div>
+  </div>
+  <section id="select-provider">
+    <div class="step graphic-left">
+      <div class="text">
+        <h2>{% trans %}For offline sales{% endtrans %}</h2>
+        <p>
+          {% trans %}The merchant backend can generate static QR codes 
customers
+          can scan to pay you.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}You can hard-code a price or have the customer enter the
+          price.{% endtrans %}
+        </p>
+        <p>
+          <a href="https://tutorials.taler.net/qr"; class="blubtn"
+            >{% trans %}Watch tutorial{% endtrans %}</a
+          >
+        </p>
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For offline sales{% endtrans %}</h2>
-            <p>
-              {% trans %}The merchant backend can generate static QR codes
-              customers can scan to pay you.{% endtrans %}
-            </p>
-            <p>
-              {% trans %}You can hard-code a price or have the customer enter
-              the price.{% endtrans %}
-            </p>
-            <p>
-              <a href="https://tutorials.taler.net/qr"; class="blubtn"
-                >{% trans %}Watch tutorial{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <!-- FIXME: find a better picture! -->
-            <img
-              src="{{ url_static('images/unsorted/valuepic1.jpg') }}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+      <div class="img">
+        <!-- FIXME: find a better picture! -->
+        <img
+          src="{{ url_static('images/unsorted/valuepic1.jpg') }}"
+          alt=""
+          width="350px"
+        />
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For WooCommerce{% endtrans %}</h2>
-            <p>
-              {% trans %}A payment plugin is availalbe to add GNU Taler support
-              to WooCommerce.{% endtrans %}
-            </p>
-            <p>
-              {% trans %}You mostly need to configure access to your Taler
-              merchant backend.{% endtrans %}
-            </p>
-            <p>
-              <a
-                
href="https://wordpress.org/plugins/gnu-taler-payment-for-woocommerce/";
-                class="blubtn"
-                >{% trans %}WooCommerce&nbsp;plugin{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <img
-              src="{{ url_static('images/unsorted/woocommerce-settings.png') 
}}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+    </div>
+  </section>
+  <section id="select-provider">
+    <div class="step graphic-right">
+      <div class="text">
+        <h2>{% trans %}For WooCommerce{% endtrans %}</h2>
+        <p>
+          {% trans %}A payment plugin is availalbe to add GNU Taler support to
+          WooCommerce.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}You mostly need to configure access to your Taler merchant
+          backend.{% endtrans %}
+        </p>
+        <p>
+          <a
+            
href="https://wordpress.org/plugins/gnu-taler-payment-for-woocommerce/";
+            class="blubtn"
+            >{% trans %}WooCommerce&nbsp;plugin{% endtrans %}</a
+          >
+        </p>
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For Pretix{% endtrans %}</h2>
-            <p>
-              {% trans %}A payment plugin is availalbe to add GNU Taler support
-              to Pretix.{% endtrans %}
-            </p>
-            <p>
-              {% trans %}You mostly need to configure access to your Taler
-              merchant backend.{% endtrans %}
-            </p>
-            <p>
-              <a href="https://github.com/pretix/pretix-taler"; class="blubtn"
-                >{% trans %}Pretix&nbsp;plugin{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <!-- FIXME: replace with screenshot of pretix settings? -->
-            <img
-              src="{{ url_static('images/unsorted/pretix.png') }}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+      <div class="img">
+        <img
+          src="{{ url_static('images/unsorted/woocommerce-settings.png') }}"
+          alt=""
+          width="350px"
+        />
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For Joomla!{% endtrans %}</h2>
-            <p>
-              {% trans %}A payment plugin is availalbe to add GNU Taler support
-              to Joomla! with Payage.{% endtrans %}
-            </p>
-            <p>
-              {% trans %}You mostly need to configure access to your Taler
-              merchant backend.{% endtrans %}
-            </p>
-            <p>
-              <a
-                
href="https://git.taler.net/joomla-payage-taler-plugin.git/tree/README.md";
-                class="blubtn"
-                >{% trans %}Joomla!&nbsp;plugin{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <img
-              src="{{ url_static('images/unsorted/woocommerce-settings.png') 
}}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+    </div>
+  </section>
+  <section id="select-provider">
+    <div class="step graphic-left">
+      <div class="text">
+        <h2>{% trans %}For Pretix{% endtrans %}</h2>
+        <p>
+          {% trans %}A payment plugin is availalbe to add GNU Taler support to
+          Pretix.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}You mostly need to configure access to your Taler merchant
+          backend.{% endtrans %}
+        </p>
+        <p>
+          <a href="https://github.com/pretix/pretix-taler"; class="blubtn"
+            >{% trans %}Pretix&nbsp;plugin{% endtrans %}</a
+          >
+        </p>
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For points of sale{% endtrans %}</h2>
-            <p>
-              {% trans %}A point-of-sale App for Android can be used to quickly
-              set up orders and handle payments.{% endtrans %}
-            </p>
-            <p>
-              {% trans %}The App was designed for restaurants, but might be
-              useful for other types of in-person sales.{% endtrans %}
-            </p>
-            <p>
-              <a
-                href="https://docs.taler.net/taler-merchant-pos-terminal.html";
-                class="blubtn"
-                >{% trans %}App manual{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <!-- FIXME: why JPG!? -->
-            <img
-              src="{{ url_static('images/unsorted/pos-app.jpg') }}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+      <div class="img">
+        <!-- FIXME: replace with screenshot of pretix settings? -->
+        <img
+          src="{{ url_static('images/unsorted/pretix.png') }}"
+          alt=""
+          width="350px"
+        />
       </div>
-
-      <div class="row">
-        <div class="col-sm-6">
-          <div class="mid_text">
-            <h2>{% trans %}For developers{% endtrans %}</h2>
-            <p>
-              {% trans %}The merchant backend offers a simple REST API to
-              integrate GNU Taler into existing E-commerce systems.{% endtrans
-              %}
-            </p>
-            <p>
-              {% trans %}Documentation is available at
-              <a href="https://docs.taler.net/";>docs.taler.net</a>.{% endtrans
-              %}
-            </p>
-            <p>
-              <a href="https://tutorials.taler.net/"; class="blubtn"
-                >{% trans %}Watch tutorials{% endtrans %}</a
-              >
-            </p>
-          </div>
-        </div>
-        <div class="col-sm-6">
-          <div class="img">
-            <img
-              src="{{ url_static('images/unsorted/valuepic4.jpg') }}"
-              alt=""
-              width="350px"
-            />
-          </div>
-        </div>
+    </div>
+  </section>
+  <section id="select-provider">
+    <div class="step graphic-right">
+      <div class="text">
+        <h2>{% trans %}For Joomla!{% endtrans %}</h2>
+        <p>
+          {% trans %}A payment plugin is availalbe to add GNU Taler support to
+          Joomla! with Payage.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}You mostly need to configure access to your Taler merchant
+          backend.{% endtrans %}
+        </p>
+        <p>
+          <a
+            
href="https://git.taler.net/joomla-payage-taler-plugin.git/tree/README.md";
+            class="blubtn"
+            >{% trans %}Joomla!&nbsp;plugin{% endtrans %}</a
+          >
+        </p>
+      </div>
+      <div class="img">
+        <img
+          src="{{ url_static('images/unsorted/woocommerce-settings.png') }}"
+          alt=""
+          width="350px"
+        />
+      </div>
+    </div>
+  </section>
+  <section id="select-provider">
+    <div class="step graphic-left">
+      <div class="text">
+        <h2>{% trans %}For points of sale{% endtrans %}</h2>
+        <p>
+          {% trans %}A point-of-sale App for Android can be used to quickly set
+          up orders and handle payments.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}The App was designed for restaurants, but might be useful
+          for other types of in-person sales.{% endtrans %}
+        </p>
+        <p>
+          <a
+            href="https://docs.taler.net/taler-merchant-pos-terminal.html";
+            class="blubtn"
+            >{% trans %}App manual{% endtrans %}</a
+          >
+        </p>
+      </div>
+      <div class="img">
+        <!--
+          FIXME: why JPG!?
+            ~ Christian Grothoff (afaik)
+            
+          re: most devices take screenshots in jpg by default; still bad
+            ~ nullptrderef
+        -->
+        <img
+          src="{{ url_static('images/unsorted/pos-app.jpg') }}"
+          alt=""
+          width="350px"
+        />
+      </div>
+    </div>
+  </section>
+  <section id="select-provider">
+    <div class="step graphic-right">
+      <div class="text">
+        <h2>{% trans %}For developers{% endtrans %}</h2>
+        <p>
+          {% trans %}The merchant backend offers a simple REST API to integrate
+          GNU Taler into existing E-commerce systems.{% endtrans %}
+        </p>
+        <p>
+          {% trans %}Documentation is available at
+          <a href="https://docs.taler.net/";>docs.taler.net</a>.{% endtrans %}
+        </p>
+        <p>
+          <a href="https://tutorials.taler.net/"; class="blubtn"
+            >{% trans %}Watch tutorials{% endtrans %}</a
+          >
+        </p>
+      </div>
+      <div class="img">
+        <img
+          src="{{ url_static('images/unsorted/valuepic4.jpg') }}"
+          alt=""
+          width="350px"
+        />
       </div>
     </div>
   </section>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]