aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-02-18 11:12:01 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-02-18 11:12:01 +0100
commite4ccb0827b22d10b46fbf45a9c7d7a5f4d398c3c (patch)
tree3d23531400703716a8ee4bfe16646871222e0c60 /src
parentbf3a16e261075a27af81050ca7e59f9ff4171fe5 (diff)
aligning final article style with blog's
Diffstat (limited to 'src')
-rw-r--r--src/backend/merchant.conf2
-rw-r--r--src/frontend_blog/articles/fs-essay.html26
-rw-r--r--src/frontend_lib/config.php2
3 files changed, 23 insertions, 7 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 618ee808..657cb02f 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -11,7 +11,7 @@ HOSTNAME = localhost
KEYFILE = merchant.priv
# What currency does this backend accept?
-CURRENCY = PUDOS
+CURRENCY = EUR
# FIXME: to be revised
TRUSTED_MINTS = taler
diff --git a/src/frontend_blog/articles/fs-essay.html b/src/frontend_blog/articles/fs-essay.html
index 30da2974..b0bce3a5 100644
--- a/src/frontend_blog/articles/fs-essay.html
+++ b/src/frontend_blog/articles/fs-essay.html
@@ -2,15 +2,31 @@
<html lang="en">
<head>
<title>Blog site demonstration</title>
- <link rel="stylesheet" type="text/css" href="style.css">
+ <link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
- <div id="teaser">
-
+ <header>
+ <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">B</text>
+ </svg>
+ </div>
+ <h1>Blog site demonstration</h1>
+ </header>
+
+ <aside class="sidebar" id="left">
+ </aside>
+
+ <div id="teaser" style="display: none;">
<p>
What is Free Software
</p>
</div>
+
+ <section id="main">
+ <article>
+
<div id="full-article">
<h2>What is free software?</h2>
@@ -383,8 +399,8 @@
word &ldquo;open&rdquo; <a href="/philosophy/open-source-misses-the-point.html">
never refers to freedom</a>.
</p>
-
-
</div>
+ </section>
+ </article>
</body>
</html>
diff --git a/src/frontend_lib/config.php b/src/frontend_lib/config.php
index c6029c0c..5e8a0449 100644
--- a/src/frontend_lib/config.php
+++ b/src/frontend_lib/config.php
@@ -2,7 +2,7 @@
$REFUND_DELTA = 'P3M';
// set to false when done with local tests
-$explicit_currency = "PUDOS";
+$explicit_currency = "EUR";
$MERCHANT_CURRENCY = $explicit_currency;
$host = $_SERVER["HTTP_HOST"];