Remove some unused sass styles (#4811)

Also:

* Removed unused BaseAdminSubmissionsTable
* Removed utils/image.py in favour of wagtails get_rendition().

Author: frjo

hypha/apply/funds/models/reviewer_role.py

@@ -3,8 +3,6 @@
 from wagtail.admin.panels import FieldPanel
 from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 
-from hypha.apply.utils.image import generate_image_url
-
 
 class ReviewerRole(models.Model):
     name = models.CharField(max_length=128)
@@ -28,7 +26,7 @@ class ReviewerRole(models.Model):
     ]
 
     def icon_url(self, filter_spec):
-        return generate_image_url(self.icon, filter_spec)
+        return self.icon.get_rendition(filter_spec).url
 
     wagtail_reference_index_ignore = True
 

hypha/apply/funds/tables.py

@@ -8,7 +8,6 @@
 from django.db.models import F, Q
 from django.urls import reverse
 from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from django_tables2.utils import A
@@ -145,52 +144,6 @@ def render(self, value, record, bound_column):
         return self.wrap_with_label(checkbox, value)
 
 
-class BaseAdminSubmissionsTable(SubmissionsTable):
-    lead = tables.Column(order_by=("lead__full_name",))
-    reviews_stats = tables.TemplateColumn(
-        template_name="funds/tables/column_reviews.html",
-        verbose_name=mark_safe(
-            'Reviews<div>Comp. <span class="counts-separator">/</span> Assgn.</div>'
-        ),
-        orderable=False,
-    )
-    screening_status = tables.Column(
-        verbose_name=_("Screening"), accessor="screening_statuses"
-    )
-    organization_name = tables.Column()
-
-    class Meta(SubmissionsTable.Meta):
-        fields = (
-            "title",
-            "phase",
-            "stage",
-            "fund",
-            "round",
-            "lead",
-            "submit_time",
-            "last_update",
-            "screening_status",
-            "reviews_stats",
-            "organization_name",
-        )
-        sequence = fields + ("comments",)
-
-    def render_lead(self, value):
-        return format_html("<span>{}</span>", value)
-
-    def render_screening_status(self, value):
-        try:
-            status = value.get()
-            classname = "status-yes" if status.yes else "status-no text-red-500"
-            return format_html(
-                f"<span class='font-medium text-xs {classname}'>{'👍' if status.yes else '👎'} {status.title}</span>"
-            )
-        except ScreeningStatus.DoesNotExist:
-            return format_html(
-                "<span class='text-xs text-fg-muted'>{}</span>", "Awaiting"
-            )
-
-
 def get_used_rounds(request):
     return Round.objects.filter(submissions__isnull=False).distinct()
 

hypha/apply/funds/templates/funds/includes/review_sidebar_item.html

@@ -6,15 +6,15 @@
 >
     <div class="grid grid-cols-6 col-span-2 w-full">
         {% if not reviewer.review or reviewer.review.is_draft %}
-            <div class="col-span-4 reviews-sidebar__name">
+            <div class="flex col-span-4 items-center">
                 <span>
                     {% if HIDE_STAFF_IDENTITY and not request.user.is_org_faculty and not request.user == reviewer.reviewer %}
                         {% trans "Reviewer" %}
                     {% else %}
                         {{ reviewer }}
                     {% endif %}
                 </span>
-                {% if reviewer.role and reviewer.role.icon %}{% image reviewer.role.icon max-12x12 %}{% endif %}
+                {% if reviewer.role and reviewer.role.icon %}{% image reviewer.role.icon max-12x12 class="ms-2" %}{% endif %}
             </div>
             <div class="col-span-1">-</div>
             <div class="col-span-1">-</div>

hypha/apply/funds/templates/funds/tables/column_reviews.html

@@ -16,16 +16,15 @@
 # from django.contrib.sites.models import Site
 from hypha.apply.funds.models.submissions import ApplicationSubmission
 from hypha.apply.users.tokens import CoApplicantInviteTokenGenerator
