Ratings: implement replies by maintainers #181

Merged
Oleg-Komarov merged 7 commits from rating-reply into main 2024-06-11 12:35:03 +02:00
3 changed files with 31 additions and 18 deletions
Showing only changes of commit 79e3649f33 - Show all commits

View File

@ -383,6 +383,9 @@
width: 100% width: 100%
.rating-form .rating-form
.box
margin-left: calc(var(--spacer) * 2.5)
select select
color: var(--color-warning) color: var(--color-warning)
@ -391,6 +394,15 @@
&:focus &:focus
color: var(--color-warning) color: var(--color-warning)
textarea
min-height: calc(var(--spacer) * 6)
.rating-reply
@extend blockquote
+margin(3, top)
margin-bottom: 0 !important
// TODO: consider adding component boxed nav generic to web-assets, and make variants on top of that // TODO: consider adding component boxed nav generic to web-assets, and make variants on top of that
.nav-pills .nav-pills
@extend .dropdown-menu @extend .dropdown-menu

View File

@ -51,21 +51,22 @@
</ul> </ul>
</header> </header>
<div>{{ rating.text|markdown }}</div> <div>{{ rating.text|markdown }}</div>
{% if rating.ratingreply %}
<div class="rating-reply">
<header>
<ul>
<li class="align-items-center me-auto">
<a href="{% url "extensions:by-author" user_id=rating.ratingreply.user.pk %}">{{ rating.ratingreply.user }}</a>
replied
</li>
<li>
{{ rating.ratingreply.date_created|naturaltime_compact }}
</li>
</ul>
</header>
{{ rating.ratingreply.text|markdown }}
</div>
{% endif %}
</div> </div>
{% if rating.ratingreply %}
<div>
<header>
<ul>
<li class="align-items-center me-auto">
<a href="{% url "extensions:by-author" user_id=rating.ratingreply.user.pk %}">{{ rating.ratingreply.user }}</a>
replied
</li>
<li>
{{ rating.ratingreply.date_created|naturaltime_compact }}
</li>
</ul>
</header>
{{ rating.ratingreply.text|markdown }}
</div>
{% endif %}
</article> </article>

View File

@ -10,14 +10,14 @@
{% include "ratings/components/rating.html" with classes="mb-2" %} {% include "ratings/components/rating.html" with classes="mb-2" %}
</div> </div>
</div> </div>
<div class="container rating-form"> <div class="rating-form">
<form method="post" enctype="multipart/form-data"> <form method="post" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{% with form=form|add_form_classes %} {% with form=form|add_form_classes %}
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="box p-3"> <div class="box p-3">
{% include "common/components/field.html" with field=form.text focus=True placeholder="Enter the text here..." %} {% include "common/components/field.html" with field=form.text focus=True placeholder="Enter your reply here..." %}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="invalid-feedback"> <div class="invalid-feedback">
{{ form.non_field_errors }} {{ form.non_field_errors }}