Feature/review and secretary pages redesign

main/templates/base/fetc_form_base.html

@@ -9,7 +9,7 @@
         {# todo: responsive design #}
         <div class="col-3">
             {% block sidebar %}
-                {% include "base/stepper.html" %}
+                {% include stepper %}
             {% endblock %}
 
         </div>
@@ -31,37 +31,39 @@
                     </div>
                 {% endblock %}
 
-                {{ form }}
-                {% block post-form-pre-buttons %}{% endblock %}
+                {% block auto-form-render %}{{ form }}{% endblock %}
 
-                <div class="uu-form-text-row">
-                    <div class="uu-form-text">
-                        <div class="mt-4 mb-3 w-100 d-flex">
-                            {% block form-buttons %}
-                                {% include "base/form_buttons.html" %}
-                            {% endblock %}
+                {% block form-buttons %}
+                    {% block post-form-pre-buttons %}{% endblock %}
 
-                        </div>
-                    </div>
-                </div>
-                {# A block one can use to add stuff after the form, but still next to the stepper #}
-                {% block post-form %}
                     <div class="uu-form-text-row">
                         <div class="uu-form-text">
-                            {% block post-form-text %}{% endblock %}
+                            <div class="mt-4 mb-3 w-100 d-flex">
+                                {% block form-buttons %}
+                                    {% include "base/form_buttons.html" %}
+                                {% endblock %}
 
+                            </div>
                         </div>
-                        <aside class="uu-form-text-aside">
-                            {% block post-form-aside %}{% endblock %}
-
-                        </aside>
                     </div>
-                {% endblock %}
+                    {# A block one can use to add stuff after the form, but still next to the stepper #}
+                    {% block post-form %}
+                        <div class="uu-form-text-row">
+                            <div class="uu-form-text">
+                                {% block post-form-text %}{% endblock %}
 
-            </form>
-        </div>
-        {# A block one can use to insert content after the stepper/form container #}
-        {% block post-form-container-content %}{% endblock %}
+                            </div>
+                            <aside class="uu-form-text-aside">
+                                {% block post-form-aside %}{% endblock %}
+
+                            </aside>
+                        </div>
+                    {% endblock %}
 
-    </div>
-{% endblock %}
+                </form>
+            </div>
+            {# A block one can use to insert content after the stepper/form container #}
+            {% block post-form-container-content %}{% endblock %}
+
+        </div>
+    {% endblock %}

reviews/templates/reviews/review_assign_form.html

@@ -21,9 +21,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    {% with review=review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
+    {% include "reviews/review_detail_sidebar.html" %}
 {% endblock %}
 
 {% block pre-form-text %}

reviews/templates/reviews/review_close_form.html

@@ -1,4 +1,4 @@
-div{% extends "base/fetc_form_base.html" %}
+{% extends "base/fetc_form_base.html" %}
 
 {% load static %}
 {% load i18n %}
@@ -7,6 +7,10 @@
     {% trans "Review afsluiten" %} - {{ block.super }}
 {% endblock %}
 
+{% block sidebar %}
+    {% include "reviews/review_detail_sidebar.html" %}
+{% endblock %}
+
 {% block html_head %}
     {{ block.super }}
     <script>

reviews/templates/reviews/review_detail.html

@@ -18,11 +18,7 @@ <h2>{{ review.proposal.title }} - {{ review.proposal.reference_number }}</h2>
         </div>
     </div>
     <div class="uu-container">
-        <div class="col-3">
-            {% with review=review %}
-                {% include "reviews/review_detail_sidebar.html" %}
-            {% endwith %}
-        </div>
+        <div class="col-3">{% include "reviews/review_detail_sidebar.html" %}</div>
         <div class="col-12 col-md-9">
             <h4>{% trans "Reviewers" %}</h4>
             {% include "reviews/review_table.html" %}

reviews/templates/reviews/review_discontinue_form.html

@@ -22,9 +22,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    {% with review=review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
+    {% include "reviews/review_detail_sidebar.html" %}
 {% endblock %}
 
 {% block pre-form-text %}

reviews/utils/review_actions.py

@@ -184,7 +184,7 @@ def is_available(self):
             return False
 
         if self.review.stage in [
-            Review.Stages.CLOSING,
+            Review.Stages.SUPERVISOR,
             Review.Stages.CLOSED,
         ]:
             return False