Update feedback emails

aleksis/apps/hjelp/templates/templated_email/feedback.email

+{% load i18n %}
+
+{% block subject %}
+    {% blocktrans with user=user.person.full_name %}New feedback from {{ user }}{% endblocktrans %}
+{% endblock %}
+
+
+{% block plain %}
+    {% blocktrans with username=user.username full_name=user.person.full_name email=user.person.email %}
+    The user {{ username }} (full name: {{ full_name }}, e-mail: <{{ email }}>) has given the following feedback:
+
+    Design rating: {{ design_rating }} out of 5 stars.
+    Performance rating: {{ performance_rating }} out of 5 stars.
+    Usability rating: {{ usability_rating }} out of 5 stars.
+    Overall rating: {{ overall_rating }} out of 5 stars.
+
+    What do you like? What would you change?
+        {{ apps }}
+    What else do you want to tell us?
+        {{ more }}
+    What do you think should be added to AlekSIS?
+        {{ ideas }}
+    {% endblocktrans %}
+{% endblock %}
+
+{% block html %}
+<style>
+    {% include "templated_email/html_mail.css" %}
+</style>
+<main>
+    <p>
+        {% blocktrans with username=user.username full_name=user.person.full_name email=user.person.email %}
+            The user {{ username }} (full name: {{ full_name }}, e-mail: <a href="mailto:{{ email }}">&lt;{{ email }}&gt;</a>)
+            has given the following feedback:
+        {% endblocktrans %}
+    </p>
+    <div class="card-panel">
+        <table>
+            <tr>
+                <th>{% trans "Design rating" %}</th>
+                <td class="stars">
+                    {% for _ in " "|center:design_rating %}★{% endfor %}
+                    {% with rating="-"|add:design_rating %}
+                        {% with count=5|add:rating %}
+                            {% for _ in " "|center:count %}☆{% endfor %}
+                        {% endwith %}
+                    {% endwith %}
+                </td>
+            </tr>
+            <tr>
+                <th>{% trans "Performance rating" %}</th>
+                <td class="stars">
+                    {% for _ in " "|center:performance_rating %}★{% endfor %}
+                    {% with rating="-"|add:performance_rating %}
+                        {% with count=5|add:rating %}
+                            {% for _ in " "|center:count %}☆{% endfor %}
+                        {% endwith %}
+                    {% endwith %}
+                </td>
+            </tr>
+            <tr>
+                <th>{% trans "Usability rating" %}</th>
+                <td class="stars">
+                    {% for _ in " "|center:usability_rating %}★{% endfor %}
+                    {% with rating="-"|add:usability_rating %}
+                        {% with count=5|add:rating %}
+                            {% for _ in " "|center:count %}☆{% endfor %}
+                        {% endwith %}
+                    {% endwith %}
+                </td>
+            </tr>
+            <tr>
+                <th>{% trans "Overall rating" %}</th>
+                <td class="stars">
+                    {% for _ in " "|center:overall_rating %}★{% endfor %}
+                    {% with rating="-"|add:overall_rating %}
+                        {% with count=5|add:rating %}
+                            {% for _ in " "|center:count %}☆{% endfor %}
+                        {% endwith %}
+                    {% endwith %}
+                </td>
+            </tr>
+            <tr>
+                <th>{% trans "What do you like? What would you change?" %}</th>
+                <td>{{ apps }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "What else do you want to tell us?" %}</th>
+                <td>{{ ideas }}</td>
+            </tr>
+            <tr>
+                <th>{% trans "What do you think should be added to AlekSIS?" %}</th>
+                <td>{{ more }}</td>
+            </tr>
+        </table>
+    </div>
+</main>
+{% endblock %}

aleksis/apps/hjelp/templates/templated_email/html_mail.css

@@ -31,3 +31,11 @@ span.chip {
     border-radius: 2px;
     background-color: #eaeaea;
 }
+
+table tr>th {
+    text-align: left;
+}
+td.stars {
+    color: #fe9e27;
+    font-size: 20px;
+}

aleksis/apps/hjelp/views.py

@@ -158,20 +158,17 @@ def feedback(request):
 
             # Send mail
             context = {
-                "description": [
-                    _(f"Design rating: {design_rating} out of 5 stars."),
-                    _(f"Performance rating: {performance_rating} out of 5 stars."),
-                    _(f"Usability rating: {usability_rating} out of 5 stars."),
-                    _(f"Overall rating: {overall_rating} out of 5 stars."),
-                    more,
-                    apps,
-                    ideas,
-                ],
+                "design_rating": design_rating,
+                "performance_rating": performance_rating,
+                "usability_rating": usability_rating,
+                "overall_rating": overall_rating,
+                "more": more,
+                "apps": apps,
+                "ideas": ideas,
                 "user": request.user,
-                "type": _("Feedback"),
             }
             send_templated_mail(
-                template_name="hjelp",
+                template_name="feedback",
                 from_email=request.user.person.mail_sender_via,
                 headers={
                     "Reply-To": request.user.person.mail_sender,