diff --git a/app/modules/partner_dashboard/templates/partner_dashboard/dashboard.html b/app/modules/partner_dashboard/templates/partner_dashboard/dashboard.html index b2bd9a8..a2c5594 100644 --- a/app/modules/partner_dashboard/templates/partner_dashboard/dashboard.html +++ b/app/modules/partner_dashboard/templates/partner_dashboard/dashboard.html @@ -1,9 +1,7 @@ {% extends "ui/templates/base/layout.html" %} {% block content %} -{% include "ui/templates/components/partner_navigation_v2.html" %} - -
-
+
+

Branch Operations Control Centre

@@ -16,132 +14,90 @@

-
+
- {% set tabs = [ - ('overview','Overview'), - ('branch-work','Branch Work'), - ('clients','Clients'), - ('staff','Staff'), - ('review','Review'), - ('billing','Billing'), - ('reports','Reports'), - ('wizards','Wizards') - ] %} + {# Dashboard sections are now part of the unified Partner Dashboard submenu. #} -
-
- - - - Dashboard Menu - - - Partner dashboard sections - - - - - -
- - -
- -
- {% include 'modules/partner_dashboard/templates/partner_dashboard/partials/' ~ (active_tab|replace('-', '_')) ~ '.html' ignore missing %} -
- +
+
Loading dashboard...
+
+ {% endblock %} diff --git a/app/ui/templates/components/partner_navigation_v2.html b/app/ui/templates/components/partner_navigation_v2.html index 9462fdc..1749353 100644 --- a/app/ui/templates/components/partner_navigation_v2.html +++ b/app/ui/templates/components/partner_navigation_v2.html @@ -1,19 +1,26 @@ {% if navigation_render_location_v2|default('page') == 'global-host' or not global_role_navigation_host_v2|default(false) %} {# - UI/UX V2 Phase 1D — Partner pilot navigation - - Presentation-only replacement for the existing partner tab strip. - Existing URLs, route protection, dashboard content, forms and page actions - are unchanged. + UI/UX V2 Phase 1D.5 — Unified Partner navigation. + Presentation only. Existing routes and route-level permissions remain authoritative. #} {% set _partner_path = request.url.path %} +{% set _partner_tab = request.query_params.get('tab', 'overview') %} {% set navigation_aria_label_v2 = 'Partner workspace navigation' %} {% set navigation_items_v2 = [ { 'label': 'Dashboard', - 'url': '/partner/dashboard', 'visible': true, - 'active': _partner_path == '/partner/dashboard' + 'active': _partner_path.startswith('/partner/dashboard'), + 'children': [ + {'label': 'Overview', 'url': '/partner/dashboard?tab=overview', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'overview'}, + {'label': 'Branch Work', 'url': '/partner/dashboard?tab=branch-work', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'branch-work'}, + {'label': 'Clients', 'url': '/partner/dashboard?tab=clients', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'clients'}, + {'label': 'Staff', 'url': '/partner/dashboard?tab=staff', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'staff'}, + {'label': 'Review', 'url': '/partner/dashboard?tab=review', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'review'}, + {'label': 'Billing', 'url': '/partner/dashboard?tab=billing', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'billing'}, + {'label': 'Reports', 'url': '/partner/dashboard?tab=reports', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'reports'}, + {'label': 'Wizards', 'url': '/partner/dashboard?tab=wizards', 'active': _partner_path.startswith('/partner/dashboard') and _partner_tab == 'wizards'} + ] }, { 'label': 'Review Board', @@ -54,8 +61,57 @@ } ] %} -
+
{% include "ui/templates/components/navigation_v2.html" %} {% include "ui/templates/components/mobile_navigation_v2.html" %}
+ + {% endif %} diff --git a/app/ui/templates/components/top_workspace_bar.html b/app/ui/templates/components/top_workspace_bar.html index 57528cf..f13ff01 100644 --- a/app/ui/templates/components/top_workspace_bar.html +++ b/app/ui/templates/components/top_workspace_bar.html @@ -1,4 +1,4 @@ -{% set _uiux_full_width_header = ('System Admin' in (ui_roles|default([], true))) or ('Firm Admin' in (ui_roles|default([], true))) %} +{% set _uiux_full_width_header = ('System Admin' in (ui_roles|default([], true))) or ('Firm Admin' in (ui_roles|default([], true))) or ('Partner' in (ui_roles|default([], true))) %}