diff --git a/app/modules/consultants/templates/consultants/portal_dashboard.html b/app/modules/consultants/templates/consultants/portal_dashboard.html index c1d3df2..d4aa5a1 100644 --- a/app/modules/consultants/templates/consultants/portal_dashboard.html +++ b/app/modules/consultants/templates/consultants/portal_dashboard.html @@ -18,21 +18,7 @@ -
- {% set tabs = [ - ('overview','Overview'), - ('work-centre','Work Centre'), - ('clients-requests','Clients & Requests'), - ('documents-clarifications','Documents & Clarifications'), - ('reports','Reports') - ] %} -
- {% for code, label in tabs %} - - {% endfor %} -
-
- + {# Dashboard sections are now available from the global Consultant Dashboard menu. #}
{% if active_tab == 'work-centre' %} {% include "modules/consultants/templates/consultants/portal_partials/work_centre.html" %} @@ -50,24 +36,10 @@ {% endblock %} diff --git a/app/ui/templates/components/consultant_navigation_v2.html b/app/ui/templates/components/consultant_navigation_v2.html index 5e6f627..d6d600e 100644 --- a/app/ui/templates/components/consultant_navigation_v2.html +++ b/app/ui/templates/components/consultant_navigation_v2.html @@ -1,19 +1,23 @@ {% if navigation_render_location_v2|default('page') == 'global-host' or not global_role_navigation_host_v2|default(false) %} {# - UI/UX V2 Phase 1C — Consultant pilot navigation - - This component preserves the existing consultant portal URLs and visibility. - It changes presentation only and does not grant access, change routes, or - replace the consultant dashboard's existing AJAX content tabs. + UI/UX V2 Phase 1C.3 — Unified Consultant navigation. + Presentation only. Existing routes and route-level permissions remain authoritative. #} {% set _consultant_path = request.url.path %} +{% set _consultant_tab = request.query_params.get('tab', 'overview') %} {% set navigation_aria_label_v2 = 'Consultant workspace navigation' %} {% set navigation_items_v2 = [ { 'label': 'Dashboard', - 'url': '/consultant/dashboard', 'visible': true, - 'active': _consultant_path == '/consultant/dashboard' + 'active': _consultant_path.startswith('/consultant/dashboard'), + 'children': [ + {'label': 'Overview', 'url': '/consultant/dashboard?tab=overview', 'active': _consultant_path.startswith('/consultant/dashboard') and _consultant_tab == 'overview'}, + {'label': 'Work Centre', 'url': '/consultant/dashboard?tab=work-centre', 'active': _consultant_path.startswith('/consultant/dashboard') and _consultant_tab == 'work-centre'}, + {'label': 'Clients & Requests', 'url': '/consultant/dashboard?tab=clients-requests', 'active': _consultant_path.startswith('/consultant/dashboard') and _consultant_tab == 'clients-requests'}, + {'label': 'Documents & Clarifications', 'url': '/consultant/dashboard?tab=documents-clarifications', 'active': _consultant_path.startswith('/consultant/dashboard') and _consultant_tab == 'documents-clarifications'}, + {'label': 'Reports', 'url': '/consultant/dashboard?tab=reports', 'active': _consultant_path.startswith('/consultant/dashboard') and _consultant_tab == 'reports'} + ] }, { 'label': 'Work', @@ -66,8 +70,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 99d3827..d816d6d 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))) or ('Partner' in (ui_roles|default([], true))) or ('Manager' in (ui_roles|default([], true))) or ('Branch Manager' in (ui_roles|default([], true))) or ('Staff' in (ui_roles|default([], true))) or ('Employee' in (ui_roles|default([], true))) or ('Client' 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))) or ('Manager' in (ui_roles|default([], true))) or ('Branch Manager' in (ui_roles|default([], true))) or ('Staff' in (ui_roles|default([], true))) or ('Employee' in (ui_roles|default([], true))) or ('Client' in (ui_roles|default([], true))) or ('Consultant' in (ui_roles|default([], true))) %}