summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-06 01:55:30 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-06 01:55:30 +0100
commita28f7615c32a9bde7cc70fd00290a8f68917f916 (patch)
tree929b4e063e24bc98a6f230e9cfca3681dad7f7c3
parenta545f9be30831d9a3c7bd4c232fa1b9f7e870a14 (diff)
downloadwww-a28f7615c32a9bde7cc70fd00290a8f68917f916.tar.gz
www-a28f7615c32a9bde7cc70fd00290a8f68917f916.tar.bz2
www-a28f7615c32a9bde7cc70fd00290a8f68917f916.zip
clean up main page
-rw-r--r--common/navigation.j2.inc5
-rw-r--r--index.html.j229
2 files changed, 8 insertions, 26 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 93677cdc..d4c63c8f 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&nbsp;us") }}</a></li>
<li>
<div class="dropdown nav-lang">
diff --git a/index.html.j2 b/index.html.j2
index 3bf882c4..3d7445a1 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 Commons Attribution NoDerivatives 3.0 Unported License</a>.
- </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 %}