diff --git a/forums/templates/forums/forum_detail.html b/forums/templates/forums/forum_detail.html index e02c6db95f6f5a8cd2883220adb19b906cd982a3..0700230136daead765c3e1c3fe05cad42880ea2b 100644 --- a/forums/templates/forums/forum_detail.html +++ b/forums/templates/forums/forum_detail.html @@ -95,18 +95,32 @@ <ul> <li><a href="#Description">Description</a></li> {% if forum.meeting %} + <li><a href="#Preamble">Preamble</a></li> <li><a href="#Motions">Motions</a></li> {% endif %} <li><a href="#Posts">Posts</a></li> + {% if forum.meeting %} + <li><a href="#Minutes">Minutes</a></li> + {% endif %} </ul> + </div> +</div> +<div class="row"> + <div class="col-12"> <h3 class="highlight" id="Description">Description</h3> {{ forum.description|restructuredtext }} - </div> </div> {% if forum.meeting %} +<div class="row"> + <div class="col-12"> + <h3 class="highlight" id="Preamble">Preamble</h3> + {{ forum.preamble|restructuredtext }} + </div> +</div> + <div class="row"> <div class="col-12"> <h3 class="highlight" id="Motions">Motions</h3> @@ -140,4 +154,13 @@ </div> </div> +{% if forum.meeting %} +<div class="row"> + <div class="col-12"> + <h3 class="highlight" id="Minutes">Minutes</h3> + {{ forum.minutes|restructuredtext }} + </div> +</div> +{% endif %} + {% endblock content %} diff --git a/forums/templates/forums/post_card.html b/forums/templates/forums/post_card.html index adebcc24b11847c42aaaf87ad79a67769c903a7c..78da1449f3b3de3c22d50cd9f098583781fc83f5 100644 --- a/forums/templates/forums/post_card.html +++ b/forums/templates/forums/post_card.html @@ -71,7 +71,7 @@ </div> </div> {% if post.followup_posts.all|length > 0 %} - <div class="followupPosts"> + <div class="followupPosts{% if post.motion %}AfterMotion{% endif %}"> {% for followup in post.followup_posts.all %} {% include 'forums/post_card.html' with post=followup %} {% endfor %} diff --git a/scipost/static/scipost/assets/css/_forums.scss b/scipost/static/scipost/assets/css/_forums.scss index f816aad5699936aa44841673397097c9ccf063d4..f7629b9103c4be03c8b39f45753da737d214edd1 100644 --- a/scipost/static/scipost/assets/css/_forums.scss +++ b/scipost/static/scipost/assets/css/_forums.scss @@ -13,6 +13,12 @@ padding-left: 0.4rem; } +.followupPostsAfterMotion { + border-left: 1px solid white; + margin: 1rem; + padding-left: 0.4rem; +} + .forumList { padding-left: 0.4rem; }