[GNUnet-SVN] [taler-blog] branch master updated: remove some wall of text, remove review quotes

[gnunet]

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

dold pushed a commit to branch master
in repository blog.

The following commit(s) were added to refs/heads/master by this push:
     new cceb36a  remove some wall of text, remove review quotes
cceb36a is described below

commit cceb36a7d1a1734229b5c3ea54aec448a2aa23ff
Author: Florian Dold <address@hidden>
AuthorDate: Fri Jan 19 03:26:24 2018 +0100

    remove some wall of text, remove review quotes
---
 talerblog/blog/templates/base.html  | 14 +++---
 talerblog/blog/templates/index.html | 89 ++++++++-----------------------------
 2 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/talerblog/blog/templates/base.html 
b/talerblog/blog/templates/base.html
index 233570e..523e86d 100644
--- a/talerblog/blog/templates/base.html
+++ b/talerblog/blog/templates/base.html
@@ -30,6 +30,12 @@
     <h1><span class="tt adorn-brackets">Taler Demo</span></h1>
     <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') 
}}">Shop</a></span></h1>
     <p>This is the Essay shop, you can buy articles using an imaginary 
currency (for now).</p>
+    <p>
+       The articles are chapters from Richard Stallman's book &quot;Free 
Software, Free Society&quot;,
+       which is also
+      <a 
href="http://shop.fsf.org/product/free-software-free-society-2/";>published by 
the FSF</a>
+      and available gratis at <a href="http://www.gnu.org/";>gnu.org</a>.
+    </p>
     <ul>
       <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a></li>
       <li><a href="{{ env('TALER_ENV_URL_BANK', '#') }}">Bank</a></li>
@@ -41,14 +47,6 @@
   </div>
 
   <section id="main" class="content">
-    <a href="{{ url_for('index') }}">
-      <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>
-      </div>
-    </a>
     {% block main %}
       This is the main content of the page.
     {% endblock %}
diff --git a/talerblog/blog/templates/index.html 
b/talerblog/blog/templates/index.html
index 54ee5c5..d439803 100644
--- a/talerblog/blog/templates/index.html
+++ b/talerblog/blog/templates/index.html
@@ -1,15 +1,6 @@
 {% extends "templates/base.html" %}
 {% block main %}
-      <h1>About</h1>
-      <p>This &quot;blog&quot; simulates how a website selling articles using
-         Taler should work.
-         We illustrate the use of Taler using articles from
-         Richard Stallman's book &quot;Free Software, Free Society&quot;,
-         which is also
-        <a 
href="http://shop.fsf.org/product/free-software-free-society-2/";>published by 
the FSF</a>
-        and available gratis at <a href="http://www.gnu.org/";>gnu.org</a>.
-      </p>
-
+    <h1>Essay Shop</h2>
     <h2 class="taler-installed-hide">Taler wallet required for payment</h2>
 
     <p class="taler-installed-hide">
@@ -17,70 +8,28 @@
     Please visit our <a href="/landing">landing page</a>
     to install a wallet (and to withdraw digital coins).
     </p>
-    <h2>Back-office interface</h2>
-    <p>
-    If you are a merchant and want to track your deposits, try the
-    <a href="/backoffice">back-office</a>!
-    </p>
 
     <h2>Free Software, Free Society</h2>
 
     <p>This is the second edition of <cite>Free Software, Free Society: 
Selected Essays of Richard M. Stallman.</cite><br>
-Free Software Foundation<br>
-51 Franklin Street, Fifth Floor<br>
-Boston, MA 02110-1335
-<br>
-Copyright &copy; 2002, 2010 Free Software Foundation, Inc.
-</p><blockquote><p>Verbatim copying and distribution of this entire book are 
permitted
-worldwide, without royalty, in any medium, provided this notice is
-preserved. Permission is granted to copy and distribute translations
-of this book from the original English into another language provided
-the translation has been approved by the Free Software Foundation and
-the copyright notice and this permission notice are preserved on all
-copies.
-</p></blockquote>
-<p>ISBN 978-0-9831592-0-9
-<br>
-<br>
-</p>
-<p>
-<em>Richard Stallman is the prophet of the free software movement.
-He understood the dangers of software patents years ago. Now that
-this has become a crucial issue in the world, buy this book and read
-what he said.</em><br> &mdash;<strong>Tim Berners-Lee,</strong> inventor of 
the World
-Wide Web
-<br>
-<br>
-<em>Richard Stallman is the philosopher king of software. He
-single-handedly ignited what has become a world-wide movement to
-create software that is Free, with a capital F. He has toiled for
-years at a project that many once considered a fool&rsquo;s errand, and now
-that is widely seen as &ldquo;inevitable.&rdquo;</em><br> 
&mdash;<strong>Simon&nbsp;L.
-Garfinkel,</strong> computer science author and columnist
-<br>
-<br>
-<em>By his hugely successful efforts to establish the idea of &ldquo;Free
-Software,&rdquo; Stallman has made a massive contribution to the human
-condition. His contribution combines elements that have technical,
-social, political, and economic consequences.</em><br> &mdash;<strong>Gerald 
Jay
-Sussman,</strong> Matsushita Professor of Electrical Engineering, MIT
-<br>
-<br>
-<em>RMS is the leading philosopher of software. You may dislike
-some of his attitudes, but you cannot avoid his ideas. This slim
-volume will make those ideas readily accessible to those who are
-confused by the buzzwords of rampant commercialism. This book needs
-to be widely circulated and widely read.</em><br> &mdash;<strong>Peter 
Salus,</strong>
-computer science writer, book reviewer, and UNIX historian
-<br>
-<br>
-<em>Richard is the leading force of the free software movement.
-This book is very important to spread the key concepts of free
-software world-wide, so everyone can understand it. Free software
-gives people freedom to use their creativity.</em><br> &mdash;<strong>Masayuki
-Ida,</strong> professor, Graduate School of International Management, Aoyama
-Gakuin University
-</p>
+    Free Software Foundation<br>
+    51 Franklin Street, Fifth Floor<br>
+    Boston, MA 02110-1335
+    <br>
+    Copyright &copy; 2002, 2010 Free Software Foundation, Inc.
+    </p>
+
+    <blockquote><p>Verbatim copying and distribution of this entire book are 
permitted
+    worldwide, without royalty, in any medium, provided this notice is
+    preserved. Permission is granted to copy and distribute translations
+    of this book from the original English into another language provided
+    the translation has been approved by the Free Software Foundation and
+    the copyright notice and this permission notice are preserved on all
+    copies.
+    </p>
+    </blockquote>
+    <p>ISBN 978-0-9831592-0-9</p>
+
     <h2>Chapters</h2>
     <!-- TODO: show this section ONLY if Taler wallet is present! -->
     <ul style="list-style-type:none">

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