From 1c2c943a49e8705b79d383929424c86bd27da635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20Caux?= <git@jscaux.org>
Date: Sun, 30 Jan 2022 07:29:13 +0100
Subject: [PATCH] Use details element instead of card
---
scipost_django/colleges/forms.py | 4 --
.../templates/colleges/_hx_nomination_li.html | 10 ++++
.../templates/colleges/nominations.html | 50 +++++++++----------
3 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/scipost_django/colleges/forms.py b/scipost_django/colleges/forms.py
index f30716440..25ad5beba 100644
--- a/scipost_django/colleges/forms.py
+++ b/scipost_django/colleges/forms.py
@@ -371,16 +371,12 @@ class FellowshipNominationSearchForm(forms.Form):
css_class='row'
),
Div(
- # Div(FloatingField('profile'), css_id='search-profile', css_class='col-lg-6'),
Div(FloatingField('name', autocomplete='off'), css_class='col-lg-6'),
css_class='row'
),
)
def search_results(self):
- # if self.cleaned_data.get('profile'):
- # nominations = FellowshipNomination.objects.filter(
- # profile=self.cleaned_data.get('profile'))
if self.cleaned_data.get('name'):
nominations = FellowshipNomination.objects.filter(
Q(profile__last_name__icontains=self.cleaned_data.get('name')) |
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_li.html b/scipost_django/colleges/templates/colleges/_hx_nomination_li.html
index 42222bb98..4848bd37a 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_li.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_li.html
@@ -5,6 +5,16 @@
</summary>
<div class="p-2">
<p>Nominated by {{ nomination.nominated_by }} on {{ nomination.nominated_on|date:"Y-m-d" }}</p>
+ {% if nomination.nominator_comments %}
+ <div class="row">
+ <div class="col-lg-2">
+ Nominator comments:
+ </div>
+ <div class="col-lg-10">
+ <em>{{ nomination.nominator_comments }}</em>
+ </div>
+ </div>
+ {% endif %}
<div class="row">
<div class="col">
<div class="card">
diff --git a/scipost_django/colleges/templates/colleges/nominations.html b/scipost_django/colleges/templates/colleges/nominations.html
index c82d383f6..621dec805 100644
--- a/scipost_django/colleges/templates/colleges/nominations.html
+++ b/scipost_django/colleges/templates/colleges/nominations.html
@@ -15,11 +15,11 @@
<h1 class="highlight">Fellowship Nominations</h1>
- <div class="card">
- <div class="card-header">
+ <details class="border border-success border-2 mt-4">
+ <summary class="bg-success bg-opacity-10 p-2">
<h2>Nominate</h2>
- </div>
- <div class="card-body">
+ </summary>
+ <div class="p-2">
<div class="row">
<div class="col-lg-6">
<h3>Procedure</h3>
@@ -68,13 +68,13 @@
</div>
<div id="nomination_form_response"></div>
</div>
- </div>
+ </details>
- <div class="card mt-4">
- <div class="card-header">
- <h2>Search / filter</h2>
- </div>
- <div class="card-body">
+ <details class="border border-2 mt-4">
+ <summary class="bg-light p-2">
+ <h2>List / filter</h2>
+ </summary>
+ <div class="p-2 mt-2">
<form
hx-post="{% url 'colleges:_hx_nominations' %}"
hx-trigger="load, keyup delay:500ms, change"
@@ -83,22 +83,22 @@
>
<div id="search-form">{% crispy form %}</div>
</form>
- </div>
- </div>
- <div class="row">
- <div class="col">
- <h3>Nominations list</h3>
- </div>
- <div class="col">
- <div id="indicator-search" class="htmx-indicator">
- <button class="btn btn-sm btn-warning" type="button" disabled>
- <strong>Loading...</strong>
- <div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div>
- </button>
+
+ <div class="row">
+ <div class="col">
+ <h3>Nominations list</h3>
+ </div>
+ <div class="col">
+ <div id="indicator-search" class="htmx-indicator">
+ <button class="btn btn-sm btn-warning" type="button" disabled>
+ <strong>Loading...</strong>
+ <div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div>
+ </button>
+ </div>
+ </div>
</div>
+ <ul id="search-results" class="list-unstyled mt-2"></ul>
</div>
- </div>
- <ul id="search-results" class="list-unstyled mt-2"></ul>
-
+ </details>
{% endblock content %}
--
GitLab