[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: fix URLs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: fix URLs and fallback page |
|
Date: |
Wed, 15 Mar 2017 13:54:12 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant-frontends.
The following commit(s) were added to refs/heads/master by this push:
new b2feb78 fix URLs and fallback page
b2feb78 is described below
commit b2feb78abce2e8a1c51b97308f0d73f8fb667002
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 15 13:54:10 2017 +0100
fix URLs and fallback page
---
talerfrontends/blog/templates/base.html | 8 ++--
talerfrontends/donations/templates/fallback.html | 47 +++++++++++-------------
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/talerfrontends/blog/templates/base.html
b/talerfrontends/blog/templates/base.html
index 7c04633..59b75c0 100644
--- a/talerfrontends/blog/templates/base.html
+++ b/talerfrontends/blog/templates/base.html
@@ -34,10 +34,10 @@
<h1><span class="it"><a href="#">Introduction</a></span></h1>
<p>This is the entry point of the Taler demo. Follow the instructions and
try Taler with the other pages linked below!</p>
<ul>
- <li><a href="{{ intro_url }}">Introduction</a></li>
- <li><a href="{{ bank_url }}">Bank</a></li>
- <li><a href="{{ merchant_blog_url }}">Blog Shop</a></li>
- <li><a href="{{ merchant_donations_url }}">Donations</a></li>
+ <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a></li>
+ <li><a href="{{ env('TALER_ENV_URL_BANK', '#') }}">Bank</a></li>
+ <li><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">Blog
Shop</a></li>
+ <li><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#')
}}">Donations</a></li>
</ul>
<p>You can learn more about Taler on our main <a
href="https://taler.net";>website</a>.</p>
</div>
diff --git a/talerfrontends/donations/templates/fallback.html
b/talerfrontends/donations/templates/fallback.html
index ecf22ae..f5e981e 100644
--- a/talerfrontends/donations/templates/fallback.html
+++ b/talerfrontends/donations/templates/fallback.html
@@ -1,25 +1,22 @@
-<!doctype html>
-<html>
- <body>
- <div id="ccfakeform" class="fade">
- <p>
- Oops, it looks like you don't have a Taler wallet installed. Why don't
you enter
- all your credit card details before reading the article? <em>You can also
- use GNU Taler to complete the purchase at any time.</em>
- </p>
-
- <form>
- First name<br> <input type="text"></input><br>
- Family name<br> <input type="text"></input><br>
- Age<br> <input type="text"></input><br>
- Nationality<br> <input type="text"></input><br>
- Gender<br> <input type="radio" name"gender">Male</input>
- CC number<br> <input type="text"></input><br>
- <input type="radio" name="gender">Female</input><br>
- </form>
- <form method="get" action="/cc-payment/{{ article_name }}">
- <input type="submit"></input>
- </form>
- </div>
- </body>
-</html>
+{% extends "templates/base.html" %}
+{% block main %}
+<div id="ccfakeform" class="fade">
+ <p>
+ Oops, it looks like you don't have a Taler wallet installed. Why don't you
enter
+ all your credit card details before reading the article? <em>You can also
+ use GNU Taler to complete the purchase at any time.</em>
+ </p>
+
+ <form>
+ First name<br> <input type="text"></input><br>
+ Family name<br> <input type="text"></input><br>
+ Age<br> <input type="text"></input><br>
+ Nationality<br> <input type="text"></input><br>
+ Gender<br> <input type="radio" name"gender">Male</input>
+ CC number<br> <input type="text"></input><br>
+ <input type="radio" name="gender">Female</input><br>
+ </form>
+ <form method="get" action="/cc-payment/{{ article_name }}">
+ <input type="submit"></input>
+ </form>
+</div>
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant-frontends] branch master updated: fix URLs and fallback page,
gnunet <=