Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f0d0b01b
authored
9 years ago
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/feature-gitlabheader'
Conflicts: circle/dashboard/static/dashboard/dashboard.less
parents
00fa79a8
4fbdb358
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
7 deletions
+43
-7
circle/dashboard/static/dashboard/dashboard.less
+28
-1
circle/dashboard/templates/dashboard/_display-name.html
+5
-0
circle/dashboard/templates/dashboard/_manage_access.html
+2
-2
circle/dashboard/templates/dashboard/base.html
+6
-1
circle/dashboard/templates/dashboard/group-detail.html
+1
-1
circle/dashboard/templates/dashboard/profile.html
+0
-1
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+1
-1
No files found.
circle/dashboard/static/dashboard/dashboard.less
View file @
f0d0b01b
...
...
@@ -10,6 +10,21 @@ html {
min-height: 100%;
}
.navbar-nav img {
width: 46px;
height: 46px;
margin-top: -4px;
}
.profile-avatar {
width: 24px;
height: 24px;
}
.navbar-fixed-top {
border: 0px;
}
/* Set widths on the navbar form inputs since otherwise they're 100% wide */
.navbar-form input[type="text"],
.navbar-form input[type="password"] {
...
...
@@ -32,7 +47,7 @@ html {
#dashboard-menu {
margin-right:
15
px;
margin-right:
0
px;
}
/* we need this for mobile view */
...
...
@@ -56,6 +71,9 @@ html {
padding-bottom: 12.5px;
}
#dashboard-menu > li:last-child > a {
padding: 4px 0 0 0;
}
}
.no-margin {
...
...
@@ -110,6 +128,11 @@ html {
background-color: black!important;
}
.timeline img{
border-radius: 50%;
margin-bottom: 2px;
}
.timeline a {
color: black;
}
...
...
@@ -1321,3 +1344,7 @@ textarea[name="new_members"] {
padding-top: 5px;
padding-bottom: 5px;
}
.acl-table td:first-child {
text-align: center;
}
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/_display-name.html
View file @
f0d0b01b
{% load i18n %}
{% if user and user.pk %}
{% 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 %}
...
...
@@ -10,4 +14,5 @@
({% trans "username" %}: {{ user.username }})
{% endif %}
{% endif %}
{% endif %}
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/_manage_access.html
View file @
f0d0b01b
{% load i18n %}
<form
action=
"{{ acl.url }}"
method=
"post"
>
{% csrf_token %}
<table
class=
"table table-striped table-with-form-fields"
id=
"{{table_id}}"
>
<table
class=
"table table-striped table-with-form-fields
acl-table
"
id=
"{{table_id}}"
>
<thead>
<tr>
<th></th>
...
...
@@ -13,7 +13,7 @@
{% for i in acl.users %}
<tr>
<td>
<i
class=
"fa fa-user"
></i
>
<img
class=
"profile-avatar"
src=
"{{ i.user.profile.get_avatar_url }}"
/
>
</td>
<td>
<a
href=
"{% url "
dashboard
.
views
.
profile
"
username=
i.user.username
%}"
...
...
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/base.html
View file @
f0d0b01b
...
...
@@ -84,9 +84,14 @@
{% endif %}
</a>
<ul
class=
"dropdown-menu"
id=
"notification-messages"
>
<li>
{% trans "Loading..." %}
</li>
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
<li
class=
"hidden-xs"
>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
<img
class=
"profile-avatar"
src=
"{{ user.profile.get_avatar_url }}"
/>
</a>
</li>
</ul>
{% else %}
...
...
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/group-detail.html
View file @
f0d0b01b
...
...
@@ -90,7 +90,7 @@
{% for i in users %}
<tr>
<td>
<i
class=
"fa fa-user"
></i
>
<i
mg
class=
"profile-avatar"
src=
"{{ i.profile.get_avatar_url}}"
/
>
</td>
<td>
<a
href=
"{% url "
dashboard
.
views
.
profile
"
username=
i.username
%}"
title=
"{{ i.username }}"
...
...
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/profile.html
View file @
f0d0b01b
...
...
@@ -24,7 +24,6 @@
{% trans "Back" %}
</a>
</div>
<h3
class=
"no-margin"
>
<i
class=
"fa fa-user"
></i>
{% include "dashboard/_display-name.html" with user=profile show_org=True %}
</h3>
</div>
...
...
This diff is collapsed.
Click to expand it.
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
f0d0b01b
...
...
@@ -21,7 +21,7 @@
</strong>
{% endspaceless %}{% if a.times
<
2
%}&
nbsp
;<
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 %}
...
...
This diff is collapsed.
Click to expand it.
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