From 46dd63af682246c162423e37e0361e2d644c93e1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 12 Oct 2020 13:38:35 +0200 Subject: share menu and style sheets across demo pages (fixes #5704) --- talermerchantdemos/blog/templates/base.html.j2 | 72 +-------------------- talermerchantdemos/blog/templates/footer.html.j2 | 1 + .../blog/templates/language-switcher.html.j2 | 1 + talermerchantdemos/blog/templates/menu.html.j2 | 1 + .../donations/templates/base.html.j2 | 73 +--------------------- .../donations/templates/footer.html.j2 | 1 + .../donations/templates/language-switcher.html.j2 | 1 + .../donations/templates/menu.html.j2 | 1 + talermerchantdemos/landing/templates/base.html.j2 | 72 +-------------------- .../landing/templates/footer.html.j2 | 1 + talermerchantdemos/landing/templates/index.html.j2 | 2 +- .../landing/templates/language-switcher.html.j2 | 1 + talermerchantdemos/landing/templates/menu.html.j2 | 1 + talermerchantdemos/survey/templates/base.html.j2 | 72 +-------------------- talermerchantdemos/survey/templates/footer.html.j2 | 1 + .../survey/templates/language-switcher.html.j2 | 1 + talermerchantdemos/survey/templates/menu.html.j2 | 1 + .../templates/language-switcher.html.j2 | 12 ++++ 18 files changed, 37 insertions(+), 278 deletions(-) create mode 120000 talermerchantdemos/blog/templates/footer.html.j2 create mode 120000 talermerchantdemos/blog/templates/language-switcher.html.j2 create mode 120000 talermerchantdemos/blog/templates/menu.html.j2 create mode 120000 talermerchantdemos/donations/templates/footer.html.j2 create mode 120000 talermerchantdemos/donations/templates/language-switcher.html.j2 create mode 120000 talermerchantdemos/donations/templates/menu.html.j2 create mode 120000 talermerchantdemos/landing/templates/footer.html.j2 create mode 120000 talermerchantdemos/landing/templates/language-switcher.html.j2 create mode 120000 talermerchantdemos/landing/templates/menu.html.j2 create mode 120000 talermerchantdemos/survey/templates/footer.html.j2 create mode 120000 talermerchantdemos/survey/templates/language-switcher.html.j2 create mode 120000 talermerchantdemos/survey/templates/menu.html.j2 create mode 100644 talermerchantdemos/templates/language-switcher.html.j2 (limited to 'talermerchantdemos') diff --git a/talermerchantdemos/blog/templates/base.html.j2 b/talermerchantdemos/blog/templates/base.html.j2 index 65f8461..c4935f1 100644 --- a/talermerchantdemos/blog/templates/base.html.j2 +++ b/talermerchantdemos/blog/templates/base.html.j2 @@ -24,45 +24,7 @@ - - + {% block styles %}{% endblock %} {% block scripts %}{% endblock %} @@ -78,41 +40,13 @@ }}

-
- -
+ {% from 'templates/menu.html.j2' import menu with context %} {{ menu('blog') }}
{% block main %} This is the main content of the page. {% endblock %} -
-
-

{{ gettext('You can learn more about GNU Taler on our main website.').format(site="https://taler.net/") }}

-
-

Copyright © 2014—2020 Taler Systems SA

-
+ {% include 'templates/footer.html.j2' %}
diff --git a/talermerchantdemos/blog/templates/footer.html.j2 b/talermerchantdemos/blog/templates/footer.html.j2 new file mode 120000 index 0000000..028b093 --- /dev/null +++ b/talermerchantdemos/blog/templates/footer.html.j2 @@ -0,0 +1 @@ +../../templates/footer.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/blog/templates/language-switcher.html.j2 b/talermerchantdemos/blog/templates/language-switcher.html.j2 new file mode 120000 index 0000000..6423c5c --- /dev/null +++ b/talermerchantdemos/blog/templates/language-switcher.html.j2 @@ -0,0 +1 @@ +../../templates/language-switcher.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/blog/templates/menu.html.j2 b/talermerchantdemos/blog/templates/menu.html.j2 new file mode 120000 index 0000000..b9575ea --- /dev/null +++ b/talermerchantdemos/blog/templates/menu.html.j2 @@ -0,0 +1 @@ +../../templates/menu.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/donations/templates/base.html.j2 b/talermerchantdemos/donations/templates/base.html.j2 index f3b1359..307705f 100644 --- a/talermerchantdemos/donations/templates/base.html.j2 +++ b/talermerchantdemos/donations/templates/base.html.j2 @@ -21,45 +21,7 @@ - - + {% block styles %}{% endblock %} {% block scripts %}{% endblock %} @@ -74,42 +36,13 @@ }}

- -
- -
+ {% from 'templates/menu.html.j2' import menu with context %} {{ menu('donations') }}
{% block main %} This is the main content of the page. {% endblock %} -
-
-

{{ gettext('You can learn more about GNU Taler on our main website.').format(site="https://taler.net/") }}

-
-

Copyright © 2014—2020 Taler Systems SA

