diff options
Diffstat (limited to 'talermerchantdemos/templates')
| -rw-r--r-- | talermerchantdemos/templates/common-base.html.j2 | 34 | ||||
| -rw-r--r-- | talermerchantdemos/templates/donations-checkout.html.j2 | 2 | ||||
| -rw-r--r-- | talermerchantdemos/templates/donations-index.html.j2 | 2 | ||||
| -rw-r--r-- | talermerchantdemos/templates/footer.html.j2 | 10 | ||||
| -rw-r--r-- | talermerchantdemos/templates/language-switcher.html.j2 | 32 | ||||
| -rw-r--r-- | talermerchantdemos/templates/menu.html.j2 | 22 | ||||
| -rw-r--r-- | talermerchantdemos/templates/survey-index.html.j2 | 2 |
7 files changed, 51 insertions, 53 deletions
diff --git a/talermerchantdemos/templates/common-base.html.j2 b/talermerchantdemos/templates/common-base.html.j2 index ff8d655..17e27c6 100644 --- a/talermerchantdemos/templates/common-base.html.j2 +++ b/talermerchantdemos/templates/common-base.html.j2 @@ -38,13 +38,43 @@ {% endblock %} </div> </header> - {% from 'menu.html.j2' import menu with context %} {{ menu('landing') }} + + + <div style="display:flex; flex-direction: column;" class="navcontainer"> + <nav class="demolist"> + <a href="{{ env('TALER_ENV_URL_INTRO', '#') + getlang() + '/' }}" + {% if getactive() == 'landing' %} class="active" {% endif %} + >{{gettext("Introduction")}}</a> + <a href="{{ env('TALER_ENV_URL_BANK', '#') + getlang() + '/' }}" + {% if getactive() == 'bank' %} class="active" {% endif %} + >{{gettext("Bank")}}</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') + getlang() + '/' }}" + {% if getactive() == 'blog' %} class="active" {% endif %} + >{{gettext("Essay Shop")}}</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') + getlang() + '/' }}" + {% if getactive() == 'donations' %} class="active" {% endif %} + >{{gettext("Donations")}}</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') + getlang() + '/' }}" + {% if getactive() == 'survey' %} class="active" {% endif %} + >{{gettext("Tipping/Survey")}}</a> + {% include 'language-switcher.html.j2' %} + </nav> + </div> <section id="main" class="content"> {% block main %} This is the main content of the page. {% endblock %} - {% include 'footer.html.j2' %} + <hr /> + <div> + <p> + {{ + gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/" + getlang() + "/") + }} + </p> + <div style="flex-grow:1"></div> + <p>Copyright © 2014—2020 Taler Systems SA</p> + </div> </section> </body> </html> diff --git a/talermerchantdemos/templates/donations-checkout.html.j2 b/talermerchantdemos/templates/donations-checkout.html.j2 index ec63d9f..677df85 100644 --- a/talermerchantdemos/templates/donations-checkout.html.j2 +++ b/talermerchantdemos/templates/donations-checkout.html.j2 @@ -19,7 +19,7 @@ }} </p> - <form name="tform" action="{{ url_for('donate',lang=lang) }}" method="get"> + <form name="tform" action="{{ url_for('donate',lang=getlang()) }}" method="get"> <div id="opt-form" align="left"><br> <input type="hidden" name="donation_receiver" value="{{ donation_receiver }}"> <input type="hidden" name="donation_amount" value="{{ donation_amount }}"> diff --git a/talermerchantdemos/templates/donations-index.html.j2 b/talermerchantdemos/templates/donations-index.html.j2 index 25a6768..05e958e 100644 --- a/talermerchantdemos/templates/donations-index.html.j2 +++ b/talermerchantdemos/templates/donations-index.html.j2 @@ -17,7 +17,7 @@ }} </p> - <form name="tform" action="{{ url_for('checkout',lang=lang) }}" method="GET" class="pure-form"> + <form name="tform" action="{{ url_for('checkout',lang=getlang()) }}" method="GET" class="pure-form"> <div class="participation" id="fake-shop"> <select name="donation_receiver"> <option value="GNUnet">GNUnet</option> diff --git a/talermerchantdemos/templates/footer.html.j2 b/talermerchantdemos/templates/footer.html.j2 deleted file mode 100644 index 7c585bc..0000000 --- a/talermerchantdemos/templates/footer.html.j2 +++ /dev/null @@ -1,10 +0,0 @@ -<hr /> -<div> - <p> - {{ - gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/" + lang + "/") - }} - </p> - <div style="flex-grow:1"></div> - <p>Copyright © 2014—2020 Taler Systems SA</p> -</div> diff --git a/talermerchantdemos/templates/language-switcher.html.j2 b/talermerchantdemos/templates/language-switcher.html.j2 index dbf2d31..66c5405 100644 --- a/talermerchantdemos/templates/language-switcher.html.j2 +++ b/talermerchantdemos/templates/language-switcher.html.j2 @@ -1,50 +1,50 @@ <span class="right"> - {{ {"en": "English [en]", "ar": "Arabic [ar]", "zh_Hant": "Chinese [zh]", "fr": "French [fr]", "de": "German [de]", "hi": "Hindi [hi]", "it": "Italian [it]", "ja": "Japanese [ja]", "ko": "Korean [ko]", "pt": "Portuguese [pt]", "pt_BR": "Portuguese (Brazil) [pt_BR]", "ru": "Russian [ru]", "es": "Spanish [es]", "sv": "Swedish [sv]", "tr": "Turkish [tr]"}[lang] | default("en") }} + {{ {"en": "English [en]", "ar": "Arabic [ar]", "zh_Hant": "Chinese [zh]", "fr": "French [fr]", "de": "German [de]", "hi": "Hindi [hi]", "it": "Italian [it]", "ja": "Japanese [ja]", "ko": "Korean [ko]", "pt": "Portuguese [pt]", "pt_BR": "Portuguese (Brazil) [pt_BR]", "ru": "Russian [ru]", "es": "Spanish [es]", "sv": "Swedish [sv]", "tr": "Turkish [tr]"}[getlang()] | default("en") }} <div class="nav"> <br> - {% if lang != 'en' %} + {% if getlang() != 'en' %} <a href="/en/" class="navbtn">English [en]</a><br> {% endif %} - {% if lang != 'ar' %} + {% if getlang() != 'ar' %} <a href="/ar/" class="navbtn">Arabic [ar]</a><br> {% endif %} - {% if lang != 'zh_Hant' %} + {% if getlang() != 'zh_Hant' %} <a href="/zh_Hant/" class="navbtn">Chinese [zh]</a><br> {% endif %} - {% if lang != 'fr' %} + {% if getlang() != 'fr' %} <a href="/fr/" class="navbtn">Français [fr]</a><br> {% endif %} - {% if lang != 'de' %} + {% if getlang() != 'de' %} <a href="/de/" class="navbtn">Deutsch [de]</a><br> {% endif %} - {% if lang != 'hi' %} + {% if getlang() != 'hi' %} <a href="/hi/" class="navbtn">Hindi [hi]</a><br> {% endif %} - {% if lang != 'it' %} + {% if getlang() != 'it' %} <a href="/it/" class="navbtn">Italiano [it]</a><br> {% endif %} - {% if lang != 'ja' %} + {% if getlang() != 'ja' %} <a href="/ja/" class="navbtn">Japanese [ja]</a><br> {% endif %} - {% if lang != 'ko' %} + {% if getlang() != 'ko' %} <a href="/ko/" class="navbtn">Korean [ko]</a><br> {% endif %} - {% if lang != 'pt' %} + {% if getlang() != 'pt' %} <a href="/pt/" class="navbtn">Português [pt]</a><br> {% endif %} - {% if lang != 'pt_BR' %} + {% if getlang() != 'pt_BR' %} <a href="/pt_BR/" class="navbtn">Português (Brazil) [pt_BR]</a><br> {% endif %} - {% if lang != 'ru' %} + {% if getlang() != 'ru' %} <a href="/ru/" class="navbtn">Russian [pt]</a><br> {% endif %} - {% if lang != 'es' %} + {% if getlang() != 'es' %} <a href="/es/" class="navbtn">Español [es]</a><br> {% endif %} - {% if lang != 'sv' %} + {% if getlang() != 'sv' %} <a href="/sv/" class="navbtn">Svenska [sv]</a><br> {% endif %} - {% if lang != 'tr' %} + {% if getlang() != 'tr' %} <a href="/tr/" class="navbtn">Turkish [tr]</a><br> {% endif %} diff --git a/talermerchantdemos/templates/menu.html.j2 b/talermerchantdemos/templates/menu.html.j2 deleted file mode 100644 index 937030d..0000000 --- a/talermerchantdemos/templates/menu.html.j2 +++ /dev/null @@ -1,22 +0,0 @@ -{% macro menu(active) -%} -<div style="display:flex; flex-direction: column;" class="navcontainer"> - <nav class="demolist"> - <a href="{{ env('TALER_ENV_URL_INTRO', '#') + lang + '/' }}" - {% if active == 'landing' %} class="active" {% endif %} - >{{gettext("Introduction")}}</a> - <a href="{{ env('TALER_ENV_URL_BANK', '#') + lang + '/' }}" - {% if active == 'bank' %} class="active" {% endif %} - >{{gettext("Bank")}}</a> - <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') + lang + '/' }}" - {% if active == 'blog' %} class="active" {% endif %} - >{{gettext("Essay Shop")}}</a> - <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') + lang + '/' }}" - {% if active == 'donations' %} class="active" {% endif %} - >{{gettext("Donations")}}</a> - <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') + lang + '/' }}" - {% if active == 'survey' %} class="active" {% endif %} - >{{gettext("Tipping/Survey")}}</a> - {% include 'language-switcher.html.j2' %} - </nav> -</div> -{%- endmacro %} diff --git a/talermerchantdemos/templates/survey-index.html.j2 b/talermerchantdemos/templates/survey-index.html.j2 index e7d323b..d860573 100644 --- a/talermerchantdemos/templates/survey-index.html.j2 +++ b/talermerchantdemos/templates/survey-index.html.j2 @@ -8,7 +8,7 @@ </p> </div> <div> - <form action="{{ "/" + lang + "/submit-survey" }}" method="post" class="pure-form pure-form-stacked"> + <form action="{{ "/" + getlang() + "/submit-survey" }}" method="post" class="pure-form pure-form-stacked"> <legend>{{ gettext("Which payment system do you prefer?") }}</legend> <fieldset> <label for="option-taler"> |