[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-www] branch master updated: news logic and test news
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-www] branch master updated: news logic and test news |
|
Date: |
Wed, 26 Aug 2020 16:35:39 +0200 |
This is an automated email from the git hooks/post-receive script.
ds-meister pushed a commit to branch master
in repository anastasis-www.
The following commit(s) were added to refs/heads/master by this push:
new eb4a554 news logic and test news
eb4a554 is described below
commit eb4a55488e70974a5d3646368314119fd4028202
Author: Dominik Meister <dominik.meister@hotmail.ch>
AuthorDate: Wed Aug 26 16:35:24 2020 +0200
news logic and test news
---
common/footer.j2.inc | 21 ++++++---------------
common/news.j2 | 27 ++++++++++++++++++++-------
news/2020-05.html.j2 | 5 +++--
news/2020-06.html.j2 | 5 +++--
news/2020-07.html.j2 | 5 +++--
news/2020-08.html.j2 | 5 +++--
news/index.html.j2 | 1 +
static/styles.css | 10 ++++++++++
8 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 957ba7f..d9b06b7 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,15 +1,6 @@
-<!DOCTYPE html>
-<html lang="{{ lang }}">
- <head>
- <meta charset="UTF-8"/>
- <title>{{ _("GNU Taler") }}</title>
- <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic
Reserves') }}" />
- {% include "common/header.j2.inc" %}
- </head>
- <body>
-
- aksmdkamskmasdmk
-
-
- </body>
-</html>
+<div id="footer-box">
+© Anastasis SARL ?
+</div>
+<div id="footer-box">
+{{ _("This page was created using <a href='https://www.gnu.org/'>Free
Software</a> only.") }}
+</div>
diff --git a/common/news.j2 b/common/news.j2
index 957ba7f..7d2742d 100644
--- a/common/news.j2
+++ b/common/news.j2
@@ -2,14 +2,27 @@
<html lang="{{ lang }}">
<head>
<meta charset="UTF-8"/>
- <title>{{ _("GNU Taler") }}</title>
- <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic
Reserves') }}" />
+ <title>{{ _("Anastasis") }}</title>
+ <meta name="description" content="{{ _('Anastasis key recovery system')
}}" />
{% include "common/header.j2.inc" %}
- </head>
+ {% block head_content %}{% endblock %}
+ </head>
<body>
-
- aksmdkamskmasdmk
-
-
+ <div id="page-container">
+ <div id="content-wrap">
+ <div class="main-title">
+ <h1 style="color:white;">Anastasis</h1>
+ </div>
+ <div class="toolbar">
+ {% include "common/navigation.j2.inc" %}
+ </div>
+ <div class="content">
+ {% block body_content %}{% endblock %}
+ </div>
+ <footer id="footer">
+ {% include "common/footer.j2.inc" %}
+ </footer>
+ </div>
+ </div>
</body>
</html>
diff --git a/news/2020-05.html.j2 b/news/2020-05.html.j2
index b7381e1..e66a927 100644
--- a/news/2020-05.html.j2
+++ b/news/2020-05.html.j2
@@ -1,7 +1,8 @@
{% extends "common/news.j2" %}
{% block body_content %}
-<h1>2020-07: New Website</h1>
+<h1>New Anastasis Website Launched</h1>
<p>
-The new Anastasis Website launched
+The new Anastasis Website just launched, visit us and check out
+what's new!
</p>
{% endblock body_content %}
diff --git a/news/2020-06.html.j2 b/news/2020-06.html.j2
index b7381e1..e66a927 100644
--- a/news/2020-06.html.j2
+++ b/news/2020-06.html.j2
@@ -1,7 +1,8 @@
{% extends "common/news.j2" %}
{% block body_content %}
-<h1>2020-07: New Website</h1>
+<h1>New Anastasis Website Launched</h1>
<p>
-The new Anastasis Website launched
+The new Anastasis Website just launched, visit us and check out
+what's new!
</p>
{% endblock body_content %}
diff --git a/news/2020-07.html.j2 b/news/2020-07.html.j2
index b7381e1..e66a927 100644
--- a/news/2020-07.html.j2
+++ b/news/2020-07.html.j2
@@ -1,7 +1,8 @@
{% extends "common/news.j2" %}
{% block body_content %}
-<h1>2020-07: New Website</h1>
+<h1>New Anastasis Website Launched</h1>
<p>
-The new Anastasis Website launched
+The new Anastasis Website just launched, visit us and check out
+what's new!
</p>
{% endblock body_content %}
diff --git a/news/2020-08.html.j2 b/news/2020-08.html.j2
index b7381e1..e66a927 100644
--- a/news/2020-08.html.j2
+++ b/news/2020-08.html.j2
@@ -1,7 +1,8 @@
{% extends "common/news.j2" %}
{% block body_content %}
-<h1>2020-07: New Website</h1>
+<h1>New Anastasis Website Launched</h1>
<p>
-The new Anastasis Website launched
+The new Anastasis Website just launched, visit us and check out
+what's new!
</p>
{% endblock body_content %}
diff --git a/news/index.html.j2 b/news/index.html.j2
index 563514c..73d6cec 100644
--- a/news/index.html.j2
+++ b/news/index.html.j2
@@ -15,6 +15,7 @@ News
<div id="news-item">
<h3>{{ item['title']|e }}</h3>
{{ item['date'] }}
+ <br>
{{ item['abstract'] }} <br/>
[<a href="{{ item['page'] }}" title="{{ item['date']}}">{{ _("read more")
}}</a>]
</div>
diff --git a/static/styles.css b/static/styles.css
index 204b8b9..8119c47 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -5,6 +5,7 @@ body {
padding: 0;
font-family: 'Lato';
font-size: 20px;
+ line-height: 1.7;
}
i {
color: #ABC;
@@ -120,6 +121,11 @@ li a:hover:not(.active) {
#news-item {
padding: 50px;
}
+#footer-box {
+ padding: 1rem;
+}
+
+
@@ -144,4 +150,8 @@ footer {
background-color: #333;
max-width: 1800px;
margin: auto;
+ color: white;
+ display: flex;
+ align-content: stretch;
+ justify-content: space-around;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-www] branch master updated: news logic and test news,
gnunet <=