[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-www] 05/10: clean up main page
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-www] 05/10: clean up main page |
Date: |
Mon, 06 Mar 2017 04:13:15 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository www.
commit a28f7615c32a9bde7cc70fd00290a8f68917f916
Author: Florian Dold <address@hidden>
AuthorDate: Mon Mar 6 01:55:30 2017 +0100
clean up main page
---
common/navigation.j2.inc | 5 -----
index.html.j2 | 29 ++++++++---------------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 93677cd..d4c63c8 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -31,12 +31,7 @@
<div class="collapse navbar-collapse" id="main-navbar">
<ul class="nav nav-justified">
<li class="m_index"><a href="{{ url_localized('index.html') }}">{{
_("Home") }}</a></li>
- <li class="m_demo"><a href="https://demo.taler.net/"
target="_blank">{{ _("Demo") }}</a></li>
- <li class="m_citizens"><a href="{{ url_localized('citizens.html')
}}">{{ _("Citizens") }}</a></li>
- <li class="m_merchants"><a href="{{
url_localized('merchants.html') }}">{{ _("Merchants") }}</a></li>
- <li class="m_governments"><a href="{{
url_localized('governments.html') }}">{{ _("Governments") }}</a></li>
<li class="m_investors"><a href="{{
url_localized('investors.html') }}">{{ _("Investors") }}</a></li>
- <li class="m_developers"><a href="{{
url_localized('developers.html') }}">{{ _("Developers") }}</a></li>
<li class="m_about"><a href="{{ url_localized('about.html') }}">{{
_("About us") }}</a></li>
<li>
<div class="dropdown nav-lang">
diff --git a/index.html.j2 b/index.html.j2
index 3bf882c..3d7445a 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -113,31 +113,18 @@
</div>
</div>
<div class="container">
- <h2>How it works</h2>
- </div>
-
- <div class="container">
- <div class="row">
-
- <div class="col-lg-4">
- <h2>{{ _("Latest Videos") }}</h2>
- <p>{{ _("Florian Dold talks about Taler at 50p!") }}</p>
- <video id="video" poster="/videos/dold50p.png" autobuffer=""
height="180" width="320" controls="controls">
- <source src="/videos/dold50p.webm" type="video/webm">
- <source src="/videos/dold50p.ogv" type="video/ogv">
- </video>
- <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img
alt="Creative Commons License" style="border-width:0"
src="/images/ccby.png"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/"
property="dct:title">GNU Taler</span>" by <span
xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Florian
Dold, produced by 50p</span> is licensed under a <a rel="license"
href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative [...]
- </div>
- </div>
<div class="row">
<div class="col-lg-6">
- <h2>{{ _("Taler News") }}</h2>
- {% include "news.html.j2.inc" %}
+ <h2>Paying with Taler</h2>
+ In order to pay with Taler, users install a wallet browser extension
+ or app on their device. Before a payment is possible, the wallet's
balance must
+ be charged by some other means of payment for the desired currency.
</div>
<div class="col-lg-6">
- <h2>{{ _("Financial News") }}</h2>
- {% include "financial-news.html.j2.inc" %}
- </div>
+ <h2>Receiving payments with Taler</h2>
+ TODO
+ </div>
</div>
+ <h2>Learn more</h2>
</div> <!-- /container -->
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-www] branch master updated (9d4d87c -> 61ac0e3), gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 10/10: faq, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 07/10: missing files, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 01/10: make dirs if they don't exist, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 03/10: shorter taxable point, privacy friendly, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 08/10: remove empty section, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 05/10: clean up main page,
gnunet <=
- [GNUnet-SVN] [taler-www] 04/10: advantages instead of acronym expansion, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 09/10: footer, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 02/10: factor out base template, gnunet, 2017/03/05
- [GNUnet-SVN] [taler-www] 06/10: conversion/text, gnunet, 2017/03/05