diff --git a/pmg/static/resources/css/pr6.css b/pmg/static/resources/css/pr6.css index 05fb8fd3..f04cb2eb 100644 --- a/pmg/static/resources/css/pr6.css +++ b/pmg/static/resources/css/pr6.css @@ -99,6 +99,10 @@ text-transform: uppercase; } +.full-article .article-title { + display: none; +} + .full-article .article-intro { font-size: 20px; @@ -118,9 +122,49 @@ text-align: justify; } -.full-article .article-extra { +.full-article .article-content blockquote { + float: left; + width: 300px; + color: #f05532; + position: relative; + font-size: 1.4em; + padding-left: 2em; + margin: 1em; + line-height: 1.3em; +} + + +.full-article .article-content blockquote.right { + float: right; + border-left: none; + border-right: 5px solid #eee; +} + +.full-article .article-content blockquote.full { + float: none; + width: 100%; + margin: 2em 0; +} + + + +.full-article .article-content h3 { + font-size: 1.2em; + font-weight: bold; +} + +.full-article .article-content h4 { + font-size: 1.1em; + font-weight: bold; +} + + + +.full-article .article-extra, .full-article .article-footnotes { font-size: 14px; margin: 2em 0; + border-top: 1px solid #ccc; + padding-top: 2em; } diff --git a/pmg/templates/pr6/landing.html b/pmg/templates/pr6/landing.html index 0ee8e35a..d2de751e 100644 --- a/pmg/templates/pr6/landing.html +++ b/pmg/templates/pr6/landing.html @@ -34,29 +34,23 @@

A comprehensive overview with commentary, data and interviews

ARTICLES

+ +
-
- -
-
- -
-
- -
+ {% for article in articles %} +
+
+

{{article.title}}

+ {{article.body| + replace('
','
')| + replace('
','
')| + replace('
','
')| + replace('
','
')| + safe|truncate}} +
+
+ {% endfor %}
@@ -68,57 +62,44 @@

INTERVIEWS

-
- -
-
- -
-
- -
+ {% for interview in interviews %} +
+
+

{{interview.title}}

+ {{interview.body| + replace('
','
')| + replace('
','
')| + replace('
','
')| + replace('
','
')| + safe|truncate}} +
+
+ {% endfor %}
+

STATISTICS

+ +
-
- -
-
- -
-
- -
+ {% for stat in stats %} +
+
+

{{stat.title}}

+ {{stat.body| + replace('
','
')| + replace('
','
')| + replace('
','
')| + replace('
','
')| + safe|truncate}} +
+
+ {% endfor %}
diff --git a/pmg/views.py b/pmg/views.py index 37d412da..be2c426e 100644 --- a/pmg/views.py +++ b/pmg/views.py @@ -1999,7 +1999,19 @@ def stats_review(stat): @app.route("/6th-parliament-review", methods=["GET"]) def pr6(): - return render_template("pr6/landing.html") + articles = Page.query.filter(Page.slug.like('%pr6-articles-%')) + interviews = Page.query.filter(Page.slug.like('%pr6-interviews-%')) + stats = Page.query.filter(Page.slug.like('%pr6-statistics-%')) + + articles = articles.all() + interviews = interviews.all() + stats = stats.all() + + return render_template("pr6/landing.html", + articles=articles, + interviews=interviews, + stats=stats + ) @app.route("/6th-parliament-review/articles/", methods=["GET"]) def pr6_articles(slug):