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
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
101 deletions
+87
-101
.idea/workspace.xml
+32
-50
circle/dashboard/templates/dashboard/base.html
+55
-51
No files found.
.idea/workspace.xml
View file @
178e1724
...
...
@@ -2,29 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"1fbec8af-5a7c-40f9-b994-83ac07d1ae1d"
name=
"Default"
comment=
""
>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_alert_message.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_confirm.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_loading_inline.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_loading_modal.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_membership.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_modal.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_progress.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_script_loader.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_table_row.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/template.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/templates.html"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templatetags/__init__.py"
/>
<change
beforePath=
""
afterPath=
"$PROJECT_DIR$/circle/network/templatetags/horizon.py"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/bower.json"
afterPath=
"$PROJECT_DIR$/circle/bower.json"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/circle/settings/base.py"
afterPath=
"$PROJECT_DIR$/circle/circle/settings/base.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/static/dashboard/js/horizon.flatnetworktopology.js"
afterPath=
""
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/static/dashboard/js/horizon.networktopology.js"
afterPath=
""
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/static/dashboard/js/horizon.networktopologycommon.js"
afterPath=
""
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
afterPath=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/templates/network/editor.html"
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/editor.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/urls.py"
afterPath=
"$PROJECT_DIR$/circle/network/urls.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/views.py"
afterPath=
"$PROJECT_DIR$/circle/network/views.py"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -75,8 +54,8 @@
<file
leaf-file-name=
"base.html"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
17
"
>
<caret
line=
"
40"
column=
"52"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"52"
selection-end-line=
"40"
selection-end-column=
"52
"
/>
<state
relative-caret-position=
"
658
"
>
<caret
line=
"
99"
column=
"10"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"10"
selection-end-line=
"99"
selection-end-column=
"10
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -108,7 +87,7 @@
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/templates/base.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"6"
column=
"8"
lean-forward=
"
tru
e"
selection-start-line=
"6"
selection-start-column=
"8"
selection-end-line=
"6"
selection-end-column=
"8"
/>
<caret
line=
"6"
column=
"8"
lean-forward=
"
fals
e"
selection-start-line=
"6"
selection-start-column=
"8"
selection-end-line=
"6"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
...
...
@@ -126,8 +105,6 @@
</component>
<component
name=
"FindInProjectRecents"
>
<findStrings>
<find>
create(
</find>
<find>
pk
</find>
<find>
get_ab
</find>
<find>
vmdeta
</find>
<find>
instanc
</find>
...
...
@@ -156,6 +133,8 @@
<find>
editorvi
</find>
<find>
balloon
</find>
<find>
trans
</find>
<find>
profile-prefe
</find>
<find>
deleteviewb
</find>
</findStrings>
<replaceStrings>
<replace>
'ACTIVE'
</replace>
...
...
@@ -170,7 +149,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/circle/vm/models/common.py"
/>
<option
value=
"$PROJECT_DIR$/circle/firewall/models.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/models.py"
/>
<option
value=
"$PROJECT_DIR$/circle/vm/operations.py"
/>
...
...
@@ -193,7 +171,6 @@
<option
value=
"$PROJECT_DIR$/circle/network/models.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/index-vxlans.html"
/>
<option
value=
"$PROJECT_DIR$/circle/openstack_api/base.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/forms.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
/>
...
...
@@ -202,7 +179,6 @@
<option
value=
"$PROJECT_DIR$/circle/dashboard/views/vm.py"
/>
<option
value=
"$PROJECT_DIR$/circle/circle/settings/local.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/vm-detail/console.html"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_alert_message.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_confirm.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/horizon/client_side/_loading_inline.html"
/>
...
...
@@ -221,6 +197,9 @@
<option
value=
"$PROJECT_DIR$/circle/network/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/editor.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/views.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/views/user.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
/>
</list>
</option>
</component>
...
...
@@ -427,19 +406,20 @@
<editor
active=
"true"
/>
<layout>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980973"
sideWeight=
"0.4978701"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Messages"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"-1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.327818"
sideWeight=
"0.5021299"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3280757"
sideWeight=
"0.4978701"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3280757"
sideWeight=
"0.5234139"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Python Console"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.43023255"
sideWeight=
"0.43610224"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Coverage"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"-1"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
5021142"
sideWeight=
"0.46676737
"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.
89429176"
sideWeight=
"0.4659212
"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.21991481"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Docker"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"false"
weight=
"0.33"
sideWeight=
"0.5"
order=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32980973"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"SciView"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.2780127"
sideWeight=
"0.5332326
"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
false"
show_stripe_button=
"true"
weight=
"0.640592"
sideWeight=
"0.53407884
"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -602,22 +582,6 @@
</expressions>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"17"
>
<caret
line=
"52"
column=
"23"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"238"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/templates/dashboard/index-vxlans.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"204"
>
<caret
line=
"15"
column=
"49"
lean-forward=
"false"
selection-start-line=
"15"
selection-start-column=
"47"
selection-end-line=
"15"
selection-end-column=
"49"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/models.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"465"
>
...
...
@@ -987,7 +951,7 @@
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/templates/base.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"6"
column=
"8"
lean-forward=
"
tru
e"
selection-start-line=
"6"
selection-start-column=
"8"
selection-end-line=
"6"
selection-end-column=
"8"
/>
<caret
line=
"6"
column=
"8"
lean-forward=
"
fals
e"
selection-start-line=
"6"
selection-start-column=
"8"
selection-end-line=
"6"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
...
...
@@ -1028,10 +992,28 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/views/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"354"
>
<caret
line=
"79"
column=
"32"
lean-forward=
"false"
selection-start-line=
"79"
selection-start-column=
"32"
selection-end-line=
"79"
selection-end-column=
"32"
/>
<folding>
<element
signature=
"e#731#787#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"301"
>
<caret
line=
"138"
column=
"10"
lean-forward=
"false"
selection-start-line=
"138"
selection-start-column=
"10"
selection-end-line=
"138"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/templates/dashboard/base.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
17
"
>
<caret
line=
"
40"
column=
"52"
lean-forward=
"true"
selection-start-line=
"40"
selection-start-column=
"52"
selection-end-line=
"40"
selection-end-column=
"52
"
/>
<state
relative-caret-position=
"
658
"
>
<caret
line=
"
99"
column=
"10"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"10"
selection-end-line=
"99"
selection-end-column=
"10
"
/>
<folding
/>
</state>
</provider>
...
...
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>
#}
{# {% 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