-from hypha.apply.utils.image import generate_image_tag
 
 from .models.screening import ScreeningStatus
 
 
 def render_icon(image):
     if not image:
         return ""
-    filter_spec = "fill-20x20"
-    return generate_image_tag(image, filter_spec, html_class="size-4")
+    rendition = image.get_rendition("fill-20x20")
+    return f'<img alt="{rendition.alt}" class="size-4" src="{rendition.url}">'
 
 
 def get_or_create_default_screening_statuses(

hypha/apply/funds/utils.py

@@ -20,18 +20,17 @@
 
 {% block content %}
     <div class="overflow-x-auto my-4">
-        {% comment %} <table class="reviews-list"> {% endcomment %}
-        <table class="table table-pin-rows table-pin-cols">
+        <table class="table table-pin-cols">
             {% for answers in review_data.values %}
-                <tr class="reviews-list__tr">
-                    <th class="reviews-list__th">{{ answers.question }}</th>
+                <tr>
+                    <th class="w-40 bg-base-200">{{ answers.question }}</th>
                     {% for answer in answers.answers %}
                         {% if forloop.parentloop.first %}
-                            <th class="reviews-list__th reviews-list__th--author">{{ answer|safe }}</th>
+                            <th class="static bg-base-200">{{ answer|safe }}</th>
                         {% elif answers.question == "Opinions"%}
-                            <td class="reviews-list__td">{{ answer }}</td>
+                            <td class="min-w-60">{{ answer }}</td>
                         {% else %}
-                            <td class="reviews-list__td">{{ answer|nh3 }}</td>
+                            <td class="min-w-60">{{ answer|nh3 }}</td>
                         {% endif %}
                     {% endfor %}
                 </tr>

hypha/apply/review/templates/review/review_list.html

@@ -30,7 +30,6 @@
 from hypha.apply.todo.options import REVIEW_DRAFT
 from hypha.apply.todo.views import add_task_to_user, remove_tasks_for_user
 from hypha.apply.users.decorators import staff_required
-from hypha.apply.utils.image import generate_image_tag
 from hypha.apply.utils.views import CreateOrUpdateView
 
 from .models import Review, ReviewOpinion
@@ -446,8 +445,11 @@ def get_context_data(self, **kwargs):
                 review.get_absolute_url(), review.author
             )
             if review.author.role and review.author.role.icon:
-                author += generate_image_tag(review.author.role.icon, "12x12")
-            author = f"<div>{author}</div>"
+                rendition = review.author.role.icon.get_rendition("max-12x12")
+                author += (
+                    f'<img alt="{rendition.alt}" class="ms-2" src="{rendition.url}">'
+                )
+            author = f'<div class="flex items-center">{author}</div>'
 
             review_data["title"]["answers"].append(author)
             opinions_template = get_template(

hypha/apply/review/views.py

@@ -1,7 +1,5 @@
 @use "sass:list";
-@use "functions";
 @use "variables";
-@use "sass:math";
 
 // stylelint-disable scss/at-mixin-pattern
 
@@ -20,28 +18,3 @@
     }
   }
 }
-
-// Triangle mixin
-// @param {Direction} $direction - Triangle direction, either `top`, `right`, `bottom` or `left`
-// @param {Color} $color [currentcolor] - Triangle color
-// @param {Length} $size [1em] - Triangle size
-@mixin triangle($direction, $color: currentcolor, $size: 0.33rem) {
-  @if not list.index(top right bottom left, $direction) {
-    @error 'Direction must be either `top`, `right`, `bottom` or `left`.';
-  }
-
-  width: 0;
-  height: 0;
-  content: "";
-  border-#{functions.opposite-direction($direction)}: ($size * 1.5) solid $color;
-
-  $perpendicular-borders: $size solid transparent;
-
-  @if $direction == top or $direction == bottom {
-    border-inline-end: $perpendicular-borders;
-    border-inline-start: $perpendicular-borders;
-  } @else if $direction == right or $direction == left {
-    border-block-start: $perpendicular-borders;
-    border-block-end: $perpendicular-borders;
-  }
-}