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
919a6b13
authored
Mar 20, 2015
by
Oláh István Gergely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
templates: fix css issues, cleanup
parent
83580ad2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
17 deletions
+24
-17
circle/dashboard/static/dashboard/dashboard.less
+1
-1
circle/dashboard/templates/dashboard/_display-name.html
+5
-4
circle/dashboard/templates/dashboard/base.html
+17
-11
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+1
-1
No files found.
circle/dashboard/static/dashboard/dashboard.less
View file @
919a6b13
...
...
@@ -71,7 +71,7 @@ html {
padding-bottom: 12.5px;
}
.navbar-nav
> li:last-child > a {
#dashboard-menu
> li:last-child > a {
padding-top: 4px;
padding-bottom: 0px;
padding-right: 0px;
...
...
circle/dashboard/templates/dashboard/_display-name.html
View file @
919a6b13
{% load i18n %}
{% if user and user.pk %}
{% if user.profile %}
<img
class=
"profile-avatar"
src=
"{{ user.profile.get_avatar_url }}"
title=
"
{% endif %}
{% if show_pic %}
<img
class=
"profile-avatar"
src=
"{{ user.profile.get_avatar_url }}"
/>
{% endif%}
{% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}
<br
/>
{% endif %}
{% if show_org %}
...
...
@@ -13,5 +14,5 @@
({% trans "username" %}: {{ user.username }})
{% endif %}
{% endif %}
"
>
{% endif %}
circle/dashboard/templates/dashboard/base.html
View file @
919a6b13
...
...
@@ -47,7 +47,18 @@
</a>
</li>
{% endif %}
<li
class=
"visible-xs"
>
<li>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
<i
class=
"fa fa-user"
></i>
{% include "dashboard/_display-name.html" with user=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" %}
{% if NEW_NOTIFICATIONS_COUNT > 0 %}
...
...
@@ -70,17 +81,12 @@
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
<li>
<a
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans "Log out" %}
</a>
</li>
<li>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
{% include "dashboard/_display-name.html" with user=user show_org=True %}
</a>
<li>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
<img
class=
"profile-avatar"
src=
"{{ user.profile.get_avatar_url }}"
/>
</a>
</li>
</ul>
</ul>
{% else %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
login
"
%}?
next=
{{
request
.
path
}}"
><i
class=
"fa fa-sign-in"
></i>
{% trans "Log in " %}
</a>
...
...
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
919a6b13
...
...
@@ -21,7 +21,7 @@
</strong>
{% endspaceless %}{% if a.times
<
2
%}
<
span
title=
"{{ a.started }}"
>
{{ a.started|arrowfilter:LANGUAGE_CODE }}
</span>
{% endif %}{% if a.user %},
<a
class=
"no-style-link"
href=
"{% url "
dashboard
.
views
.
profile
"
username=
a.user.username
%}"
>
{% include "dashboard/_display-name.html" with user=a.user show_org=True %}
{% include "dashboard/_display-name.html" with user=a.user show_org=True
show_pic=True
%}
</a>
{% endif %}
{% if a.is_abortable_for_user %}
...
...
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