gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant-frontends] branch master updated: new nav s

From: gnunet
Subject: [GNUnet-SVN] [taler-merchant-frontends] branch master updated: new nav sidebar for blog
Date: Wed, 15 Mar 2017 13:49:58 +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 2168f53  new nav sidebar for blog
2168f53 is described below

commit 2168f535c8157d16b07c6c8d39c21eace9269dca
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 15 13:48:52 2017 +0100

    new nav sidebar for blog
---
 talerfrontends/blog/blog.py                |  4 +++-
 talerfrontends/blog/static/web-common      |  2 +-
 talerfrontends/blog/templates/base.html    | 35 ++++++++++++++++++++----------
 talerfrontends/donations/donations.py      |  4 +++-
 talerfrontends/donations/static/web-common |  2 +-
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index 8010f2f..af88d12 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -59,7 +59,9 @@ app.config.from_object(__name__)
 def utility_processor():
     def url(my_url):
         return join_urlparts(flask.request.script_root, my_url)
-    return dict(url=url)
+    def env(name, default=None):
+        return os.environ.get(name, default)
+    return dict(url=url, env=env)
 
 
 @app.route("/")
diff --git a/talerfrontends/blog/static/web-common 
b/talerfrontends/blog/static/web-common
index 0be9ac9..6dd8ca1 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit 6dd8ca1675817cc0ca65f0819489234eeafaa2ed
diff --git a/talerfrontends/blog/templates/base.html 
b/talerfrontends/blog/templates/base.html
index bf4d73e..7c04633 100644
--- a/talerfrontends/blog/templates/base.html
+++ b/talerfrontends/blog/templates/base.html
@@ -17,8 +17,8 @@
 <html data-taler-nojs="true" {{ data_attribute }}>
 <head>
   <title>Richard M. Stallman: Free Software, Free Society</title>
-  <link rel="stylesheet" type="text/css" href="{{ 
url("/static/web-common/style.css") }}">
-  <link rel="stylesheet" type="text/css" href="{{ 
url("/static/web-common/lang.css") }}">
+  <link rel="stylesheet" type="text/css" href="{{ 
url('/static/web-common/pure.css') }}" />
+  <link rel="stylesheet" type="text/css" href="{{ 
url('/static/web-common/demo.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ 
url("/static/web-common/taler-fallback.css") }}" id="taler-presence-stylesheet">
   <script src="{{ url("/static/web-common/taler-wallet-lib.js") }}" 
type="application/javascript"></script>
   <script src="{{ url("/static/web-common/lang.js") }}" 
type="application/javascript"></script>
@@ -29,26 +29,37 @@
 
 <body>
   {% block body_prelude %}{% endblock %}
+  <div class="demobar">
+    <h1><span class="tt adorn-brackets">Taler Demo</span></h1>
+    <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>
+    </ul>
+    <p>You can learn more about Taler on our main <a 
href="https://taler.net";>website</a>.</p>
+  </div>
+
   <header>
+  </header>
+
+  <section id="main" class="content">
     <div id="logo">
       <a href="{{ url("/") }}">
         <img src="{{ url("/static/gnu.svg") }}" height=100 width=100 alt="GNU 
logo">
       </a>
     </div>
     <h1 class="nav">Richard M. Stallman: Free Software, Free Society</h1>
-  </header>
-
-  <aside class="sidebar" id="left">
-  </aside>
-
-  <section id="main">
     {% block main %}
     <em>(main content goes here)</em>
     {% endblock main %}
+    <hr />
+    <div class="copyright">
+      <p>Copyright &copy; 2014&mdash;2016 INRIA</p>
+      <a href="/javascript" data-jslicense="1" 
class="jslicenseinfo">JavaScript license information</a>
+    </div>
   </section>
-  <div class="copyright">
-    <p>Copyright &copy; 2014&mdash;2016 INRIA</p>
-    <a href="/javascript" data-jslicense="1" class="jslicenseinfo">JavaScript 
license information</a>
-  </div>
 </body>
 </html>
diff --git a/talerfrontends/donations/donations.py 
b/talerfrontends/donations/donations.py
index 2287e94..b20bc2b 100644
--- a/talerfrontends/donations/donations.py
+++ b/talerfrontends/donations/donations.py
@@ -52,7 +52,9 @@ print(app.config)
 def utility_processor():
     def url(my_url):
         return join_urlparts(flask.request.script_root, my_url)
-    return dict(url=url)
+    def env(name, default=None):
+        return os.environ.get(name, default)
+    return dict(url=url, env=env)
 
 
 @app.route("/")
diff --git a/talerfrontends/donations/static/web-common 
b/talerfrontends/donations/static/web-common
index 0be9ac9..6dd8ca1 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit 6dd8ca1675817cc0ca65f0819489234eeafaa2ed

-- 
To stop receiving notification emails like this one, please contact
address@hidden
reply via email to
[Prev in Thread] Current Thread [Next in Thread]