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.

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

Jump to bottom

Refactor user dropdown logic into reusable component #1386

Merged
merged 7 commits into from
Apr 11, 2024
Merged

Refactor user dropdown logic into reusable component #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b2a7127
Rebase dev
gromdimon Mar 19, 2024
e6aae93
wip
gromdimon Mar 7, 2024
935eb51
cleanup
gromdimon Mar 7, 2024
33cc92a
Rebase dev
gromdimon Mar 19, 2024
5e7b11d
add tests
gromdimon Mar 19, 2024
f8de949
refactoring changes
gromdimon Mar 27, 2024
66f34b5
second refactoring
gromdimon Apr 10, 2024
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
98 changes: 19 additions & 79 deletions projectroles/templates/projectroles/_site_titlebar_dropdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,16 @@
{% get_django_setting 'PROJECTROLES_KIOSK_MODE' as kiosk_mode %}

{# Responsive replacement for user dropdown #}

{# Admin link #}
{% if request.user.is_superuser %}
<li class="nav-item sodar-navbar-alt-item">
<a class="nav-link" href="{% url 'admin:index' %}"
id="sodar-navbar-link-admin" target="_blank">
<i class="iconify" data-icon="mdi:cogs"></i> Admin
{% get_user_links request as dropdown_links %}
{% for link in dropdown_links %}
<li class="nav-item sodar-navbar-alt-item {% if link.active %}active{% endif %}">
<a class="nav-link {% if link.name == 'sign-out' %}text-danger{% endif %}
{% if link.name == 'sign-in' %}text-white{% endif %}"
href="{{ link.url }}"
id="sodar-navbar-nav-link-{{ link.name }}">
<i class="iconify" data-icon="{{ link.icon }}"></i> {{ link.label }}
</a>
</li>
{% endif %}

{# Site-wide apps #}
{% for plugin in site_apps %}
{% has_perm plugin.app_permission request.user as can_view_app %}
{% if not plugin.app_permission or can_view_app %}
<li class="nav-item sodar-navbar-alt-item {% get_app_link_state plugin request.resolver_match.app_name request.resolver_match.url_name %}">
<a class="nav-link"
href="{% url plugin.entry_point_url_id %}"
id="sodar-navbar-siteapp-link-{{ plugin.name }}">
<i class="iconify" data-icon="{{ plugin.icon }}"></i> {{ plugin.title }}</a>
</li>
{% endif %}
{% endfor %}

{# Log out link #}
{% if request.user.is_authenticated %}
<li class="nav-item sodar-navbar-alt-item">
<a class="nav-link text-danger"
href="{% url 'logout' %}"
id="sodar-alt-nav-link-sign-out">
<i class="iconify" data-icon="mdi:logout-variant"></i> Logout
</a>
</li>
{% elif not kiosk_mode %}
<li class="nav-item sodar-navbar-alt-item">
<a class="nav-link text-white"
href="{% url 'login' %}"
id="sodar-alt-nav-link-sign-in">
<i class="iconify" data-icon="mdi:login-variant"></i> Login
</a>
</li>
{% endif %}

{# Actual user dropdown #}

<li class="nav-item sodar-navbar-user-dropdown">
Expand Down Expand Up @@ -75,45 +42,18 @@
</div>
<div class="dropdown-divider"></div>

{# Site-wide apps #}
{% for plugin in site_apps %}
{% has_perm plugin.app_permission request.user as can_view_app %}
{% if not plugin.app_permission or can_view_app %}
<a class="dropdown-item {% get_app_link_state plugin request.resolver_match.app_name request.resolver_match.url_name %}"
href="{% url plugin.entry_point_url_id %}"
id="sodar-navbar-siteapp-link-{{ plugin.name }}">
<i class="iconify" data-icon="{{ plugin.icon }}"></i> {{ plugin.title }}
</a>
{% get_user_links request as dropdown_links %}
{% for link in dropdown_links %}
{% if link.name == 'admin' or link.name == 'sign-out' or link.name == 'sign-in' %}
<div class="dropdown-divider"></div>
{% endif %}
{% endfor %}
{% if site_apps|length > 0 %}
<div class="dropdown-divider"></div>
{% endif %}

{# Admin link #}
{% if request.user.is_superuser %}
<a class="dropdown-item"
href="#"
id="sodar-navbar-link-admin-warning"
data-toggle="modal" data-target="#sodar-modal">
<i class="iconify" data-icon="mdi:cogs"></i> Django Admin
</a>
<div class="dropdown-divider"></div>
{% endif %}

{# Log out / log in links #}
{% if request.user.is_authenticated %}
<a class="dropdown-item text-danger"
href="{% url 'logout' %}"
id="sodar-navbar-link-logout">
<i class="iconify" data-icon="mdi:logout-variant"></i> Logout
<a class="dropdown-item {% if link.active %}active{% endif %}
{% if link.name == 'sign-out' %}text-danger{% endif %}
{% if link.name == 'sign-in' %}text-primary{% endif %}"
href="{{ link.url }}"
id="sodar-navbar-link-{{ link.name }}">
<i class="iconify" data-icon="{{ link.icon }}"></i> {{ link.label }}
</a>
{% else %}
<a class="dropdown-item text-primary"
href="{% url 'login' %}"
id="sodar-navbar-link-login">
<i class="iconify" data-icon="mdi:login-variant"></i> Login
</a>
{% endif %}
{% endfor %}
</div>
</li>
8 changes: 7 additions & 1 deletion projectroles/templatetags/projectroles_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@


register = template.Library()
app_links = AppLinkContent()
app_settings = AppSettingAPI()


Expand Down Expand Up @@ -270,8 +271,13 @@ def get_admin_warning():
return ret


@register.simple_tag
def get_user_links(request):
"""Return user dropdown links"""
return app_links.get_user_links(request)


@register.simple_tag
def get_project_app_links(request, project=None):
"""Return sidebar links"""
app_links = AppLinkContent()
return app_links.get_project_app_links(request, project)
Loading
Loading