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 style


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant-frontends] branch master updated: new style for donations merchant frontent
Date: Wed, 15 Mar 2017 14:00:16 +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 4fcd2df  new style for donations merchant frontent
4fcd2df is described below

commit 4fcd2df227c8b44de621d94800e26a39e32b12ca
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 15 14:00:14 2017 +0100

    new style for donations merchant frontent
---
 talerfrontends/blog/templates/base.html      |  7 ++---
 talerfrontends/donations/templates/base.html | 38 +++++++++++++++++-----------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/talerfrontends/blog/templates/base.html 
b/talerfrontends/blog/templates/base.html
index 59b75c0..a1c757e 100644
--- a/talerfrontends/blog/templates/base.html
+++ b/talerfrontends/blog/templates/base.html
@@ -31,20 +31,17 @@
   {% 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>
+    <h1><span class="it"><a href="#">Essay Shop</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="{{ 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_BLOG', '#') }}">Essay 
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>
 
-  <header>
-  </header>
-
   <section id="main" class="content">
     <div id="logo">
       <a href="{{ url("/") }}">
diff --git a/talerfrontends/donations/templates/base.html 
b/talerfrontends/donations/templates/base.html
index 8599705..626d7b6 100644
--- a/talerfrontends/donations/templates/base.html
+++ b/talerfrontends/donations/templates/base.html
@@ -18,16 +18,29 @@
 <html>
 <head>
   <title>Taler Donation Demo</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') }}" />
   <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>
   {% block styles %}{% endblock %}
   {% block scripts %}{% endblock %}
 </head>
 
-<body class="en" onLoad="loadLang()">
-  <header>
+<body>
+  <div class="demobar">
+    <h1><span class="tt adorn-brackets">Taler Demo</span></h1>
+    <h1><span class="it"><a href="#">Donations</a></span></h1>
+    <p>This is the donation page, you can make donations (with an imaginary 
currency for now) to free software projects.</p>
+    <ul>
+      <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', '#') }}">Essay 
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>
+
+  <section id="main" class="content">
     <a href="{{ url("/") }}">
       <div id="logo">
         <svg height="100" width="100">
@@ -36,20 +49,15 @@
         </svg>
       </div>
     </a>
-    <h1 class="nav">Toy &quot;Store&quot; - Taler Demo</h1>
-  </header>
-
-  <aside class="sidebar" id="left">
-  </aside>
-
-  <section id="main">
+    <h1 class="nav">Donations Store</h1>
     {% block main %}
       This is the main content of the page.
     {% endblock %}
+    <hr />
+    <div class="copyright">
+      <p>Copyright &copy; 2014&mdash;2017 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>

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



reply via email to

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