style: improve ue comment form appearance

pedagogy/templates/pedagogy/fragments/ue_comment_form.jinja

@@ -5,50 +5,45 @@
       <div class="accordion-content">
   {% endif %}
   <form
-    hx-post="{{ action }}"
-    hx-target="closest .leave-comment"
-    hx-swap="outerHTML"
-    hx-disabled-elt="find input[type='submit']"
+    class="accordion-content"
+    action="{{ url('pedagogy:ue_detail', ue_id=object.id) }}"
+    method="post"
+    enctype="multipart/form-data"
   >
     {% csrf_token %}
-    <div class="leave-comment-grid-container">
+    {{ form.non_field_errors() }}
+    {{ form.author.errors }}
+    {{ form.ue.errors }}
+
+    {{ form.author }}
+    {{ form.ue }}
+    <div class="comment-form-content">
       <div class="form-stars">
-        {{ form.non_field_errors() }}
-        {{ form.author.errors }}
-        {{ form.ue.errors }}
-
-        {{ form.author }}
-        {{ form.ue }}
-
-        <div class="input-stars">
-          <label for="{{ form.grade_global.id_for_label }}">{{ form.grade_global.label }} :</label>
+        <fieldset>
+          <legend>{{ form.grade_global.label }} :</legend>
           {{ form.grade_global.errors }}
           {{ form.grade_global }}
-        </div>
-
-        <div class="input-stars">
-          <label for="{{ form.grade_utility.id_for_label }}">{{ form.grade_utility.label }} :</label>
+        </fieldset>
+        <fieldset>
+          <legend>{{ form.grade_utility.label }} :</legend>
           {{ form.grade_utility.errors }}
           {{ form.grade_utility }}
-        </div>
-
-        <div class="input-stars">
-          <label for="{{ form.grade_interest.id_for_label }}">{{ form.grade_interest.label }} :</label>
+        </fieldset>
+        <fieldset>
+          <legend>{{ form.grade_interest.label }} :</legend>
           {{ form.grade_interest.errors }}
           {{ form.grade_interest }}
-        </div>
-
-        <div class="input-stars">
-          <label for="{{ form.grade_teaching.id_for_label }}">{{ form.grade_teaching.label }} :</label>
+        </fieldset>
+        <fieldset>
+          <legend>{{ form.grade_teaching.label }} :</legend>
           {{ form.grade_teaching.errors }}
           {{ form.grade_teaching }}
-        </div>
-
-        <div class="input-stars">
-          <label for="{{ form.grade_work_load.id_for_label }}">{{ form.grade_work_load.label }} :</label>
+        </fieldset>
+        <fieldset>
+          <legend>{{ form.grade_work_load.label }} :</legend>
           {{ form.grade_work_load.errors }}
           {{ form.grade_work_load }}
-        </div>
+        </fieldset>
       </div>
       <div class="form-comment">
         <label for="{{ form.comment.id_for_label }}">{{ form.comment.label }} :</label>
@@ -56,9 +51,7 @@
         {{ form.comment }}
       </div>
     </div>
-    <div class="buttons">
-      <input type="submit" value="{% trans %}Comment{% endtrans %}" />
-    </div>
+    <p><input type="submit" class="btn btn-blue"/></p>
   </form>
 
   {% if form.is_creation %}

pedagogy/templates/pedagogy/fragments/ue_detail/form.jinja

@@ -1,10 +0,0 @@
-{% if object.has_user_already_commented(user) %}
-  <div class="leave-comment-not-allowed">
-    <p>{% trans %}You already posted a comment on this UE. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
-  </div>
-  <br>
-{% endif %}
-
-{% if not object.has_user_already_commented(user) and user.has_perm("pedagogy.add_uecomment") %}
-  {{ add_comment_form }}
-{% endif %}

pedagogy/templates/pedagogy/fragments/ue_detail/ue_detail.jinja

@@ -1,9 +1,18 @@
+{# A few hx-partials for swapping a few parts of the main ue_detail.jinja #}
+
 <hx-partial id="ue-grade">
   {% include "pedagogy/fragments/ue_detail/grade.jinja" %}
 </hx-partial>
 
 <hx-partial id="comment-form">
-  {% include "pedagogy/fragments/ue_detail/form.jinja" %}
+  {% if object.has_user_already_commented(user) %}
+    <div class="leave-comment-not-allowed">
+      <p>{% trans %}You already posted a comment on this UE. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
+    </div>
+    <br>
+  {% elif user.has_perm("pedagogy.add_uecomment") %}
+    {{ add_comment_form }}
+  {% endif %}
 </hx-partial>
 
 <hx-partial id="comments" hx-swap="innerMorph">

pedagogy/templates/pedagogy/ue_detail.jinja

@@ -73,11 +73,17 @@
       </section>
     </div>
 
-
     <br>
 
     <div id="comment-form">
-      {% include "pedagogy/fragments/ue_detail/form.jinja" %}
+      {% if object.has_user_already_commented(user) %}
+        <div class="leave-comment-not-allowed">
+          <p>{% trans %}You already posted a comment on this UE. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
+        </div>
+        <br>
+      {% elif user.has_perm("pedagogy.add_uecomment") %}
+        {{ add_comment_form }}
+      {% endif %}
     </div>
 
     <div id="comments">