Skip to content

Gutyán Gábor / circlestack

Go to a project
Commit 178e1724 by Szabolcs Gelencser
Options

Fix logout button alignment

parent d5c96378
Showing with 60 additions and 56 deletions
circle/dashboard/templates/dashboard/base.html
...@@ -13,60 +13,63 @@ ...@@ -13,60 +13,63 @@
{% block navbar %} {% block navbar %}
{% if view.request.user.is_authenticated and view.request.user.pk and not view.request.token_user %} {% if view.request.user.is_authenticated and view.request.user.pk and not view.request.token_user %}
<span id="user-options" data-desktop_notifications="{{ request.user.profile.desktop_notifications }}"></span> {# <span id="user-options" data-desktop_notifications="{{ request.user.profile.desktop_notifications }}"></span>#}
<ul class="nav navbar-nav navbar-right" id="dashboard-menu"> <ul class="nav navbar-nav navbar-right" id="dashboard-menu">
{% if request.user.is_superuser %} {# {% if request.user.is_superuser %}#}
{% if ADMIN_ENABLED %} {# {% if ADMIN_ENABLED %}#}
<li> {# <li>#}
<a href="/admin/"> {# <a href="/admin/">#}
<i class="fa fa-cogs"></i> {# <i class="fa fa-cogs"></i>#}
<span class="hidden-sm">{% trans "Admin" %}</span> {# <span class="hidden-sm">{% trans "Admin" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
<li> {# <li>#}
<a href="/rosetta/"> {# <a href="/rosetta/">#}
<i class="fa fa-space-shuttle"></i> {# <i class="fa fa-space-shuttle"></i>#}
<span class="hidden-sm">{% trans "Translations" %}</span> {# <span class="hidden-sm">{% trans "Translations" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
{% endif %} {# {% endif %}#}
<li> {# <li>#}
<a href="{% url "dashboard.views.message-list" %}"> {# <a href="{% url "dashboard.views.message-list" %}">#}
<i class="fa fa-bullhorn"></i> {# <i class="fa fa-bullhorn"></i>#}
<span class="hidden-sm">{% trans "Messages" %}</span> {# <span class="hidden-sm">{% trans "Messages" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
<li> {# <li>#}
<a href="{% url "dashboard.views.storage" %}"> {# <a href="{% url "dashboard.views.storage" %}">#}
<i class="fa fa-database"></i> {# <i class="fa fa-database"></i>#}
<span class="hidden-sm">{% trans "Storage" %}</span> {# <span class="hidden-sm">{% trans "Storage" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
<li> {# <li>#}
<a href="{% url "network.index" %}"> {# <a href="{% url "network.index" %}">#}
<i class="fa fa-globe"></i> {# <i class="fa fa-globe"></i>#}
<span class="hidden-sm">{% trans "Network" %}</span> {# <span class="hidden-sm">{% trans "Network" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
<li> {# <li>#}
<a href="{% url "request.views.request-list" %}"> {# <a href="{% url "request.views.request-list" %}">#}
<i class="fa fa-phone"></i> {# <i class="fa fa-phone"></i>#}
<span class="hidden-sm">{% trans "Requests" %}</span> {# <span class="hidden-sm">{% trans "Requests" %}</span>#}
</a> {# </a>#}
</li> {# </li>#}
{% endif %} {# {% endif %}#}
{# <li>#}
{# <a href="{% url "dashboard.views.profile-preferences" %}">#} {# <li>#}
{# <i class="fa fa-user"></i>#} {# <a href="{% url "dashboard.views.profile-preferences" %}">#}
{# {% include "dashboard/_display-name.html" with user=request.user show_org=True %}#} {# <i class="fa fa-user"></i>#}
{# </a>#} {# {% include "dashboard/_display-name.html" with user=request.user show_org=True %}#}
{# </li>#} {# </a>#}
<li> {# </li>#}
<a href="{% url "logout" %}?next={% url "login" %}">
<i class="fa fa-sign-out"></i> {% trans "Log out" %} <li>
</a> <a href="{% url "logout" %}?next={% url "login" %}">
</li> <i class="fa fa-sign-out"></i> {% trans "Log out" %}
</a>
</li>
{# <li class="visible-xs">#} {# <li class="visible-xs">#}
{# <a href="{% url "dashboard.views.notifications" %}">#} {# <a href="{% url "dashboard.views.notifications" %}">#}
{# {% trans "Notifications" %}#} {# {% trans "Notifications" %}#}
...@@ -90,11 +93,12 @@ ...@@ -90,11 +93,12 @@
{# <li>{% trans "Loading..." %}</li>#} {# <li>{% trans "Loading..." %}</li>#}
{# </ul>#} {# </ul>#}
{# </li>#} {# </li>#}
{# <li class="hidden-xs">#} <li class="hidden-xs">
{# <a href="{% url "dashboard.views.profile-preferences" %}">#} {# TODO: link to preferences #}
<a>
{# <img class="profile-avatar" src="{{ request.user.profile.get_avatar_url }}" />#} {# <img class="profile-avatar" src="{{ request.user.profile.get_avatar_url }}" />#}
{# </a>#} </a>
{# </li>#} </li>
</ul> </ul>
{% else %} {% else %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment