[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-landing] branch stable updated (16bf7a8 -> c27d883)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-landing] branch stable updated (16bf7a8 -> c27d883) |
|
Date: |
Fri, 29 Mar 2019 18:45:24 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a change to branch stable
in repository landing.
from 16bf7a8 missing <ul>
add 26ac014 Restore back-office links.
add 2b91683 fix #5537
add e1d3ce6 Gitignore & submodules updating.
add c27d883 JavaScript disclaimer.
No new revisions were added by this update.
Summary of changes:
.gitignore | 26 +++++++++++++++---------
.gitmodules | 3 ++-
demo/index.html.j2 | 12 ++++++++++-
demo/javascript.html | 55 ++++++++++++++++++++++++++------------------------
demo/static/web-common | 2 +-
demo/template.py | 1 +
6 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/.gitignore b/.gitignore
index e9e122c..99a596a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,17 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache/
-/configure
-/config.log
-/config.status
-/install-sh
-/missing
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+configure
+config.log
+config.status
+install-sh
+missing
+demo/Makefile
+demo/Makefile.in
+demo/de/
+demo/en/
+demo/es/
+demo/it/
+demo/static/Makefile
+demo/static/Makefile.in
diff --git a/.gitmodules b/.gitmodules
index 128b263..b20bc28 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,5 @@
[submodule "web-common"]
path = demo/static/web-common
- url = git://taler.net/web-common.git
+ url = git://git.taler.net/web-common
branch = master
+ ignore = dirty
diff --git a/demo/index.html.j2 b/demo/index.html.j2
index ccfa71d..2e1da37 100644
--- a/demo/index.html.j2
+++ b/demo/index.html.j2
@@ -46,6 +46,7 @@
<li><a href="{{ merchant_blog_url }}">Essay Shop</a></li>
<li><a href="{{ merchant_donations_url }}">Donations</a></li>
<li><a href="{{ merchant_survey_url }}">Tipping/Survey</a></li>
+ <li><a href="{{ backoffice_url }}">Back-office</a></li>
</ul>
<p>You can learn more about Taler on our main <a
href="https://taler.net";>website</a>.</p>
</div>
@@ -108,7 +109,16 @@
</ul>
</article>
<article>
- <h2>Step 5: Reach out to us</sup></h2>
+ <h2>Step 5: Merchant? Consult back-office</sup></h2>
+ <ul>
+ <li>
+ If you are a merchant, you can check the <a href="{{
backoffice_url }}">back-office</a>
+ Web-site to see how your Taler transactions got payed back by bank
wire transfers.
+ </li>
+ </ul>
+ </article>
+ <article>
+ <h2>Step 6: Reach out to us</sup></h2>
Let us know what you think by <a href="mailto:address@hidden";>contacting
us</a>.
</article>
<hr />
diff --git a/demo/javascript.html b/demo/javascript.html
index 71c814f..436c186 100644
--- a/demo/javascript.html
+++ b/demo/javascript.html
@@ -1,28 +1,31 @@
-<!DOCTYPE html>
<!-- This file is in the public domain -->
-<html lang="en">
-<head profile="http://www.w3.org/2005/10/profile";>
- <title>JavaScript License Information</title>
-</head>
-<body>
-<table id="jslicense-labels1">
- <thead>
- <tr>
- <th>Script</th>
- <th>License</th>
- <th>Source</th>
- </tr>
- </thead>
-<tr>
- <td><a
href="/static/web-common/taler-wallet-lib.js">taler-wallet-lib.js</a></td>
- <td><a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL</a></td>
- <td><a
href="/static/web-common/taler-wallet-lib.js.tar.gz">taler-wallet-lib.js.tar.gz</a></td>
-</tr>
-<tr>
- <td><a
href="/static/web-common/dropdown-navbar_script.js">dropdown-navbar_script.js</a></td>
- <td><a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL</a></td>
- <td><a
href="/static/web-common/dropdown-navbar_script.js">dropdown-navbar_script.js</a></td>
-</tr>
-</table>
-</body>
+
+<html>
+ <head>
+ <title>JavaScript disclaimer.</title>
+ </head>
+ <body>
+ <h3>This site does not use JavaScript.</h3>
+ </body>
</html>
+
+<!-- The following lines are kept as a template for future inclusion of
JavaScript files. -->
+
+<!--
+ <html>
+ <body>
+ <table id="jslicense-labels1">
+ <tr>
+ <td><a href="/static/path/to/example0.js">example0.js</a></td>
+ <td><a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL</a></td>
+ <td><a
href="/static/path/to/example0.js.tar.gz">example0.js.tar.gz</a></td>
+ </tr>
+ <tr>
+ <td><a href="/static/path/to/example1.js">example1.js</a></td>
+ <td><a href="https://www.gnu.org/licenses/lgpl-2.1.html";>LGPL</a></td>
+ <td><a
href="/static/path/to/example1.js.tar.gz">example1.js.tar.gz</a></td>
+ </tr>
+ </table>
+ </body>
+ </html>
+-->
diff --git a/demo/static/web-common b/demo/static/web-common
index 6dd8ca1..e9554ba 160000
--- a/demo/static/web-common
+++ b/demo/static/web-common
@@ -1 +1 @@
-Subproject commit 6dd8ca1675817cc0ca65f0819489234eeafaa2ed
+Subproject commit e9554baf0f3f880d656284ef5e9089bbd8313464
diff --git a/demo/template.py b/demo/template.py
index b863503..05599e4 100755
--- a/demo/template.py
+++ b/demo/template.py
@@ -33,6 +33,7 @@ default_ctx["merchant_survey_url"] =
os.environ.get("TALER_ENV_URL_MERCHANT_SURV
default_ctx["intro_url"] = os.environ.get("TALER_ENV_URL_INTRO", "#")
default_ctx["bank_url"] = os.environ.get("TALER_ENV_URL_BANK", "#")
default_ctx["auditor_url"] = os.environ.get("TALER_ENV_URL_AUDITOR", "#")
+default_ctx["backoffice_url"] = os.environ.get("TALER_ENV_URL_BACKOFFICE", "#")
for in_file in glob.glob("*.j2"):
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-landing] branch stable updated (16bf7a8 -> c27d883),
gnunet <=