Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
178e1724
authored
Mar 05, 2018
by
Szabolcs Gelencser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix logout button alignment
parent
d5c96378
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
56 deletions
+60
-56
.idea/workspace.xml
+0
-0
circle/dashboard/templates/dashboard/base.html
+60
-56
No files found.
.idea/workspace.xml
View file @
178e1724
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/base.html
View file @
178e1724
...
...
@@ -13,60 +13,63 @@
{% block navbar %}
{% 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"
>
{% if request.user.is_superuser %}
{% if ADMIN_ENABLED %}
<li>
<a
href=
"/admin/"
>
<i
class=
"fa fa-cogs"
></i>
<span
class=
"hidden-sm"
>
{% trans "Admin" %}
</span>
</a>
</li>
<li>
<a
href=
"/rosetta/"
>
<i
class=
"fa fa-space-shuttle"
></i>
<span
class=
"hidden-sm"
>
{% trans "Translations" %}
</span>
</a>
</li>
{% endif %}
<li>
<a
href=
"{% url "
dashboard
.
views
.
message-list
"
%}"
>
<i
class=
"fa fa-bullhorn"
></i>
<span
class=
"hidden-sm"
>
{% trans "Messages" %}
</span>
</a>
</li>
<li>
<a
href=
"{% url "
dashboard
.
views
.
storage
"
%}"
>
<i
class=
"fa fa-database"
></i>
<span
class=
"hidden-sm"
>
{% trans "Storage" %}
</span>
</a>
</li>
<li>
<a
href=
"{% url "
network
.
index
"
%}"
>
<i
class=
"fa fa-globe"
></i>
<span
class=
"hidden-sm"
>
{% trans "Network" %}
</span>
</a>
</li>
<li>
<a
href=
"{% url "
request
.
views
.
request-list
"
%}"
>
<i
class=
"fa fa-phone"
></i>
<span
class=
"hidden-sm"
>
{% trans "Requests" %}
</span>
</a>
</li>
{% endif %}
{#
<li>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
#}
{#
<i
class=
"fa fa-user"
></i>
#}
{# {% include "dashboard/_display-name.html" with user=request.user show_org=True %}#}
{#
</a>
#}
{#
</li>
#}
<li>
<a
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans "Log out" %}
</a>
</li>
{# {% if request.user.is_superuser %}#}
{# {% if ADMIN_ENABLED %}#}
{#
<li>
#}
{#
<a
href=
"/admin/"
>
#}
{#
<i
class=
"fa fa-cogs"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Admin" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{#
<li>
#}
{#
<a
href=
"/rosetta/"
>
#}
{#
<i
class=
"fa fa-space-shuttle"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Translations" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{# {% endif %}#}
{#
<li>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
message-list
"
%}"
>
#}
{#
<i
class=
"fa fa-bullhorn"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Messages" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{#
<li>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
storage
"
%}"
>
#}
{#
<i
class=
"fa fa-database"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Storage" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{#
<li>
#}
{#
<a
href=
"{% url "
network
.
index
"
%}"
>
#}
{#
<i
class=
"fa fa-globe"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Network" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{#
<li>
#}
{#
<a
href=
"{% url "
request
.
views
.
request-list
"
%}"
>
#}
{#
<i
class=
"fa fa-phone"
></i>
#}
{#
<span
class=
"hidden-sm"
>
{% trans "Requests" %}
</span>
#}
{#
</a>
#}
{#
</li>
#}
{# {% endif %}#}
{#
<li>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
#}
{#
<i
class=
"fa fa-user"
></i>
#}
{# {% include "dashboard/_display-name.html" with user=request.user show_org=True %}#}
{#
</a>
#}
{#
</li>
#}
<li>
<a
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans "Log out" %}
</a>
</li>
{#
<li
class=
"visible-xs"
>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
>
#}
{# {% trans "Notifications" %}#}
...
...
@@ -90,11 +93,12 @@
{#
<li>
{% trans "Loading..." %}
</li>
#}
{#
</ul>
#}
{#
</li>
#}
{#
<li
class=
"hidden-xs"
>
#}
{#
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
#}
<li
class=
"hidden-xs"
>
{# TODO: link to preferences #}
<a>
{#
<img
class=
"profile-avatar"
src=
"{{ request.user.profile.get_avatar_url }}"
/>
#}
{#
</a>
#}
{#
</li>
#}
</a>
</li>
</ul>
{% else %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment