gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-auditor] branch stable updated (fb961db -> 91e4a24)


From: gnunet
Subject: [GNUnet-SVN] [taler-auditor] branch stable updated (fb961db -> 91e4a24)
Date: Tue, 06 Jun 2017 14:50:22 +0200

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

dold pushed a change to branch stable
in repository auditor.

    from fb961db  makefile
     add 7befb5c  JS to add auditor
     add e74fc28  strip and decode auditor pub
     add 773a9ba  reference taler-wallet-lib script
     add ae6508f  eh, script not link
     add 91e4a24  submodules

No new revisions were added by this update.

Summary of changes:
 index.html.j2     | 13 +++++++++++++
 static/web-common |  2 +-
 template.py       |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/index.html.j2 b/index.html.j2
index 93a5f46..0dcdead 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -8,6 +8,7 @@
   <link rel="stylesheet" type="text/css" href="{{ 
url('static/web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" 
/>
   <link rel="icon" type="image/png" href="{{ 
url('static/web-common/favicon-taler.ico') }}" />
 
+
   <style type="text/css">
     a[disabled="true"] {
     pointer-events: none;
@@ -33,6 +34,18 @@
       padding: 0.5em;
     }
   </style>
+
+  <script src="{{ url('static/web-common/taler-wallet-lib.js') }}"></script>
+  <script>
+  function addAuditor() {
+    taler.addAuditor({
+      url: "{{ auditor_url }}",
+      currency: "{{ currency }}",
+      auditorPub: "{{ auditor_pub }}",
+      expirationStamp: (new Date(2027, 1)).getTime(),
+    });
+  }
+  </script>
 </head>
 
 <body>
diff --git a/static/web-common b/static/web-common
index 6dd8ca1..d7e0135 160000
--- a/static/web-common
+++ b/static/web-common
@@ -1 +1 @@
-Subproject commit 6dd8ca1675817cc0ca65f0819489234eeafaa2ed
+Subproject commit d7e013594d15388b1a7342a44a0e9c8d4ecca82d
diff --git a/template.py b/template.py
index c731c9c..bd67d3f 100755
--- a/template.py
+++ b/template.py
@@ -17,6 +17,7 @@ import glob
 import codecs
 import os
 import os.path
+import subprocess
 
 env = 
jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(__file__)),
         extensions=["jinja2.ext.i18n"],
@@ -33,6 +34,8 @@ 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["currency"] = os.environ.get("TALER_CONFIG_CURRENCY", "??")
+auditor_priv_file = 
os.path.expanduser("~/.local/share/taler/auditor/offline-keys/auditor.priv")
+default_ctx["auditor_pub"] = subprocess.check_output(["gnunet-ecc", "-p", 
auditor_priv_file]).decode("utf-8").strip()
 
 
 for in_file in glob.glob("*.j2"):

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]