From d7ac7c3da031ccc32b8e47676a3e2ca4add325d5 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 10 Mar 2019 08:51:23 +0100
Subject: [PATCH] Work on forum_detail presentation again
---
forums/templates/forums/forum_detail.html | 25 ++++++++++++++++++-
forums/templates/forums/post_card.html | 2 +-
.../static/scipost/assets/css/_forums.scss | 6 +++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/forums/templates/forums/forum_detail.html b/forums/templates/forums/forum_detail.html
index e02c6db95..070023013 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 adebcc24b..78da1449f 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 f816aad56..f7629b910 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;
}
--
GitLab