diff options
author | ng0 <ng0@taler.net> | 2019-12-11 11:24:23 +0000 |
---|---|---|
committer | ng0 <ng0@taler.net> | 2019-12-11 11:24:23 +0000 |
commit | 46e8c6f747ea5d9163be6c36f319fa8532877dd4 (patch) | |
tree | 641f12dfc0543fbd80cc4d9fcc1240d4ba068e4f | |
parent | fcb8a94a1b82f84f5453df0e4ab740bff5f3b610 (diff) | |
parent | 704b735b91fbd78fe67a5f922aff4c20c6888ab0 (diff) | |
download | www-46e8c6f747ea5d9163be6c36f319fa8532877dd4.tar.gz www-46e8c6f747ea5d9163be6c36f319fa8532877dd4.tar.bz2 www-46e8c6f747ea5d9163be6c36f319fa8532877dd4.zip |
Merge branch 'master' of git.taler.net:www
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | common/navigation.j2.inc | 8 | ||||
-rwxr-xr-x | configure | 53 | ||||
-rw-r--r-- | template/wallet-android-privacy-policy.html.j2 | 25 |
4 files changed, 31 insertions, 57 deletions
@@ -1,3 +1,5 @@ +/configure + ./*.html common/*.inc diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index 63d8ac47..b9846031 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -1,8 +1,8 @@ {% macro navlink(site, text) -%} - <a class="nav-link {{ 'active' if filename == site else '' }}" - href="{{ url_localized(site) }}"> - {{ text }} - </a> + <a class="nav-link {{ 'active' if filename == site else '' }}" + href="{{ site }}"> + {{ text }} + </a> {%- endmacro %} <nav class="navbar navbar-expand-lg navbar-light"> diff --git a/configure b/configure deleted file mode 100755 index 7749566c..00000000 --- a/configure +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# This file is part of TALER -# (C) 2019 GNUnet e.V. -# -# This is very simple POSIX sh script which -# identifies the first matching -# python3 identifier in $PATH and produces -# configure.py from configure.py.in, and then -# calls the new executable configure.py. -# -# It should be portable on Unices. Report bugs on -# the bugtracker if you discover that it isn't -# working as intended. -# -# Authors: -# Author: ng0 <ng0@taler.net> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE -# LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES -# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF -# THIS SOFTWARE. -# -# SPDX-License-Identifier: 0BSD - -# we invoke configure not as a symlink but as a copy, -# so we have to use a fixed location for the repository! -dir=$(dirname "$(readlink -- "$0")")/build-system/taler-build-scripts -. $dir/sh/lib.sh/existence.sh -. $dir/sh/lib.sh/existence_python.sh - -scriptpath=build-system/taler-build-scripts - -if ! test -d "$scriptpath"; then - echo "fatal error: taler-build-scripts not found at $scriptpath" >&2 - exit 1 -fi - -export PYTHONPATH="$scriptpath:${PYTHONPATH:-}" - -# Call configure.py, assuming all went well. -# $1 is read by configure.py as the prefix. -# If $1 is empty, the python script checks the -# environment for PREFIX. We might need more -# variables and switches, such as DESTDIR. -exec "$PYTHON" ./configure.py $@ diff --git a/template/wallet-android-privacy-policy.html.j2 b/template/wallet-android-privacy-policy.html.j2 new file mode 100644 index 00000000..87f74c33 --- /dev/null +++ b/template/wallet-android-privacy-policy.html.j2 @@ -0,0 +1,25 @@ +{% extends "common/base.j2" %} +{% block body_content %} + +<div class="container"> + +<h1>GNU Taler Android Wallet Privacy Policy</h1> + +<p>The GNU Taler Android Wallet allows its users to interact with third-party +service providers (such as exchanges, banks and merchants) through the GNU +Taler protocol. When using the GNU Taler Android Wallet to interact with such +service providers, these interactions are subject to the Privacy Policy of the +respective service provider.</p> + + +<p>The GNU Taler Android Wallet does not automatically collect and send data to +the developers of the app or any third party.</p> + +<h2>Why are camera permissions required?</h2> + +<p>The camera permissions are required to scan QR codes. The images taken are +processed locally on your devices and never sent to a third party.</p> + +</div> + +{% endblock body_content %} |