Extra feedback on group by overview (#340)

MinBZK · Oct 30, 2024 · 4773cc7 · 4773cc7
2 parents fa41cac + 2e15010
commit 4773cc7
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 103 deletions.
diff --git a/amt/locale/base.pot b/amt/locale/base.pot
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
@@ -289,18 +290,6 @@ msgstr ""
 msgid "Algorithmic Management Toolkit (AMT)"
 msgstr ""
 
-#: amt/site/templates/macros/algorithm_systems_grid.html.j2:36
-msgid ""
-"\n"
-"                                            Algorithm system\n"
-"                                        "
-msgid_plural ""
-"\n"
-"                                            Algorithm systems\n"
-"                                        "
-msgstr[0] ""
-msgstr[1] ""
-
 #: amt/site/templates/macros/editable.html.j2:24
 #: amt/site/templates/macros/editable.html.j2:27
 #: amt/site/templates/projects/details_requirements.html.j2:55
@@ -317,7 +306,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: amt/site/templates/macros/table_row.html.j2:15
+#: amt/site/templates/macros/table_row.html.j2:19
 msgid " ago"
 msgstr ""
 
@@ -349,7 +338,7 @@ msgstr ""
 #: amt/site/templates/pages/model_card.html.j2:6
 #: amt/site/templates/pages/system_card.html.j2:4
 #: amt/site/templates/parts/filter_list.html.j2:98
-#: amt/site/templates/parts/filter_list.html.j2:120
+#: amt/site/templates/parts/filter_list.html.j2:122
 #: amt/site/templates/projects/details_info.html.j2:28
 msgid "Last updated"
 msgstr ""
@@ -451,15 +440,10 @@ msgid ""
 msgstr ""
 
 #: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:117
 msgid "Algorithm system name"
 msgstr ""
 
-#: amt/site/templates/parts/filter_list.html.j2:114
-msgid ""
-"Algorithm system\n"
-"                        name"
-msgstr ""
-
 #: amt/site/templates/parts/header.html.j2:7
 msgid "Beta Version"
 msgstr ""

diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo
diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po
@@ -291,18 +291,6 @@ msgstr ""
 msgid "Algorithmic Management Toolkit (AMT)"
 msgstr ""
 
-#: amt/site/templates/macros/algorithm_systems_grid.html.j2:36
-msgid ""
-"\n"
-"                                            Algorithm system\n"
-"                                        "
-msgid_plural ""
-"\n"
-"                                            Algorithm systems\n"
-"                                        "
-msgstr[0] ""
-msgstr[1] ""
-
 #: amt/site/templates/macros/editable.html.j2:24
 #: amt/site/templates/macros/editable.html.j2:27
 #: amt/site/templates/projects/details_requirements.html.j2:55
@@ -319,7 +307,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: amt/site/templates/macros/table_row.html.j2:15
+#: amt/site/templates/macros/table_row.html.j2:19
 msgid " ago"
 msgstr ""
 
@@ -351,7 +339,7 @@ msgstr ""
 #: amt/site/templates/pages/model_card.html.j2:6
 #: amt/site/templates/pages/system_card.html.j2:4
 #: amt/site/templates/parts/filter_list.html.j2:98
-#: amt/site/templates/parts/filter_list.html.j2:120
+#: amt/site/templates/parts/filter_list.html.j2:122
 #: amt/site/templates/projects/details_info.html.j2:28
 msgid "Last updated"
 msgstr ""
@@ -453,15 +441,10 @@ msgid ""
 msgstr ""
 
 #: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:117
 msgid "Algorithm system name"
 msgstr ""
 
-#: amt/site/templates/parts/filter_list.html.j2:114
-msgid ""
-"Algorithm system\n"
-"                        name"
-msgstr ""
-
 #: amt/site/templates/parts/header.html.j2:7
 msgid "Beta Version"
 msgstr ""

diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo
diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po
@@ -299,24 +299,6 @@ msgstr "Er is één fout:"
 msgid "Algorithmic Management Toolkit (AMT)"
 msgstr "Algoritme Management Toolkit (AMT)"
 
-#: amt/site/templates/macros/algorithm_systems_grid.html.j2:36
-msgid ""
-"\n"
-"                                            Algorithm system\n"
-"                                        "
-msgid_plural ""
-"\n"
-"                                            Algorithm systems\n"
-"                                        "
-msgstr[0] ""
-"\n"
-"                                    Algoritmesysteem\n"
-"                                    "
-msgstr[1] ""
-"\n"
-"                                    Algoritmesystemen\n"
-"                                                                "
-
 #: amt/site/templates/macros/editable.html.j2:24
 #: amt/site/templates/macros/editable.html.j2:27
 #: amt/site/templates/projects/details_requirements.html.j2:55
@@ -333,7 +315,7 @@ msgstr "Opslaan"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: amt/site/templates/macros/table_row.html.j2:15
+#: amt/site/templates/macros/table_row.html.j2:19
 msgid " ago"
 msgstr "geleden"
 
@@ -365,7 +347,7 @@ msgstr "Onbekend"
 #: amt/site/templates/pages/model_card.html.j2:6
 #: amt/site/templates/pages/system_card.html.j2:4
 #: amt/site/templates/parts/filter_list.html.j2:98
-#: amt/site/templates/parts/filter_list.html.j2:120
+#: amt/site/templates/parts/filter_list.html.j2:122
 #: amt/site/templates/projects/details_info.html.j2:28
 msgid "Last updated"
 msgstr "Laatst bijgewerkt"
@@ -483,15 +465,10 @@ msgstr ""
 "zien."
 
 #: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:117
 msgid "Algorithm system name"
 msgstr "Algoritmesysteem naam"
 
-#: amt/site/templates/parts/filter_list.html.j2:114
-msgid ""
-"Algorithm system\n"
-"                        name"
-msgstr "Algoritme Systeem naam"
-
 #: amt/site/templates/parts/header.html.j2:7
 msgid "Beta Version"
 msgstr "Bètaversie"
@@ -694,7 +671,7 @@ msgstr "Creëer een Algoritmesysteem"
 
 #: amt/site/templates/projects/new.html.j2:23
 msgid "Algorithm System name"
-msgstr "Algoritme Systeem naam"
+msgstr "Algoritmesysteem naam"
 
 #: amt/site/templates/projects/new.html.j2:27
 msgid "Name of the algorithm system"

diff --git a/amt/site/templates/macros/algorithm_systems_grid.html.j2 b/amt/site/templates/macros/algorithm_systems_grid.html.j2
@@ -12,34 +12,22 @@
                             <div title="{{ lifecycle.display_value }}">
                                 {% if projects | length > 0 %}
                                     <h3 class="rvo-accordion__item-title utrecht-heading-3 rvo-heading--no-margins rvo-heading--mixed">
-                                    {% else %}
-                                        <h3 class="rvo-accordion__item-title utrecht-heading-3 rvo-heading--no-margins rvo-heading--mixed"
-                                            style="color: var(--rvo-expandable-text-subtle-summary-color)">
-                                        {% endif %}
                                         <span class="utrecht-icon rvo-icon rvo-icon-delta-omlaag rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--closed"
                                               role="img"
                                               aria-label="Delta omlaag"></span>
                                         <span class="utrecht-icon rvo-icon rvo-icon-delta-omhoog rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--open"
                                               role="img"
                                               aria-label="Delta omhoog"></span>
-                                        {{ lifecycle.display_value }}
+                                    {% else %}
+                                        <h3 class="rvo-accordion__item-title utrecht-heading-3 rvo-heading--no-margins rvo-heading--mixed"
+                                            style="color: var(--rvo-expandable-text-subtle-summary-color)">
+                                            <span class="utrecht-icon rvo-icon rvo-icon-delta-omlaag rvo-icon--md rvo-expandable-text-subtle-summary-color rvo-accordion__item-icon--closed"
+                                                  role="img"
+                                                  aria-label="Delta omlaag"></span>
+                                        {% endif %}
+                                        {{ lifecycle.display_value }} ({{ projects | length }})
                                     </h3>
                                 </div>
-                                <div>
-                                    {% if projects | length > 0 %}
-                                        <span style="color: var(--rvo-color-zwart); font-size: var(--rvo-size-md)">
-                                        {% else %}
-                                            <span style="color: var(--rvo-expandable-text-subtle-summary-color);
-                                                         font-size: var(--rvo-size-md)">
-                                            {% endif %}
-                                            <span style="font-weight: bold">{{ projects | length }}</span>
-                                            {% trans count=projects|length %}
-                                            Algorithm system
-                                        {% pluralize %}
-                                            Algorithm systems
-                                        {% endtrans %}
-                                    </span>
-                                </div>
                             </div>
                         </div>
                     </summary>

diff --git a/amt/site/templates/macros/table_row.html.j2 b/amt/site/templates/macros/table_row.html.j2
@@ -1,18 +1,22 @@
 {% macro item(loop, project, show_lifecycles) -%}
     <tr class="rvo-table-row"
         {% if loop.last and projects|length == limit %} data-marker="last-element" hx-get="/algorithm-systems/?skip={{ next }}" hx-swap="beforeend" hx-trigger="revealed" {% endif %}>
-        <td class="rvo-table-cell" style="padding-left: 0">
-            <a class="rvo-link rvo-link--no-underline rvo-link--zwart"
-               href="/algorithm-system/{{ project.id }}/details/">{{ project.name }}</a>
-        </td>
         {% if show_lifecycles %}
             <td class="rvo-table-cell">
-                <span class="rvo-text--subtle">{{ project.lifecycle.display_value }}</span>
+            {% else %}
+                <td class="rvo-table-cell" style="padding-left: 0">
+                {% endif %}
+                <a class="rvo-link rvo-link--no-underline rvo-link--zwart"
+                   href="/algorithm-system/{{ project.id }}/details/">{{ project.name }}</a>
             </td>
-        {% endif %}
-        <td class="rvo-table-cell">
-            <span class="rvo-text--subtle" style="white-space: nowrap">{{ project.last_edited | time_ago(language) }}
-            {% trans %} ago{% endtrans %}</span>
-        </td>
-    </tr>
-{% endmacro %}
+            {% if show_lifecycles %}
+                <td class="rvo-table-cell">
+                    <span class="rvo-text--subtle">{{ project.lifecycle.display_value }}</span>
+                </td>
+            {% endif %}
+            <td class="rvo-table-cell">
+                <span class="rvo-text--subtle" style="white-space: nowrap">{{ project.last_edited | time_ago(language) }}
+                {% trans %} ago{% endtrans %}</span>
+            </td>
+        </tr>
+    {% endmacro %}
diff --git a/amt/site/templates/parts/filter_list.html.j2 b/amt/site/templates/parts/filter_list.html.j2
@@ -110,10 +110,10 @@
                       table-layout: fixed">
             <thead class="rvo-table-head">
                 <tr class="rvo-table-row">
-                    <th style="width: 81%" scope="col" class="rvo-table-header">
-                        {% trans %}Algorithm system
-                        name{% endtrans %}
-                    </th>
+                    <th style="width: 81%;
+                               padding-left: var(--rvo-card-padding-xl-padding-block-start)"
+                        scope="col"
+                        class="rvo-table-header">{% trans %}Algorithm system name{% endtrans %}</th>
                     <th scope="col"
                         class="rvo-table-header"
                         style="white-space: nowrap;