-
+ {% include 'templates/footer.html.j2' %}
diff --git a/talermerchantdemos/donations/templates/footer.html.j2 b/talermerchantdemos/donations/templates/footer.html.j2 new file mode 120000 index 0000000..028b093 --- /dev/null +++ b/talermerchantdemos/donations/templates/footer.html.j2 @@ -0,0 +1 @@ +../../templates/footer.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/donations/templates/language-switcher.html.j2 b/talermerchantdemos/donations/templates/language-switcher.html.j2 new file mode 120000 index 0000000..6423c5c --- /dev/null +++ b/talermerchantdemos/donations/templates/language-switcher.html.j2 @@ -0,0 +1 @@ +../../templates/language-switcher.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/donations/templates/menu.html.j2 b/talermerchantdemos/donations/templates/menu.html.j2 new file mode 120000 index 0000000..b9575ea --- /dev/null +++ b/talermerchantdemos/donations/templates/menu.html.j2 @@ -0,0 +1 @@ +../../templates/menu.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/landing/templates/base.html.j2 b/talermerchantdemos/landing/templates/base.html.j2 index c88ee90..2114347 100644 --- a/talermerchantdemos/landing/templates/base.html.j2 +++ b/talermerchantdemos/landing/templates/base.html.j2 @@ -21,45 +21,7 @@ - - + {% block styles %}{% endblock %} {% block scripts %}{% endblock %} @@ -74,41 +36,13 @@ }}

-
- -
+ {% from 'templates/menu.html.j2' import menu with context %} {{ menu('landing') }}
{% block main %} This is the main content of the page. {% endblock %} -
-
-

{{ gettext('You can learn more about GNU Taler on our main website.').format(site="https://taler.net/") }}

-
-

Copyright © 2014—2020 Taler Systems SA

-
+ {% include 'templates/footer.html.j2' %}
diff --git a/talermerchantdemos/landing/templates/footer.html.j2 b/talermerchantdemos/landing/templates/footer.html.j2 new file mode 120000 index 0000000..028b093 --- /dev/null +++ b/talermerchantdemos/landing/templates/footer.html.j2 @@ -0,0 +1 @@ +../../templates/footer.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/landing/templates/index.html.j2 b/talermerchantdemos/landing/templates/index.html.j2 index 399dd25..f005279 100644 --- a/talermerchantdemos/landing/templates/index.html.j2 +++ b/talermerchantdemos/landing/templates/index.html.j2 @@ -66,7 +66,7 @@

{{ gettext("Websites can give tips to visitors for completing tasks.") + "
" + - gettext("You can earn some {currency} coins by filling in our survey.").format(url=merchant_survey_url,currency=merchant_currency) + gettext('You can earn some {currency} coins by filling in our survey.').format(url=merchant_survey_url,currency=merchant_currency) }}

diff --git a/talermerchantdemos/landing/templates/language-switcher.html.j2 b/talermerchantdemos/landing/templates/language-switcher.html.j2 new file mode 120000 index 0000000..6423c5c --- /dev/null +++ b/talermerchantdemos/landing/templates/language-switcher.html.j2 @@ -0,0 +1 @@ +../../templates/language-switcher.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/landing/templates/menu.html.j2 b/talermerchantdemos/landing/templates/menu.html.j2 new file mode 120000 index 0000000..b9575ea --- /dev/null +++ b/talermerchantdemos/landing/templates/menu.html.j2 @@ -0,0 +1 @@ +../../templates/menu.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/survey/templates/base.html.j2 b/talermerchantdemos/survey/templates/base.html.j2 index 2b424f1..734da6f 100644 --- a/talermerchantdemos/survey/templates/base.html.j2 +++ b/talermerchantdemos/survey/templates/base.html.j2 @@ -21,45 +21,7 @@ - - + {% block styles %}{% endblock %} {% block scripts %}{% endblock %} @@ -74,41 +36,13 @@ }}

-
- -
+ {% from 'templates/menu.html.j2' import menu with context %} {{ menu('survey') }}
{% block main %} This is the main content of the page. {% endblock %} -
-
-

{{ gettext('You can learn more about GNU Taler on our main website.').format(site="https://taler.net/") }}

-
-

Copyright © 2014—2020 Taler Systems SA

-
+ {% include 'templates/footer.html.j2' %}
diff --git a/talermerchantdemos/survey/templates/footer.html.j2 b/talermerchantdemos/survey/templates/footer.html.j2 new file mode 120000 index 0000000..028b093 --- /dev/null +++ b/talermerchantdemos/survey/templates/footer.html.j2 @@ -0,0 +1 @@ +../../templates/footer.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/survey/templates/language-switcher.html.j2 b/talermerchantdemos/survey/templates/language-switcher.html.j2 new file mode 120000 index 0000000..6423c5c --- /dev/null +++ b/talermerchantdemos/survey/templates/language-switcher.html.j2 @@ -0,0 +1 @@ +../../templates/language-switcher.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/survey/templates/menu.html.j2 b/talermerchantdemos/survey/templates/menu.html.j2 new file mode 120000 index 0000000..b9575ea --- /dev/null +++ b/talermerchantdemos/survey/templates/menu.html.j2 @@ -0,0 +1 @@ +../../templates/menu.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/templates/language-switcher.html.j2 b/talermerchantdemos/templates/language-switcher.html.j2 new file mode 100644 index 0000000..22eef42 --- /dev/null +++ b/talermerchantdemos/templates/language-switcher.html.j2 @@ -0,0 +1,12 @@ + + {{ gettext("English [en]") }} +
+
+ {% if lang != 'en' %} + English [en]
+ {% endif %} + {% if lang != 'de' %} + Deutsch [de]
+ {% endif %} +
+ -- cgit v1.2.3