Skip to content
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.

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

task/FP-1886: Remove My Account from pulldown at the top right #723

Merged
merged 2 commits into from
Oct 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion server/portal/settings/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,8 @@ def gettext(s): return s # noqa:E731
'PORTAL_ICON_FILENAME',
'DEBUG',
'GOOGLE_ANALYTICS_PROPERTY_ID',
'PORTAL_NAMESPACE'
'PORTAL_NAMESPACE',
'WORKBENCH_SETTINGS'
]

"""
Expand Down
2 changes: 1 addition & 1 deletion server/portal/templates/includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{# NOTE: As of 2020-12, search is only available with a Portal #}
{% include "includes/nav_search.html" with className="form-inline ml-auto" only %}
{# FAQ: Unlike CMS and User Guide, we must pass `user` #}
{% include "includes/nav_portal.html" with className="navbar-nav" user=user only %}
{% include "includes/nav_portal.html" with className="navbar-nav" user=user settings=settings only %}
wesleyboar marked this conversation as resolved.
Show resolved Hide resolved


</div>
Expand Down
4 changes: 4 additions & 0 deletions server/portal/templates/includes/nav_portal.raw.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{# @var user #}
{# @var settings #}
wesleyboar marked this conversation as resolved.
Show resolved Hide resolved

<!-- FAQ: This template loads independently at a unique url (see `urls.py`)
so CMS and User Guide can render this markup into their markup. -->

Expand Down Expand Up @@ -32,9 +34,11 @@
<i class="icon icon-approved-boxed"></i> Onboarding Admin
</a>
{% endif %}
{% if not settings.WORKBENCH_SETTINGS.hideManageAccount %}
<a class="dropdown-item" href="{% url 'portal_accounts:manage_profile' %}">
<i class="icon icon-user"></i> My Account
</a>
{% endif %}
{% if user.is_impersonate %}
<a class="dropdown-item" href="{% url 'impersonate-stop' %}">
<i class="icon icon-user-reverse"></i> Stop impersonating {{user.get_username}}
Expand Down