From 4d83880dd6d9f96add5d16cc15026fdca6232255 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 24 Jul 2018 19:45:12 +0200 Subject: [PATCH] Homepage --- templates/main.html | 39 +++++++++++++++++++++++++++++++++++++-- webserver.py | 2 +- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/templates/main.html b/templates/main.html index 0b00f613..961f5dda 100644 --- a/templates/main.html +++ b/templates/main.html @@ -18,13 +18,48 @@ {% include "/components/event.html" %} {% endfor %} +
+ Pagine Wiki +
+
+ +
- Sassi + Membri
- CIAOOOOOO + +
+
+ Resoconti +
+ +
+ Diario +
+
+ {% include "components/diarioentry.html" %} + Visualizza tutto
diff --git a/webserver.py b/webserver.py index 187482ae..4d9154e5 100644 --- a/webserver.py +++ b/webserver.py @@ -60,7 +60,7 @@ def page_main(): random_diario = db_session.query(db.Diario).order_by(db.func.random()).first() next_events = db_session.query(db.Event).filter(db.Event.time > datetime.datetime.now()).order_by(db.Event.time).all() db_session.close() - return render_template("main.html", royals=royals, wiki_pages=wiki_pages, diario=random_diario, + return render_template("main.html", royals=royals, wiki_pages=wiki_pages, entry=random_diario, next_events=next_events, config=config, escape=escape)