Skip to content

WIP extend nav and breadcrumb badge support and whitespace reduction #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP extend nav and breadcrumb badge support and whitespace reduction #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/bootstrap5/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
12 changes: 6 additions & 6 deletions examples/bootstrap5/templates/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand All @@ -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>
Expand All @@ -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>
Expand Down
34 changes: 20 additions & 14 deletions flask_bootstrap/templates/base/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}