From b00f466e112747a231f5051383f5761fa49c4ad5 Mon Sep 17 00:00:00 2001
From: Pander <pander@users.sourceforge.net>
Date: Wed, 18 Oct 2023 22:25:27 +0200
Subject: [PATCH] extend nav badge support, reduce nav whitespace

---
 examples/bootstrap5/templates/base.html |  4 +--
 examples/bootstrap5/templates/nav.html  | 12 ++++-----
 flask_bootstrap/templates/base/nav.html | 34 +++++++++++++++----------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/examples/bootstrap5/templates/base.html b/examples/bootstrap5/templates/base.html
index a76ee3d5..368f8c9e 100644
--- a/examples/bootstrap5/templates/base.html
+++ b/examples/bootstrap5/templates/base.html
@@ -31,8 +31,8 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
                 {{ render_nav_item('index', 'Home') }}
-                {{ render_nav_item('test_form', 'Form') }}
-                {{ render_nav_item('test_nav', 'Nav') }}
+                {{ render_nav_item('test_form', 'Form', _use_li=True) }}
+                {{ render_nav_item('test_nav', 'Nav', _badge='New', _badge_style='Light') }}
                 {{ render_nav_item('test_bootswatch', 'Bootswatch') }}
                 {{ render_nav_item('test_pagination', 'Pagination') }}
                 {{ render_nav_item('test_flash', 'Flash Messages') }}
diff --git a/examples/bootstrap5/templates/nav.html b/examples/bootstrap5/templates/nav.html
index 496b0c2a..10e85629 100644
--- a/examples/bootstrap5/templates/nav.html
+++ b/examples/bootstrap5/templates/nav.html
@@ -4,8 +4,8 @@
 {% block content %}
 <h2>Render Navbar item with render_nav_item</h2>
 <pre>{% raw %}
-{{ render_nav_item('test_form', 'Form') }}
-{{ render_nav_item('test_nav', 'Nav') }}
+{{ render_nav_item('test_form', 'Form', _use_li=True) }}
+{{ render_nav_item('test_nav', 'Nav', _badge='New', _badge_style='Light') }}
 {{ render_nav_item('test_pagination', 'Pagination') }}
 {{ render_nav_item('test_static', 'Static') }}
 {{ render_nav_item('test_flash', 'Flash Messages') }}
@@ -17,8 +17,8 @@ <h2>Render Navbar item with render_nav_item</h2>
     </button>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <div class="navbar-nav mr-auto">
-            {{ render_nav_item('test_form', 'Form') }}
-            {{ render_nav_item('test_nav', 'Nav') }}
+            {{ render_nav_item('test_form', 'Form', _use_li=True) }}
+            {{ render_nav_item('test_nav', 'Nav', _badge='New', _badge_style='Light') }}
             {{ render_nav_item('test_pagination', 'Pagination') }}
             {{ render_nav_item('test_flash', 'Flash Messages') }}
         </div>
@@ -28,14 +28,14 @@ <h2>Render Navbar item with render_nav_item</h2>
 <h2>Render Breadcrumb item with render_breadcrumb_item</h2>
 <pre>{% raw %}
 {{ render_breadcrumb_item('test_form', 'Form') }}
-{{ render_breadcrumb_item('test_nav', 'Nav') }}
+{{ render_breadcrumb_item('test_nav', 'Nav', _badge='17', _badge_pill=True) }}
 {{ render_breadcrumb_item('test_pagination', 'Pagination') }}
 {{ render_breadcrumb_item('test_flash', 'Flash Messages') }}
 {% endraw %}</pre>
 <nav aria-label="breadcrumb">
     <ol class="breadcrumb">
         {{ render_breadcrumb_item('test_form', 'Form') }}
-        {{ render_breadcrumb_item('test_nav', 'Nav') }}
+        {{ render_breadcrumb_item('test_nav', 'Nav', _badge='17', _badge_pill=True) }}
         {{ render_breadcrumb_item('test_pagination', 'Pagination') }}
         {{ render_breadcrumb_item('test_flash', 'Flash Messages') }}
     </ol>
diff --git a/flask_bootstrap/templates/base/nav.html b/flask_bootstrap/templates/base/nav.html
index ab0ae338..395badb0 100644
--- a/flask_bootstrap/templates/base/nav.html
+++ b/flask_bootstrap/templates/base/nav.html
@@ -1,21 +1,27 @@
-{% macro render_nav_item(endpoint, text, _badge='', _use_li=False) %}
-    {% set active = True if request.endpoint and request.endpoint == endpoint else False %}
-    {% if _use_li %}<li class="nav-item">{% endif %}
-    <a class="{% if not _use_li %}nav-item {% endif %}nav-link{% if active %} active" aria-current="page{% endif %}"
-       href="{{ url_for(endpoint, **kwargs) }}">
-        {{ text }} {% if _badge %}<span class="badge badge-light">{{ _badge }}</span>{% endif %}
+{% macro render_nav_item(endpoint, text, _badge=None, _badge_pill=False, _badge_style=config.BOOTSTRAP_BTN_STYLE, _use_li=False) %}
+    {%- set active = True if request.endpoint and request.endpoint == endpoint else False -%}
+    {% if _use_li -%}
+    <li class="nav-item">
+    {%- endif -%}
+    <a class="{% if not _use_li %}nav-item {% endif %}nav-link{% if active %} active" aria-current="page{% endif %}" href="{{ url_for(endpoint, **kwargs) }}">{{ text }}
+    {%- if _badge %} <span class="badge{%if _badge_pill %} badge-pill{% endif %} badge-{% if _badge_style %}{{ _badge_style }}{% else %}light{% endif %}">{{ _badge }}</span>{% endif -%}
     </a>
-    {% if _use_li %}</li>{% endif %}
+    {%- if _use_li -%}
+    </li>
+    {%- endif -%}
 {% endmacro %}
 
 
-{% macro render_breadcrumb_item(endpoint, text) %}
-    {% set active = True if request.endpoint and request.endpoint == endpoint else False %}
+{% macro render_breadcrumb_item(endpoint, text, _badge=None, _badge_pill=False, _badge_style=config.BOOTSTRAP_BTN_STYLE) %}
+    {%- set active = True if request.endpoint and request.endpoint == endpoint else False -%}
     <li class="breadcrumb-item{% if active %} active" aria-current="page{% endif %}">
-        {% if active %}
-            {{ text }}
-        {% else %}
-        <a href="{{ url_for(endpoint, **kwargs) }}">{{ text }}</a>
-        {% endif %}
+        {%- if not active -%}
+        <a href="{{ url_for(endpoint, **kwargs) }}">
+        {%- endif -%}
+        {{ text }}
+        {%- if _badge %} <span class="badge{%if _badge_pill %} badge-pill{% endif %} badge-{% if _badge_style %}{{ _badge_style }}{% else %}light{% endif %}">{{ _badge }}</span>{% endif -%}
+        {%- if not active -%}
+        </a>
+        {%- endif -%}
     </li>
 {% endmacro %}