Skip to content

Commit 4fe7a4b

Browse files
desafinadudedesafinadude
authored
Merge pull request #523 from OpenUpSA/6th-parliament-review
Updated pr6 landing page
2 parents fa58e88 + ee94ce8 commit 4fe7a4b

File tree

3 files changed

+102
-65
lines changed

3 files changed

+102
-65
lines changed

‎pmg/static/resources/css/pr6.css

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
text-transform: uppercase;
100100
}
101101

102+
.full-article .article-title {
103+
display: none;
104+
}
105+
102106

103107
.full-article .article-intro {
104108
font-size: 20px;
@@ -118,9 +122,49 @@
118122
text-align: justify;
119123
}
120124

121-
.full-article .article-extra {
125+
.full-article .article-content blockquote {
126+
float: left;
127+
width: 300px;
128+
color: #f05532;
129+
position: relative;
130+
font-size: 1.4em;
131+
padding-left: 2em;
132+
margin: 1em;
133+
line-height: 1.3em;
134+
}
135+
136+
137+
.full-article .article-content blockquote.right {
138+
float: right;
139+
border-left: none;
140+
border-right: 5px solid #eee;
141+
}
142+
143+
.full-article .article-content blockquote.full {
144+
float: none;
145+
width: 100%;
146+
margin: 2em 0;
147+
}
148+
149+
150+
151+
.full-article .article-content h3 {
152+
font-size: 1.2em;
153+
font-weight: bold;
154+
}
155+
156+
.full-article .article-content h4 {
157+
font-size: 1.1em;
158+
font-weight: bold;
159+
}
160+
161+
162+
163+
.full-article .article-extra, .full-article .article-footnotes {
122164
font-size: 14px;
123165
margin: 2em 0;
166+
border-top: 1px solid #ccc;
167+
padding-top: 2em;
124168
}
125169

126170

‎pmg/templates/pr6/landing.html

Lines changed: 44 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,23 @@ <h2>A comprehensive overview with commentary, data and interviews</h2>
3434

3535
<h2 class="pr6-section-title">ARTICLES</h2>
3636

37+
38+
3739
<section class="pr6-articles">
3840
<div class="pr6-row">
39-
<div class="col-4">
40-
<article>
41-
<h3><a href="/6th-parliament-review/articles/article">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
42-
<span class="article-meta">By Author Name</span>
43-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
44-
</article>
45-
</div>
46-
<div class="col-4">
47-
<article>
48-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
49-
<span class="article-meta">By Author Name</span>
50-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
51-
</article>
52-
</div>
53-
<div class="col-4">
54-
<article>
55-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
56-
<span class="article-meta">By Author Name</span>
57-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
58-
</article>
59-
</div>
41+
{% for article in articles %}
42+
<div class="col-4">
43+
<article>
44+
<h3><a href="/6th-parliament-review/articles/{{article.slug}}">{{article.title}}</a></h3>
45+
{{article.body|
46+
replace('<div class="article-content">','<div style="display: none">')|
47+
replace('<div class="article-footnotes">','<div style="display: none">')|
48+
replace('<div class="article-title">','<div style="display: none">')|
49+
replace('<div class="article-extra">','<div style="display: none">')|
50+
safe|truncate}}
51+
</article>
52+
</div>
53+
{% endfor %}
6054
</div>
6155
</section>
6256

@@ -68,57 +62,44 @@ <h2 class="pr6-section-title">INTERVIEWS</h2>
6862

6963
<section class="pr6-interviews">
7064
<div class="pr6-row">
71-
<div class="col-4">
72-
<article>
73-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
74-
<span class="article-meta">By Author Name</span>
75-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
76-
</article>
77-
</div>
78-
<div class="col-4">
79-
<article>
80-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
81-
<span class="article-meta">By Author Name</span>
82-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
83-
</article>
84-
</div>
85-
<div class="col-4">
86-
<article>
87-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
88-
<span class="article-meta">By Author Name</span>
89-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
90-
</article>
91-
</div>
65+
{% for interview in interviews %}
66+
<div class="col-4">
67+
<article>
68+
<h3><a href="/6th-parliament-review/interviews/{{interview.slug}}">{{interview.title}}</a></h3>
69+
{{interview.body|
70+
replace('<div class="article-content">','<div style="display: none">')|
71+
replace('<div class="article-footnotes">','<div style="display: none">')|
72+
replace('<div class="article-title">','<div style="display: none">')|
73+
replace('<div class="article-extra">','<div style="display: none">')|
74+
safe|truncate}}
75+
</article>
76+
</div>
77+
{% endfor %}
9278
</div>
9379
</section>
9480

81+
9582
<!-- STATISTICS -->
9683

9784
<h2 class="pr6-section-title">STATISTICS</h2>
9885

86+
87+
9988
<section class="pr6-statistics">
10089
<div class="pr6-row">
101-
<div class="col-4">
102-
<article>
103-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
104-
<span class="article-meta">By Author Name</span>
105-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
106-
</article>
107-
</div>
108-
<div class="col-4">
109-
<article>
110-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
111-
<span class="article-meta">By Author Name</span>
112-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
113-
</article>
114-
</div>
115-
<div class="col-4">
116-
<article>
117-
<h3><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></h3>
118-
<span class="article-meta">By Author Name</span>
119-
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam interdum magna a purus ultricies varius.</p>
120-
</article>
121-
</div>
90+
{% for stat in stats %}
91+
<div class="col-4">
92+
<article>
93+
<h3><a href="/6th-parliament-review/interviews/{{interview.slug}}">{{stat.title}}</a></h3>
94+
{{stat.body|
95+
replace('<div class="article-content">','<div style="display: none">')|
96+
replace('<div class="article-footnotes">','<div style="display: none">')|
97+
replace('<div class="article-title">','<div style="display: none">')|
98+
replace('<div class="article-extra">','<div style="display: none">')|
99+
safe|truncate}}
100+
</article>
101+
</div>
102+
{% endfor %}
122103
</div>
123104
</section>
124105

‎pmg/views.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1999,7 +1999,19 @@ def stats_review(stat):
19991999

20002000
@app.route("/6th-parliament-review", methods=["GET"])
20012001
def pr6():
2002-
return render_template("pr6/landing.html")
2002+
articles = Page.query.filter(Page.slug.like('%pr6-articles-%'))
2003+
interviews = Page.query.filter(Page.slug.like('%pr6-interviews-%'))
2004+
stats = Page.query.filter(Page.slug.like('%pr6-statistics-%'))
2005+
2006+
articles = articles.all()
2007+
interviews = interviews.all()
2008+
stats = stats.all()
2009+
2010+
return render_template("pr6/landing.html",
2011+
articles=articles,
2012+
interviews=interviews,
2013+
stats=stats
2014+
)
20032015

20042016
@app.route("/6th-parliament-review/articles/<slug>", methods=["GET"])
20052017
def pr6_articles(slug):

0 commit comments

Comments
 (0)