[GNUnet-SVN] [taler-backoffice] branch master updated: Fix logo.

[gnunet]

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

marcello pushed a commit to branch master
in repository backoffice.

The following commit(s) were added to refs/heads/master by this push:
     new e4a4fbd  Fix logo.
e4a4fbd is described below

commit e4a4fbd8e67c5374d086d4d0c5c1567f6daea578
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Jul 30 16:05:50 2018 +0200

    Fix logo.
    
    Use latest logo; center it, and center text below it.
---
 setup.py                                             |  1 +
 talerbackoffice/backoffice/static/backoffice.css     | 14 ++++++++++++++
 talerbackoffice/backoffice/templates/backoffice.html |  4 ++--
 talerbackoffice/backoffice/templates/base.html       |  7 ++-----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index fc4a477..b898565 100755
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@ setup(name='talerbackoffice',
           '':[
               "backoffice/static/*.js",
               "backoffice/static/*.css",
+              "backoffice/static/*.svg",
               "backoffice/templates/*.html",
               "backoffice/static/web-common/*.png",
               "backoffice/static/web-common/*.css",
diff --git a/talerbackoffice/backoffice/static/backoffice.css 
b/talerbackoffice/backoffice/static/backoffice.css
index 3ec6ef0..50819d4 100644
--- a/talerbackoffice/backoffice/static/backoffice.css
+++ b/talerbackoffice/backoffice/static/backoffice.css
@@ -1,3 +1,17 @@
+.logo-text {
+  text-align: center;
+  margin-top: 0pt;
+}
+
+.logo {
+  width: 30%;
+  height: 30%;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 20pt;
+}
+
 #instance {
   border: 1px solid #ccc;
   background: transparent;
diff --git a/talerbackoffice/backoffice/templates/backoffice.html 
b/talerbackoffice/backoffice/templates/backoffice.html
index 3e1ef91..b95f501 100644
--- a/talerbackoffice/backoffice/templates/backoffice.html
+++ b/talerbackoffice/backoffice/templates/backoffice.html
@@ -1,7 +1,7 @@
 {% extends "templates/base.html" %}
 {% block main %}
-  <h1>Backoffice</h1>
-  <p>This page simulates a backoffice facility.  Through it,
+  <h1 class="logo-text">Taler backoffice</h1>
+  <p>This is the Taler backoffice facility.  Through it,
   the user can see the money flow from Taler transactions to
   wire transfers and viceversa.</p>
 
diff --git a/talerbackoffice/backoffice/templates/base.html 
b/talerbackoffice/backoffice/templates/base.html
index 362cae2..4e8109c 100644
--- a/talerbackoffice/backoffice/templates/base.html
+++ b/talerbackoffice/backoffice/templates/base.html
@@ -31,7 +31,7 @@
   <div class="demobar">
     <h1><span class="tt adorn-brackets">Taler Demo</span></h1>
     <h1><span class="it"><a href="/">Backoffice</a></span></h1>
-    <p>This is the Essay shop, you can buy articles using an imaginary 
currency (for now).</p>
+    <p>This is the back-office interface, you can monitor your cash flow with 
it.</p>
     <ul>
       <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a></li>
       <li><a href="{{ env('TALER_ENV_URL_BANK', '#') }}">Bank</a></li>
@@ -46,10 +46,7 @@
   <section id="main" class="content">
     <a href="{{ url("/") }}">
       <div id="logo">
-        <svg height="100" width="100">
-          <circle cx="50" cy="50" r="40" stroke="darkcyan" stroke-width="6" 
fill="white" />
-          <text x="19" y="82" font-family="Verdana" font-size="90" 
fill="darkcyan">S</text>
-        </svg>
+        <img class="logo" src="{{ url('/static/logo-2018-dold.svg') }}"></img>
       </div>
     </a>
     {% block main %}

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