[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: format unformatted code
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: format unformatted code |
|
Date: |
Sat, 24 Feb 2024 21:43:52 +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 60b690e format unformatted code
60b690e is described below
commit 60b690e74b84776555f34a2253d0a858e6d39a44
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sat Feb 24 21:43:49 2024 +0100
format unformatted code
---
common/footer.j2.inc | 187 ++++++++++++++++++++++++++++++++---------------
common/navigation.j2.inc | 143 ++++++++++++++++++++++++------------
2 files changed, 223 insertions(+), 107 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index f5d4d2e..3a2a02f 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,60 +1,129 @@
<footer class="footersec">
- <div class="foottop">
- <div class="container">
- <div class="row">
- <div class="col-md-3 col-sm-6">
- <div class="footbox text-center">
- <a href="{{
url_localized('index.html') }}" class="footlogo"><img src="{{
url_static('images/footlogo.png') }}" alt="Homepage"></a>
- </div>
- <div class="footbox text-center">
- <p
style="color:white;margin-top:5px">
- Taler Operations AG, {% trans
%}Switzerland{% endtrans %}<br />
- Höheweg 80<br />
- CH-2502 Biel, Switzerland
- </p>
- </div>
- </div>
- <div class="col-md-3 col-sm-6">
- <div class="footbox footmenu">
- <h4>{% trans %}Quick Links{%
endtrans %}</h4>
- <ul>
- <li><a href="{{
url_localized('index.html') }}" alt="{% trans %}Taler Operations AG Homepage{%
endtrans %}">{% trans %}Home{% endtrans %}</a></li>
- {# <!-- <li><a href="{{
url_localized('merchants.html') }}">{% trans %}Merchant Integration Guide{%
endtrans %}</a></li>
- <li><a href="{{
url_localized('users.html') }}">{% trans %}User Installation Guide{% endtrans
%}</a></li> --> #}
- <li><a href="{{
url_localized('fees.html') }}">{% trans %}Fees{% endtrans %}</a></li>
- <li><a
href="https://exchange.taler-ops.ch/terms";>{% trans %}Terms of Service{%
endtrans %}</a></li>
- </ul>
- </div>
- </div>
- <div class="col-md-3 col-sm-6">
- <div class="footbox footmenu">
- <h4>{% trans %}Partners{%
endtrans %}</h4>
- <ul>
- <li><a
href="https://taler.net/en/ngi-taler.html"; target="_blank" rel="noopener
noreferrer">{% trans %}Taler Consortium{% endtrans %}</a></li>
- <li><a
href="https://bfh.ch/"; target="_blank" rel="noopener noreferrer">{% trans
%}Bern University of Applied Sciences{% endtrans %}</a></li>
- <li><a
href="https://netzbon.ch"; target="_blank" rel="noopener noreferrer">{% trans
%}NetzBon{% endtrans %}</a></li>
- </ul>
- </div>
- </div>
- <div class="col-md-3 col-sm-6">
- <div class="footbox footadres">
- <h4>{% trans %}Contacts{%
endtrans %}</h4>
- <ul>
- <li><a class="phone"
href="tel:0041442801200">{% trans %}Tel:{% endtrans %} +41 44 280 1200</a></li>
- <li><a
href="mailto:compliance@taler-systems.com";>{% trans %}Compliance Officer{%
endtrans %}</a></li>
- <li><a
href="mailto:aml@taler-systems.com";>{% trans %}AML Officer{% endtrans
%}</a></li>
- </ul>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="footbottm">
- <div class="container">
- <div class="footbottminn">
- <p>© {% trans %}Copyright{% endtrans %} 2024
| <a href="{{ url_localized('index.html') }}">Taler Operations AG</a> | <a
href="https://www.gnu.org/licenses/fdl-1.3.html.en"; target="_blank"
rel="noopener noreferrer">{% trans %}License{% endtrans %}: GNU Free
Documentation License</a></p>
- <p>{% trans %}We do not assume any liability
for the correctness of contents. We do not collect any data and do not use
cookies.
- <br>Our web server generates a log file with IP
addresses of visitors. However, these are evaluated exclusively for
troubleshooting or problem mitigation.{% endtrans %}</p>
- </div>
- </div>
- </div>
+ <div class="foottop">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-3 col-sm-6">
+ <div class="footbox text-center">
+ <a href="{{ url_localized('index.html') }}" class="footlogo"
+ ><img
+ src="{{ url_static('images/footlogo.png') }}"
+ alt="Homepage"
+ /></a>
+ </div>
+ <div class="footbox text-center">
+ <p style="color: white; margin-top: 5px">
+ Taler Operations AG, {% trans %}Switzerland{% endtrans %}<br />
+ Höheweg 80<br />
+ CH-2502 Biel, Switzerland
+ </p>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-6">
+ <div class="footbox footmenu">
+ <h4>{% trans %}Quick Links{% endtrans %}</h4>
+ <ul>
+ <li>
+ <a
+ href="{{ url_localized('index.html') }}"
+ alt="{% trans %}Taler Operations AG Homepage{% endtrans %}"
+ >{% trans %}Home{% endtrans %}</a
+ >
+ </li>
+ {#
+ <!-- <li><a href="{{ url_localized('merchants.html') }}">{%
trans %}Merchant Integration Guide{% endtrans %}</a></li>
+ <li><a href="{{
url_localized('users.html') }}">{% trans %}User Installation Guide{% endtrans
%}</a></li> -->
+ #}
+ <li>
+ <a href="{{ url_localized('fees.html') }}"
+ >{% trans %}Fees{% endtrans %}</a
+ >
+ </li>
+ <li>
+ <a href="https://exchange.taler-ops.ch/terms";
+ >{% trans %}Terms of Service{% endtrans %}</a
+ >
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-6">
+ <div class="footbox footmenu">
+ <h4>{% trans %}Partners{% endtrans %}</h4>
+ <ul>
+ <li>
+ <a
+ href="https://taler.net/en/ngi-taler.html";
+ target="_blank"
+ rel="noopener noreferrer"
+ >{% trans %}Taler Consortium{% endtrans %}</a
+ >
+ </li>
+ <li>
+ <a
+ href="https://bfh.ch/";
+ target="_blank"
+ rel="noopener noreferrer"
+ >{% trans %}Bern University of Applied Sciences{%
+ endtrans %}</a
+ >
+ </li>
+ <li>
+ <a
+ href="https://netzbon.ch";
+ target="_blank"
+ rel="noopener noreferrer"
+ >{% trans %}NetzBon{% endtrans %}</a
+ >
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="col-md-3 col-sm-6">
+ <div class="footbox footadres">
+ <h4>{% trans %}Contacts{% endtrans %}</h4>
+ <ul>
+ <li>
+ <a class="phone" href="tel:0041442801200"
+ >{% trans %}Tel:{% endtrans %} +41 44 280 1200</a
+ >
+ </li>
+ <li>
+ <a href="mailto:compliance@taler-systems.com";
+ >{% trans %}Compliance Officer{% endtrans %}</a
+ >
+ </li>
+ <li>
+ <a href="mailto:aml@taler-systems.com";
+ >{% trans %}AML Officer{% endtrans %}</a
+ >
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="footbottm">
+ <div class="container">
+ <div class="footbottminn">
+ <p>
+ © {% trans %}Copyright{% endtrans %} 2024 |
+ <a href="{{ url_localized('index.html') }}">Taler Operations AG</a> |
+ <a
+ href="https://www.gnu.org/licenses/fdl-1.3.html.en";
+ target="_blank"
+ rel="noopener noreferrer"
+ >{% trans %}License{% endtrans %}: GNU Free Documentation
License</a
+ >
+ </p>
+ <p>
+ {% trans %}We do not assume any liability for the correctness of
+ contents. We do not collect any data and do not use cookies. <br
/>Our
+ web server generates a log file with IP addresses of visitors.
+ However, these are evaluated exclusively for troubleshooting or
+ problem mitigation.{% endtrans %}
+ </p>
+ </div>
+ </div>
+ </div>
+</footer>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 1cbc038..9a3b5c3 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,52 +1,99 @@
<header class="header_sec newheader">
-<div id="skip"><a href="#maincontent" class="skip">{% trans %}Skip to main
content{% endtrans %}</a></div>
- <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/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">
- <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>
- <li><a href="{{ url_localized('terms.html')
}}">{% trans %}AGB für eNetzBon (interim!){% endtrans %}</a></li>
- </ul>
- <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/languageicon.svg') }}"
- height="35"
- alt="[{{lang}}]" />
- {{ lang_full }} [{{ lang }}]
+ <div id="skip">
+ <a href="#maincontent" class="skip"
+ >{% trans %}Skip to main content{% endtrans %}</a
+ >
+ </div>
+ <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/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>
- <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
- {% 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
+ class="collapse navbar-collapse justify-content-end"
+ id="navbarSupportedContent"
+ >
+ <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>
+ <li>
+ <a href="{{ url_localized('terms.html') }}"
+ >{% trans %}AGB für eNetzBon (interim!){% endtrans %}</a
+ >
+ </li>
+ </ul>
+ <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/languageicon.svg') }}"
+ height="35"
+ alt="[{{lang}}]"
+ />
+ {{ lang_full }} [{{ lang }}]
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+ {% 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>
- </nav>
- </div>
+ </div>
+ </nav>
+ </div>
</header>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-ops-www] branch master updated: format unformatted code,
gnunet <=