Merge pull request #2558 from SchrodingersGat/user-menu-fix

Slight menu and icon tweaks
This commit is contained in:
Oliver 2022-01-19 15:17:17 +11:00 committed by GitHub
commit 688806b5d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -4,10 +4,10 @@
{% load plugin_extras %} {% load plugin_extras %}
{% trans "User Settings" as text %} {% trans "User Settings" as text %}
{% include "sidebar_header.html" with text=text icon='fa-user' %} {% include "sidebar_header.html" with text=text icon='fa-user-cog' %}
{% trans "Account Settings" as text %} {% trans "Account Settings" as text %}
{% include "sidebar_item.html" with label='account' text=text icon="fa-cog" %} {% include "sidebar_item.html" with label='account' text=text icon="fa-sign-in-alt" %}
{% trans "Display Settings" as text %} {% trans "Display Settings" as text %}
{% include "sidebar_item.html" with label='user-display' text=text icon="fa-desktop" %} {% include "sidebar_item.html" with label='user-display' text=text icon="fa-desktop" %}
{% trans "Home Page" as text %} {% trans "Home Page" as text %}

View File

@ -110,12 +110,12 @@
{% if user.is_staff and not demo %} {% if user.is_staff and not demo %}
<li><a class='dropdown-item' href="/admin/"><span class="fas fa-user-shield"></span> {% trans "Admin" %}</a></li> <li><a class='dropdown-item' href="/admin/"><span class="fas fa-user-shield"></span> {% trans "Admin" %}</a></li>
{% endif %} {% endif %}
<li><a class='dropdown-item' href="{% url 'settings' %}"><span class="fas fa-cog"></span> {% trans "Settings" %}</a></li>
<li><a class='dropdown-item' href="{% url 'account_logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li> <li><a class='dropdown-item' href="{% url 'account_logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li>
{% else %} {% else %}
<li><a class='dropdown-item' href="{% url 'account_login' %}"><span class="fas fa-sign-in-alt"></span> {% trans "Login" %}</a></li> <li><a class='dropdown-item' href="{% url 'account_login' %}"><span class="fas fa-sign-in-alt"></span> {% trans "Login" %}</a></li>
{% endif %} {% endif %}
<hr> <hr>
<li><a class='dropdown-item' href="{% url 'settings' %}"><span class="fas fa-cog"></span> {% trans "Settings" %}</a></li>
<li id='launch-stats'> <li id='launch-stats'>
<a class='dropdown-item' href='#'> <a class='dropdown-item' href='#'>
{% if system_healthy or not user.is_staff %} {% if system_healthy or not user.is_staff %}

View File

@ -3,6 +3,6 @@
<h6> <h6>
<i class="bi bi-bootstrap"></i> <i class="bi bi-bootstrap"></i>
{% if icon %}<span class='sidebar-item-icon fas {{ icon }}'></span>{% endif %} {% if icon %}<span class='sidebar-item-icon fas {{ icon }}'></span>{% endif %}
{% if text %}<span class='sidebar-item-text' style='display: none;'>{{ text }}</span>{% endif %} {% if text %}<span class='sidebar-item-text' style='display: none;'><strong>{{ text }}</strong></span>{% endif %}
</h6> </h6>
</span> </span>