wip

bihealth · Mar 19, 2024 · 35e24d7 · 35e24d7
1 parent 0fa83c3
commit 35e24d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 85 deletions.
diff --git a/projectroles/templates/projectroles/_site_titlebar_dropdown.html b/projectroles/templates/projectroles/_site_titlebar_dropdown.html
@@ -5,48 +5,6 @@
 {% 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#}
-{#    </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 %}#}
 {% 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 %}">
@@ -84,47 +42,6 @@
     </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>#}
-{#      {% 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>#}
-{#    {% 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 %}#}
-
     {% get_user_links request as dropdown_links %}
     {% for link in dropdown_links %}
       <a class="dropdown-item {% if link.active %}active{% endif %}

diff --git a/projectroles/utils.py b/projectroles/utils.py
@@ -306,6 +306,7 @@ class UserDropdownContent:
     """Class to generate user dropdown content"""
 
     def get_user_links(self, request):
+        """Return user links for the user dropdown"""
         links = []
         # Add site-wide apps links
         site_apps = get_active_plugins('site_app')
@@ -334,7 +335,7 @@ def get_user_links(self, request):
                     'active': request.path == reverse('admin:index'),
                 }
             )
-        # Add log out link
+        # Add log out / sign in link
         if request.user.is_authenticated:
             links.append(
                 {
@@ -355,5 +356,4 @@ def get_user_links(self, request):
                     'active': False,
                 }
             )
-        print(links)
         return links