Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
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
0193fba3
authored
Mar 12, 2015
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'profile-fixes' into 'master'
Profile fixes See merge request !305
parents
f6a6e14c
39af41bd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
circle/bower.json
+1
-1
circle/dashboard/static/dashboard/dashboard.less
+3
-1
circle/dashboard/templates/dashboard/profile.html
+12
-9
No files found.
circle/bower.json
View file @
0193fba3
...
...
@@ -12,7 +12,7 @@
],
"dependencies"
:
{
"bootstrap"
:
"~3.2.0"
,
"fontawesome"
:
"~4.
2
.0"
,
"fontawesome"
:
"~4.
3
.0"
,
"jquery"
:
"~2.1.1"
,
"no-vnc"
:
"*"
,
"jquery-knob"
:
"~1.2.9"
,
...
...
circle/dashboard/static/dashboard/dashboard.less
View file @
0193fba3
...
...
@@ -651,9 +651,11 @@ textarea[name="new_members"] {
padding-left: 28px;
}
.dashboard-profile-vm-list a, .dashboard-profile-vm-list a:hover {
.dashboard-profile-vm-list, .dashboard-profile-group-list {
a, a:hover {
text-decoration: none;
color: #555;
}
}
#group-detail-user-table td:nth-child(2) a,
...
...
circle/dashboard/templates/dashboard/profile.html
View file @
0193fba3
...
...
@@ -11,24 +11,28 @@
<div
class=
"col-md-{% if perms.auth.change_user %}8{% else %}12{% endif %}"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<div
class=
"pull-right"
>
{% if request.user.is_superuser %}
<a
href=
"{{ login_token }}"
class=
"pull-right btn btn-danger btn-xs"
<a
href=
"{{ login_token }}"
class=
"btn btn-danger btn-xs"
title=
"{% trans "
Log
in
as
this
user
.
Recommended
to
open
in
an
incognito
window
."
%}"
>
{% trans "Login as this user" %}
</a>
<i
class=
"fa fa-user-secret"
></i>
{% trans "Login as this user" %}
</a>
{% endif %}
<a
class=
"pull-right btn btn-default btn-xs"
href=
"{% url "
dashboard
.
views
.
user-list
"
%}"
>
{% trans "Back" %}
</a>
<a
class=
"btn btn-default btn-xs"
href=
"{% url "
dashboard
.
views
.
user-list
"
%}"
>
{% 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>
<div
class=
"panel-body"
>
<div>
<div
class=
"
"
style=
"float: left
"
>
<div
class=
"row"
>
<div
class=
"
col-sm-4
"
>
<img
id=
"dashboard-profile-avatar"
src=
"{{ avatar_url }}"
class=
"img-rounded"
/>
</div>
<div
class=
"
"
style=
"padding-left: 215px;
"
>
<div
class=
"
col-sm-8
"
>
<p>
{% trans "Username" %}: {{ profile.username }}
</p>
<p>
{% trans "Organization ID" %}: {{ profile.profile.org_id|default:"-" }}
</p>
<p>
{% trans "First name" %}: {{ profile.first_name|default:"-" }}
</p>
...
...
@@ -48,7 +52,6 @@
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
{% trans "Change my preferences" %}
</a>
{% endif %}
</div>
<div
class=
"clearfix"
></div>
</div>
{% if perm_group_list %}
...
...
@@ -58,7 +61,7 @@
</h4>
<ul
class=
"dashboard-profile-group-list"
>
{% for g in groups %}
<li>
{{ g.name }}
</li>
<li>
<a
href=
"{{ g.profile.get_absolute_url }}"
>
{{ g.name }}
</a>
</li>
{% empty %}
{% trans "This user is not in any group." %}
{% endfor %}
...
...
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