✨ 996 Implement feebdack on productlist page

maykinmedia · Nov 15, 2024 · f3b7606 · f3b7606
1 parent 7ca2ba2
commit f3b7606
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 25 deletions.
diff --git a/src/sdg/organisaties/views/catalogi.py b/src/sdg/organisaties/views/catalogi.py
@@ -23,11 +23,6 @@ class CatalogListView(
             "label": _("Naam"),
             "filter_label": _("Zoek op productnaam"),
         },
-        {
-            "key": "generiek_product__upn__thema__informatiegebied",
-            "label": _("Informatiegebied"),
-            "filter_label": _("Selecteer thema"),
-        },
         {
             "label": _("Aangeboden"),
             "key": "product_aanwezig",

diff --git a/src/sdg/producten/views/product.py b/src/sdg/producten/views/product.py
@@ -238,7 +238,7 @@ def get_queryset(self):
         )
 
     def get_breadcrumbs_title(self):
-        name = capfirst(self.object)
+        name = capfirst(self.product)
 
         if self.product.is_referentie_product:
             return f"{name} (referentie)"

diff --git a/src/sdg/scss/components/_colors.scss b/src/sdg/scss/components/_colors.scss
@@ -45,6 +45,7 @@ $color_success_notification-bg: #9fcb6266;
 
 $color_red: #c74a4a;
 $color_green: #39885d;
+$color_white: #fff;
 
 $color-bg: #f5f5f5;
 

diff --git a/src/sdg/scss/components/_select.scss b/src/sdg/scss/components/_select.scss
@@ -12,7 +12,7 @@ select {
   background-image: none;
   cursor: pointer;
   font-family: 'Source Sans Pro', sans-serif;
-  background-color: $color_grey_light;
+  background-color: $color_white;
 
   /* Remove IE arrow */
   &::-ms-expand {

diff --git a/src/sdg/scss/views/organisaties/_organisaties-productenlijst-list.scss b/src/sdg/scss/views/organisaties/_organisaties-productenlijst-list.scss
@@ -5,7 +5,7 @@
 
 
 $base_with: (
-  'color-background': $color_grey_light,
+  'color-background': $color_white,
   'color-info': $color_primary_lightest,
   'typography-color-link': $color_primary,
   'shades': (

diff --git a/src/sdg/templates/core/base.html b/src/sdg/templates/core/base.html
@@ -4,6 +4,7 @@
 {% block inner %}
     {% with namespace=request.resolver_match.namespaces|last pk=lokaleoverheid.pk %}
         <div class="breadcrumbs">
+            {{product}}
             <div>
                 <a href="{% url 'core:home' %}">{% trans 'Homepage' %}</a>
                 {% with kwargs=request.resolver_match.kwargs %}
@@ -14,6 +15,7 @@
                         <a href="{% url 'organisaties:catalogi:list' pk=kwargs.pk %}">{% trans 'Productenlijst' %}</a>
                     {% endif %}
                 {% endwith %}
+
                 {% if breadcrumbs_title %}
                     <span>{{ breadcrumbs_title }}</span>
                 {% elif namespace == "roles" %}
@@ -31,7 +33,7 @@
         </div>
         <h2 class="products__title primary">
             {% block page_title %}
-                <span>{{ object|capfirst|default:namespace|capfirst }}</span>
+                <span>{{ product|capfirst|default:namespace|capfirst }}</span>
             {% endblock %}
         </h2>
         {% block page_intro %}{% endblock %}

diff --git a/src/sdg/templates/organisaties/catalogi/list.html b/src/sdg/templates/organisaties/catalogi/list.html
@@ -2,12 +2,6 @@
 {% load rijkshuisstijl_datagrid static i18n producten utils %}
 
 {% block page_title %}{% trans "Productenlijst" %}{% endblock %}
-{% block page_intro %}
-    <p class="subheading">
-        {% trans "Je ziet hieronder de lijst van alle SDG producten. Klik op een product om deze te bewerken." %}
-    </p>
-{% endblock %}
-
 
 {% block page_content %}
     {% datagrid config=datagrid_config %}

diff --git a/src/sdg/templates/producten/update.html b/src/sdg/templates/producten/update.html
@@ -25,19 +25,11 @@
 {% endfor %}
 {% endblock %}
 
-{% block breadcrumbs_page_title %}
-    {% if product.is_referentie_product %}
-        <span>{{ object|capfirst|default:namespace|capfirst }} (referentie)</span>
-    {% else %}
-        <span>{{ object|capfirst|default:namespace|capfirst }}</span>
-    {% endif %}
-{% endblock %}
-
 {% block page_title %}
     {% if product.is_referentie_product %}
-        <span>{{ object|capfirst|default:namespace|capfirst }} (referentie)</span>
+        <span>{{ product|capfirst|default:namespace|capfirst }} (referentie)</span>
     {% else %}
-        <span>{{ object|capfirst|default:namespace|capfirst }}</span>
+        <span>{{ product|capfirst|default:namespace|capfirst }}</span>
     {% endif %}
 {% endblock %}