Skip to content

Commit

Permalink
Merge pull request #538 from OpenUpSA/6th-parliament
Browse files Browse the repository at this point in the history
6th parliament
  • Loading branch information
desafinadude authored May 7, 2024
2 parents 82719e9 + c75470a commit 773fdbf
Show file tree
Hide file tree
Showing 8 changed files with 374 additions and 52 deletions.
1 change: 1 addition & 0 deletions pmg/templates/pr6/_sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<div class="sidebar-items sidebar-articles">
<h3>Articles</h3>
<ul>
<li><a href="/6th-parliament-review/articles/overview"><span>PMG</span><br/>A reflection on the sixth parliament</a></li>
<li><a href="/6th-parliament-review/articles/ben-cronin"><span>Ben Cronin</span><br/>The Sixth Parliament and the Budget Process: Lessons for the Seventh Parliament</a></li>
<li><a href="/6th-parliament-review/articles/pam-saxby"><span>Pam Saxby</span><br/>Post-pandemic: live-streaming Committee meetings</a></li>
<li><a href="/6th-parliament-review/articles/michael-atkins"><span>Michael Atkins</span><br/>Looking ahead at the Electoral Reform Consultation Panel process ahead of the Seventh Parliament</a></li>
Expand Down
1 change: 1 addition & 0 deletions pmg/templates/pr6/article.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

{% if section == 'articles' %}
{% set article_templates = {
'overview': 'pr6/articles/overview.html',
'martin-nicol': 'pr6/articles/martin-nicol.html',
'judith-february': 'pr6/articles/judith-february.html',
'ben-cronin': 'pr6/articles/ben-cronin.html',
Expand Down
171 changes: 119 additions & 52 deletions pmg/templates/pr6/articles/ben-cronin.html

Large diffs are not rendered by default.

Empty file.
222 changes: 222 additions & 0 deletions pmg/templates/pr6/articles/overview.html

Large diffs are not rendered by default.

Empty file.
16 changes: 16 additions & 0 deletions pmg/templates/pr6/landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@ <h2 class="pr6-section-title">ARTICLES</h2>
<section class="pr6-articles">
<div class="pr6-row">



<div class="col-4">
<article>
<a href="/6th-parliament-review/articles/overview">
<h3>A reflection on the sixth parliament</h3>
<div class="article-meta">By PMG</div>
<div class="article-intro">South African Parliament's sixth term saw historical milestones, controversies, and calls for reforms to restore public trust in the legislature.</div>
</a>
</article>
</div>

<div class="col-4">
<article>
<a href="/6th-parliament-review/articles/michael-atkins">
Expand Down Expand Up @@ -306,6 +318,10 @@ <h2 class="pr6-section-title">STATISTICS</h2>

<section class="pr6-statistics">
<div class="pr6-row">



A reflection on the sixth parliament
<div class="col-4">
<article>
<a href="/6th-parliament-review/statistics/written-questions">
Expand Down
15 changes: 15 additions & 0 deletions pmg/templates/pr6/statistics/bills.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<div class="article-title"></div>

<div class="article-meta">By PMG</div>

<div class="article-intro">
</div>

<div class="article-content">
<p class="first-par"></p>



</div>

{% include 'pr6/_disclaimer.html' %}

0 comments on commit 773fdbf

Please sign in to comment.