From 3915b97231ace54efb0c9592a7db85a5852ccf86 Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Tue, 17 Jun 2025 12:51:01 -0500 Subject: [PATCH] Refactor templates and utility functions for improved rendering and usability; enhance icon usage and link handling in various templates --- routes.py | 4 +- templates/fragments/_breadcrumb_fragment.html | 7 +- templates/fragments/_icon_fragment.html | 70 ++++++++++++------- templates/fragments/_link_fragment.html | 8 +++ templates/fragments/_table_fragment.html | 4 +- templates/inventory.html | 23 +++--- templates/inventory_index.html | 10 +-- templates/layout.html | 5 -- templates/search.html | 5 +- templates/user.html | 19 ++--- templates/worklog.html | 35 ++++++---- utils.py | 2 +- 12 files changed, 102 insertions(+), 90 deletions(-) diff --git a/routes.py b/routes.py index 48fb270..a99296b 100644 --- a/routes.py +++ b/routes.py @@ -308,8 +308,6 @@ def list_users(): @main.route("/user/") def user(id): - asset_page = request.args.get("asset_page", default=1, type=int) - worklog_page = request.args.get("worklog_page", default=1, type=int) users_query = db.session.query(User).order_by(User.first_name, User.last_name) users = eager_load_user_relationships(users_query).all() user = next((u for u in users if u.id == id), None) @@ -417,4 +415,4 @@ def search(): } } - return render_template('search.html', title="Database Search", results=results, query=query) + return render_template('search.html', title=f"Database Search ({query})" if query else "Database Search", results=results, query=query) diff --git a/templates/fragments/_breadcrumb_fragment.html b/templates/fragments/_breadcrumb_fragment.html index 22ba0c0..d080bd9 100644 --- a/templates/fragments/_breadcrumb_fragment.html +++ b/templates/fragments/_breadcrumb_fragment.html @@ -1,13 +1,12 @@ +{% import "fragments/_icon_fragment.html" as icons %} + {% macro breadcrumb_header(breadcrumbs=[], title=None, submit_button=False) %}