aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-06 15:38:47 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-06 15:38:47 +0100
commit26da65e92d23af9c0b76e440ed34ba222a386f0b (patch)
treeef5d90511da039e70d113c9ab4605f6b6f8ba996
parentd795d82ec18a8e90b6c8ba559ea7c55a672d391d (diff)
downloadwww-26da65e92d23af9c0b76e440ed34ba222a386f0b.tar.gz
www-26da65e92d23af9c0b76e440ed34ba222a386f0b.zip
boxes / minor fixes
-rw-r--r--common/navigation.j2.inc2
-rw-r--r--developers.html.j29
-rw-r--r--financial-news/2016-10-26.inc2
-rw-r--r--index.html.j214
4 files changed, 18 insertions, 9 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 762eab69..9f9845e1 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -17,7 +17,7 @@
17 <ul class="nav navbar-right navbar-form"> 17 <ul class="nav navbar-right navbar-form">
18 <li> 18 <li>
19 <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 19 <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
20 <img src="{{ url('images/'+lang+'.png') }}"/></img> 20 <img src="{{ url('images/'+lang+'.png') }}" />
21 <span class="caret"></span> 21 <span class="caret"></span>
22 </button> 22 </button>
23 <ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> 23 <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
diff --git a/developers.html.j2 b/developers.html.j2
index 39de21d2..5ff91017 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -45,6 +45,10 @@
45 45
46 </div> 46 </div>
47 </div> 47 </div>
48</div>
49
50<div class="contianer-fluid c_acronym">
51<div class="container">
48 <div class="row"> 52 <div class="row">
49 <div class="col-lg-4"> 53 <div class="col-lg-4">
50 <h2>{{ _("Code") }}</h2> 54 <h2>{{ _("Code") }}</h2>
@@ -79,7 +83,6 @@
79 <a href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.") }}</p> 83 <a href='http://lists.gnu.org/mailman/listinfo/taler'>http://lists.gnu.org/mailman/listinfo/taler</a>.") }}</p>
80 </div> 84 </div>
81 </div> 85 </div>
82
83 <div class="row"> 86 <div class="row">
84 <div class="col-lg-4"> 87 <div class="col-lg-4">
85 <h2>{{ _("Regression Testing") }}</h2> 88 <h2>{{ _("Regression Testing") }}</h2>
@@ -112,6 +115,10 @@
112 ") }}</p> 115 ") }}</p>
113 </div> 116 </div>
114 </div> 117 </div>
118</div>
119</div>
120
121<div class="container">
115 122
116 <div class="col-lg-12"> 123 <div class="col-lg-12">
117 <h2 id="overview">{{ _("Taler system overview") }}</h2> 124 <h2 id="overview">{{ _("Taler system overview") }}</h2>
diff --git a/financial-news/2016-10-26.inc b/financial-news/2016-10-26.inc
index 146aab1f..7cfb01bd 100644
--- a/financial-news/2016-10-26.inc
+++ b/financial-news/2016-10-26.inc
@@ -7,4 +7,4 @@
7 by establishing a commons that protects critical infrastructure 7 by establishing a commons that protects critical infrastructure
8 from domination by a handful of global players. 8 from domination by a handful of global players.
9 </p> 9 </p>
10 <p><a class="btn btn-info" href="http://www.nfcworld.com/2016/10/24/347979/alipay-gains-acceptance-us-europe/?utm_content=buffer16d78&utm_medium=social&utm_source=twitter.com&utm_campaign=buffer" role="button">Source</a></p> 10 <p><a class="btn btn-info" href="http://www.nfcworld.com/2016/10/24/347979/alipay-gains-acceptance-us-europe/" role="button">Source</a></p>
diff --git a/index.html.j2 b/index.html.j2
index 14efe856..e4ec7cfb 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -3,7 +3,7 @@
3<!-- Jumbotron --> 3<!-- Jumbotron -->
4<div class="jumbotron"> 4<div class="jumbotron">
5 <div style="height: 40vh"> 5 <div style="height: 40vh">
6 <img alt="Taler logo" style="object-fit:contain;width:100%;height:100%" class="center-block" src="{{ url('taler-big-accent.svg') }}"></img> 6 <img alt="Taler logo" style="object-fit:contain;width:100%;height:100%" class="center-block" src="{{ url('taler-big-accent.svg') }}" />
7 </div> 7 </div>
8 8
9 <div class="container text-center"> 9 <div class="container text-center">
@@ -13,16 +13,15 @@
13 Taler is an electronic payment system under 13 Taler is an electronic payment system under
14 development 14 development
15 at <a href="http://www.inria.fr/">Inria</a>. We expect to make it operational in 2017. 15 at <a href="http://www.inria.fr/">Inria</a>. We expect to make it operational in 2017.
16 Meanwhile you can learn about Taler on this website, try the <a href="https://demo.taler.net\">demo</a> 16 Meanwhile you can learn about Taler on this website, try the <a href="https://demo.taler.net">demo</a>
17 and look at our <a href="https://docs.taler.net\">developer</a> and <a href="https://api.taler.net">API</a> documentation. 17 and look at our <a href="https://docs.taler.net">developer</a> and <a href="https://api.taler.net">API</a> documentation.
18 {% endtrans %} 18 {% endtrans %}
19 </p> 19 </p>
20 </div> 20 </div>
21 21
22</div> 22</div>
23 23
24<div class="contianer-fluid c_acronym adorn_h3_bracket"> 24<div class="container adorn_h3_bracket">
25<div class="container">
26 25
27 <h2>Design goals of Taler</h2> 26 <h2>Design goals of Taler</h2>
28 27
@@ -111,8 +110,8 @@
111 </div> 110 </div>
112 </div> 111 </div>
113</div> 112</div>
114</div>
115 113
114<div class="contianer-fluid c_acronym">
116<div class="container"> 115<div class="container">
117 <div class="row"> 116 <div class="row">
118 <div class="col-lg-6"> 117 <div class="col-lg-6">
@@ -134,6 +133,9 @@
134 payments is a matter of minutes.</p> 133 payments is a matter of minutes.</p>
135 </div> 134 </div>
136 </div> 135 </div>
136</div>
137</div>
138<div class="container">
137 <div class="row"> 139 <div class="row">
138 <div class="col-lg-6"> 140 <div class="col-lg-6">
139 <h2>{{ _("Taler News") }}</h2> 141 <h2>{{ _("Taler News") }}</h2>