Only add <hr> to options when they are any

pehala · Nov 26, 2023 · 7a0ede9 · 7a0ede9
1 parent c7a381a
commit 7a0ede9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/frontend/static/styles.sass b/frontend/static/styles.sass
@@ -158,4 +158,7 @@ p
   background-color: #f5f5f5
 
 .custom-link
- color: $colDefault
+ color: $colDefault
+
+.small-hr
+  height: 1px
diff --git a/frontend/templates/base/index.html b/frontend/templates/base/index.html
@@ -3,7 +3,7 @@
 {% load sass_tags %}
 {% load i18n %}
 {% load menu %}
-{% load menu_utils %}
+{% load utils %}
 
 {% get_current_language as LANGUAGE_CODE %}
 {% get_available_languages as LANGUAGES %}
@@ -84,9 +84,8 @@
                                 <input name="language" type=hidden value={{ locale.code }}>
                             </form>
                         {% endfor %}
-                        <hr class="mt-2 mb-1">
                         <div class="d-flex flex-column">
-                            {% block extra_options %}{% endblock %}
+                            {% filter prefix:"<div><hr class='mt-2 mb-1 small-hr'></div>" %}{% block extra_options %}{% endblock %}{% endfilter %}
                         </div>
                     </div>
                 </li>

diff --git a/tenants/templatetags/menu_utils.py → tenants/templatetags/utils.py b/tenants/templatetags/menu_utils.py → tenants/templatetags/utils.py
@@ -1,5 +1,6 @@
 """Tags for drawing the menu"""
 from django import template
+from django.template.defaultfilters import stringfilter
 
 from tenants.utils import create_tenant_string
 
@@ -12,3 +13,10 @@ def draw_menu(context, key, use_tenant=False):
     if use_tenant:
         key = create_tenant_string(context.request.tenant, key)
     return {"menu": context["menus"][key]}
+
+
+@register.filter
+@stringfilter
+def prefix(value, args):
+    """Adds prefix if value is not empty"""
+    return str(args) + value if value else value