diff options
| author | Julian Kirsch <kirschju@sec.in.tum.de> | 2014-11-18 12:28:12 +0100 |
|---|---|---|
| committer | Julian Kirsch <kirschju@sec.in.tum.de> | 2014-11-18 12:28:12 +0100 |
| commit | 8410f135c08c952f34f57aaa8ebfceabc1476673 (patch) | |
| tree | dd71c94d7b8d1939d8860e5c91ddc8be0e7075bf | |
| parent | 297b121135e81f2b5b65c1f47f3762ee7e0e5c21 (diff) | |
| parent | 9bbbc1ff7e820dd0febf71a4a8c7e92cbd31da58 (diff) | |
| download | www-8410f135c08c952f34f57aaa8ebfceabc1476673.tar.gz www-8410f135c08c952f34f57aaa8ebfceabc1476673.tar.bz2 www-8410f135c08c952f34f57aaa8ebfceabc1476673.zip | |
Merge branch 'master' of taler:www
| -rw-r--r-- | common/navigation.inc | 2 | ||||
| -rw-r--r-- | developers.html | 31 | ||||
| -rw-r--r-- | governments.html | 29 | ||||
| -rw-r--r-- | investors.html | 36 | ||||
| -rw-r--r-- | merchants.html | 31 | ||||
| -rw-r--r-- | news.html | 40 |
6 files changed, 41 insertions, 128 deletions
diff --git a/common/navigation.inc b/common/navigation.inc index 491879fa..9acf9a1e 100644 --- a/common/navigation.inc +++ b/common/navigation.inc @@ -9,7 +9,7 @@ <li><a href="/governments">Governments</a></li> <li><a href="/developers">Developers</a></li> <li><a href="/investors">Investors</a></li> - <li><a href="/about/">About Us</a></li> + <li><a href="/about">About Us</a></li> </ul> </div> diff --git a/developers.html b/developers.html index 933b85fb..c09cd89b 100644 --- a/developers.html +++ b/developers.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>Taler - Taxable Anonymous Libre Electronic Reserves</title> + <title>Taler - Taxable Anonymous Libre Electronic Reserves: Developers</title> <meta name="description" content=""> <!--# include file="common/header.inc" --> </head> @@ -11,7 +11,6 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img src="images/logo-2014.png"></img> <h1 lang="en">Electronic Payments for Libre Society!</h1> <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> <h1 lang="fr">Paiements électroniques pour société libre!</h1> @@ -22,36 +21,22 @@ <!-- Example row of columns --> <div class="row"> <div class="col-lg-4"> - <h2>Taxable</h2> - <p>Unlike BitCoin or cash payments, Taler ensures that governments can easily track their citizen's income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.</p> - <p><a class="btn btn-primary" href="/governments" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>Anonymous</h2> - <p>When you pay with Taler, your identity does not have to be revealed to the merchant. The bank, government and mint will also never learn how you spent your electronic money. However, you can prove that you paid in court if necessary.</p> - <p><a class="btn btn-primary" href="/citizens" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> <h2>Libre</h2> <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> - <p><a class="btn btn-primary" href="/developers" role="button">Learn More »</a></p> </div> - </div> - <div class="row"> <div class="col-lg-4"> - <h2>Electronic</h2> + <h2>RESTful</h2> <p>Taler is designed to work on the Internet. Using a so-called RESTful protocol over HTTP or HTTPS, Taler is easy to integrate with existing Web applications.</p> - <p><a class="btn btn-primary" href="/merchants" role="button">Learn More »</a></p> </div> + </div> + <div class="row"> <div class="col-lg-4"> - <h2>Reserves</h2> - <p>Taler operates as a reserve. This means that Taler is not a new currency with the inherent currency fluctuation risks, but instead the digital coins correspond to existing currencies, such as US Dollars, Euros or even BitCoins.</p> - <p><a class="btn btn-primary" href="/investors" role="button">Learn More »</a></p> + <h2>Code</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>News</h2> - <p>We will present Taler at FOSSA in Rennes on Tuesday November 19th 2014.</p> - <p><a class="btn btn-primary" href="/news" role="button">Learn More »</a></p> + <h2>Documentation</h2> + <p>.</p> </div> </div> diff --git a/governments.html b/governments.html index 933b85fb..718dd3e6 100644 --- a/governments.html +++ b/governments.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>Taler - Taxable Anonymous Libre Electronic Reserves</title> + <title>Taler - Taxable Anonymous Libre Electronic Reserves: Governments</title> <meta name="description" content=""> <!--# include file="common/header.inc" --> </head> @@ -11,7 +11,6 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img src="images/logo-2014.png"></img> <h1 lang="en">Electronic Payments for Libre Society!</h1> <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> <h1 lang="fr">Paiements électroniques pour société libre!</h1> @@ -23,36 +22,26 @@ <div class="row"> <div class="col-lg-4"> <h2>Taxable</h2> - <p>Unlike BitCoin or cash payments, Taler ensures that governments can easily track their citizen's income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.</p> + <p>.</p> <p><a class="btn btn-primary" href="/governments" role="button">Learn More »</a></p> </div> <div class="col-lg-4"> - <h2>Anonymous</h2> - <p>When you pay with Taler, your identity does not have to be revealed to the merchant. The bank, government and mint will also never learn how you spent your electronic money. However, you can prove that you paid in court if necessary.</p> + <h2>Secure</h2> + <p>.</p> <p><a class="btn btn-primary" href="/citizens" role="button">Learn More »</a></p> </div> + </div> + <div class="row"> <div class="col-lg-4"> <h2>Libre</h2> - <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> + <p>.</p> <p><a class="btn btn-primary" href="/developers" role="button">Learn More »</a></p> </div> - </div> - <div class="row"> <div class="col-lg-4"> - <h2>Electronic</h2> - <p>Taler is designed to work on the Internet. Using a so-called RESTful protocol over HTTP or HTTPS, Taler is easy to integrate with existing Web applications.</p> + <h2>Efficient</h2> + <p>Blah.</p> <p><a class="btn btn-primary" href="/merchants" role="button">Learn More »</a></p> </div> - <div class="col-lg-4"> - <h2>Reserves</h2> - <p>Taler operates as a reserve. This means that Taler is not a new currency with the inherent currency fluctuation risks, but instead the digital coins correspond to existing currencies, such as US Dollars, Euros or even BitCoins.</p> - <p><a class="btn btn-primary" href="/investors" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>News</h2> - <p>We will present Taler at FOSSA in Rennes on Tuesday November 19th 2014.</p> - <p><a class="btn btn-primary" href="/news" role="button">Learn More »</a></p> - </div> </div> <!--# include file="common/footer.inc" --> diff --git a/investors.html b/investors.html index 933b85fb..b8c6e9dd 100644 --- a/investors.html +++ b/investors.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>Taler - Taxable Anonymous Libre Electronic Reserves</title> + <title>Taler - Taxable Anonymous Libre Electronic Reserves: Investors</title> <meta name="description" content=""> <!--# include file="common/header.inc" --> </head> @@ -11,7 +11,6 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img src="images/logo-2014.png"></img> <h1 lang="en">Electronic Payments for Libre Society!</h1> <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> <h1 lang="fr">Paiements électroniques pour société libre!</h1> @@ -22,39 +21,18 @@ <!-- Example row of columns --> <div class="row"> <div class="col-lg-4"> - <h2>Taxable</h2> - <p>Unlike BitCoin or cash payments, Taler ensures that governments can easily track their citizen's income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.</p> - <p><a class="btn btn-primary" href="/governments" role="button">Learn More »</a></p> + <h2>Efficient</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>Anonymous</h2> - <p>When you pay with Taler, your identity does not have to be revealed to the merchant. The bank, government and mint will also never learn how you spent your electronic money. However, you can prove that you paid in court if necessary.</p> - <p><a class="btn btn-primary" href="/citizens" role="button">Learn More »</a></p> + <h2>Secure</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>Libre</h2> - <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> - <p><a class="btn btn-primary" href="/developers" role="button">Learn More »</a></p> + <h2>Business Model</h2> + <p>.</p> </div> </div> - <div class="row"> - <div class="col-lg-4"> - <h2>Electronic</h2> - <p>Taler is designed to work on the Internet. Using a so-called RESTful protocol over HTTP or HTTPS, Taler is easy to integrate with existing Web applications.</p> - <p><a class="btn btn-primary" href="/merchants" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>Reserves</h2> - <p>Taler operates as a reserve. This means that Taler is not a new currency with the inherent currency fluctuation risks, but instead the digital coins correspond to existing currencies, such as US Dollars, Euros or even BitCoins.</p> - <p><a class="btn btn-primary" href="/investors" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>News</h2> - <p>We will present Taler at FOSSA in Rennes on Tuesday November 19th 2014.</p> - <p><a class="btn btn-primary" href="/news" role="button">Learn More »</a></p> - </div> - </div> - <!--# include file="common/footer.inc" --> </div> <!-- /container --> </body> diff --git a/merchants.html b/merchants.html index 933b85fb..ea0526e8 100644 --- a/merchants.html +++ b/merchants.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>Taler - Taxable Anonymous Libre Electronic Reserves</title> + <title>Taler - Taxable Anonymous Libre Electronic Reserves: Merchants</title> <meta name="description" content=""> <!--# include file="common/header.inc" --> </head> @@ -11,7 +11,6 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img src="images/logo-2014.png"></img> <h1 lang="en">Electronic Payments for Libre Society!</h1> <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> <h1 lang="fr">Paiements électroniques pour société libre!</h1> @@ -22,36 +21,30 @@ <!-- Example row of columns --> <div class="row"> <div class="col-lg-4"> - <h2>Taxable</h2> - <p>Unlike BitCoin or cash payments, Taler ensures that governments can easily track their citizen's income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.</p> - <p><a class="btn btn-primary" href="/governments" role="button">Learn More »</a></p> + <h2>Fast</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>Anonymous</h2> - <p>When you pay with Taler, your identity does not have to be revealed to the merchant. The bank, government and mint will also never learn how you spent your electronic money. However, you can prove that you paid in court if necessary.</p> - <p><a class="btn btn-primary" href="/citizens" role="button">Learn More »</a></p> + <h2>Secure</h2> + <p>.</p> </div> <div class="col-lg-4"> <h2>Libre</h2> - <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> - <p><a class="btn btn-primary" href="/developers" role="button">Learn More »</a></p> + <p>.</p> </div> </div> <div class="row"> <div class="col-lg-4"> - <h2>Electronic</h2> - <p>Taler is designed to work on the Internet. Using a so-called RESTful protocol over HTTP or HTTPS, Taler is easy to integrate with existing Web applications.</p> - <p><a class="btn btn-primary" href="/merchants" role="button">Learn More »</a></p> + <h2>Low Fees</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>Reserves</h2> - <p>Taler operates as a reserve. This means that Taler is not a new currency with the inherent currency fluctuation risks, but instead the digital coins correspond to existing currencies, such as US Dollars, Euros or even BitCoins.</p> - <p><a class="btn btn-primary" href="/investors" role="button">Learn More »</a></p> + <h2>Flexible</h2> + <p>.</p> </div> <div class="col-lg-4"> - <h2>News</h2> - <p>We will present Taler at FOSSA in Rennes on Tuesday November 19th 2014.</p> - <p><a class="btn btn-primary" href="/news" role="button">Learn More »</a></p> + <h2>Ethical</h2> + <p>.</p> </div> </div> @@ -2,7 +2,7 @@ <html> <head> <meta charset="utf-8"> - <title>Taler - Taxable Anonymous Libre Electronic Reserves</title> + <title>Taler - Taxable Anonymous Libre Electronic Reserves: News</title> <meta name="description" content=""> <!--# include file="common/header.inc" --> </head> @@ -11,47 +11,15 @@ <!--# include file="common/navigation.inc" --> <!-- Jumbotron --> <div class="jumbotron"> - <img src="images/logo-2014.png"></img> - <h1 lang="en">Electronic Payments for Libre Society!</h1> - <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> - <h1 lang="fr">Paiements électroniques pour société libre!</h1> - <p class="lead">We are building Taler, a new electronic payment system for privacy and security.</p> + <h1 lang="en">News</h1> <!-- p><a class="btn btn-lg btn-success" href="#" role="button">Get started today</a></p --> </div> <!-- Example row of columns --> <div class="row"> <div class="col-lg-4"> - <h2>Taxable</h2> - <p>Unlike BitCoin or cash payments, Taler ensures that governments can easily track their citizen's income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.</p> - <p><a class="btn btn-primary" href="/governments" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>Anonymous</h2> - <p>When you pay with Taler, your identity does not have to be revealed to the merchant. The bank, government and mint will also never learn how you spent your electronic money. However, you can prove that you paid in court if necessary.</p> - <p><a class="btn btn-primary" href="/citizens" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>Libre</h2> - <p>Taler is free software implementing an open protocol. Anybody is welcome to inspect our code and integrate our reference implementation into their applications.</p> - <p><a class="btn btn-primary" href="/developers" role="button">Learn More »</a></p> - </div> - </div> - <div class="row"> - <div class="col-lg-4"> - <h2>Electronic</h2> - <p>Taler is designed to work on the Internet. Using a so-called RESTful protocol over HTTP or HTTPS, Taler is easy to integrate with existing Web applications.</p> - <p><a class="btn btn-primary" href="/merchants" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>Reserves</h2> - <p>Taler operates as a reserve. This means that Taler is not a new currency with the inherent currency fluctuation risks, but instead the digital coins correspond to existing currencies, such as US Dollars, Euros or even BitCoins.</p> - <p><a class="btn btn-primary" href="/investors" role="button">Learn More »</a></p> - </div> - <div class="col-lg-4"> - <h2>News</h2> - <p>We will present Taler at FOSSA in Rennes on Tuesday November 19th 2014.</p> - <p><a class="btn btn-primary" href="/news" role="button">Learn More »</a></p> + <h2>11-2014: Launching <tt>taler.net</tt></h2> + <p>Welcome to our new site about the Taler electronic payment system.</p> </div> </div> |