[GNUnet-SVN] [taler-bank] branch master updated: take URLs from env

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 304b245  take URLs from env
304b245 is described below

commit 304b245667faa3aa595307e72dd33fa1570a1496
Author: Florian Dold <address@hidden>
AuthorDate: Tue Mar 14 17:13:55 2017 +0100

    take URLs from env
---
 talerbank/app/templates/base.html | 6 +++---
 talerbank/jinja2.py               | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/talerbank/app/templates/base.html 
b/talerbank/app/templates/base.html
index 1c9b3e2..2c7a6b6 100644
--- a/talerbank/app/templates/base.html
+++ b/talerbank/app/templates/base.html
@@ -35,9 +35,9 @@
       using your own bank account, you can also see the transaction history of 
some <a href="{{ url('public-accounts') }}">Public Accounts</a>.</p>
       <p>Other parts of the demo:</p>
       <ul>
-        <li><a href="landing">Introduction</a></li>
-        <li><a href="shop">Blog Shop</a></li>
-        <li><a href="donations">Donations</a></li>
+        <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') 
}}">Introduction</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/talerbank/jinja2.py b/talerbank/jinja2.py
index bc66a77..abfe45e 100644
--- a/talerbank/jinja2.py
+++ b/talerbank/jinja2.py
@@ -20,6 +20,7 @@ from django.conf import settings
 from django.core.urlresolvers import get_script_prefix
 from urllib.parse import urlparse
 from jinja2 import Environment
+import os
 
 
 def is_absolute(url):
@@ -49,6 +50,7 @@ def static(url):
 def settings_value(name):
     return getattr(settings, name, "")
 
+
 def url(*args, **kwargs):
     # strangely, Django's 'reverse' function
     # takes a named parameter 'kwargs' instead
@@ -56,12 +58,17 @@ def url(*args, **kwargs):
     return reverse(*args, kwargs=kwargs)
 
 
+def env(name, default=None):
+    return os.environ.get(name, default)
+
+
 def environment(**options):
     env = Environment(**options)
     env.globals.update({
         'static': static,
         'url': url,
         'settings_value': settings_value,
+        'env': env,
     })
     return env
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden