Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
a327c462
Commit
a327c462
authored
Jan 02, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'github/dev' into dev
parents
720dc9ab
25fa392d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
64 additions
and
30 deletions
+64
-30
jumpserver.css
apps/static/css/jumpserver.css
+34
-0
_header_bar.html
apps/templates/_header_bar.html
+22
-3
_user_profile.html
apps/templates/_user_profile.html
+8
-27
No files found.
apps/static/css/jumpserver.css
View file @
a327c462
...
@@ -289,4 +289,37 @@ div.dataTables_wrapper div.dataTables_filter {
...
@@ -289,4 +289,37 @@ div.dataTables_wrapper div.dataTables_filter {
margin-bottom
:
0
;
margin-bottom
:
0
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-right
:
10px
margin-right
:
10px
}
.navbar-default
{
background-color
:
#2f4050
;
border-color
:
#2f4050
;
}
.nav-header
,
body
.mini-navbar
.nav-header
{
padding
:
0
;
background
:
#202c37
;
}
.profile-element
div
:first-child
{
line-height
:
60px
;
width
:
70px
;
float
:
left
;
text-align
:
center
;
}
.profile-element
div
:last-child
{
line-height
:
60px
;
width
:
150px
;
float
:
left
;
font-size
:
22px
;
color
:
#1ab394
;
}
.logo-element
{
padding
:
10px
0
;
}
.welcome-message
img
{
margin
:
-11px
0
;
}
}
\ No newline at end of file
apps/templates/_header_bar.html
View file @
a327c462
...
@@ -18,11 +18,30 @@
...
@@ -18,11 +18,30 @@
<span
class=
"m-r-sm text-muted welcome-message"
>
{% trans 'Help' %}
</span>
<span
class=
"m-r-sm text-muted welcome-message"
>
{% trans 'Help' %}
</span>
</a>
</a>
</li>
</li>
<li>
<li
class=
"dropdown"
>
{% if user.is_authenticated %}
{% if user.is_authenticated %}
<a
href=
"{% url 'users:logout' %}"
>
<a
data-toggle=
"dropdown"
class=
"dropdown-toggle"
href=
"#"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans 'Logout' %}
<span
class=
"m-r-sm text-muted welcome-message"
>
<img
alt=
"image"
class=
"img-circle"
width=
"40"
height=
"40"
src=
"{{ request.user.avatar_url }}"
/>
<strong
class=
"font-bold"
>
{{ request.user.name }}
<span
style=
"color: #8095a8"
></span>
<b
class=
"caret"
></b>
</strong>
</span>
</a>
</a>
<ul
class=
"dropdown-menu animated fadeInRight m-t-xs"
>
<li><a
href=
"{% url 'users:user-profile' %}"
>
{% trans 'Profile' %}
</a></li>
<li><a
href=
"{% url 'users:user-profile-update' %}"
>
{% trans 'Profile settings' %}
</a></li>
<li
class=
"divider"
></li>
{% if request.user.is_superuser %}
{% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
<li><a
id=
"switch_admin"
>
{% trans 'Admin page' %}
</a></li>
{% else %}
<li><a
id=
"switch_user"
>
{% trans 'User page' %}
</a></li>
{% endif %}
{% endif %}
<li><a
href=
"{% url 'users:logout' %}"
>
{% trans 'Logout' %}
</a></li>
</ul>
{% else %}
{% else %}
<a
href=
"{% url 'users:login' %}"
>
<a
href=
"{% url 'users:login' %}"
>
<i
class=
"fa fa-sign-in"
></i>
{% trans 'Login' %}
<i
class=
"fa fa-sign-in"
></i>
{% trans 'Login' %}
...
...
apps/templates/_user_profile.html
View file @
a327c462
...
@@ -2,35 +2,16 @@
...
@@ -2,35 +2,16 @@
{% load i18n %}
{% load i18n %}
<li
class=
"nav-header"
>
<li
class=
"nav-header"
>
<div
class=
"dropdown profile-element"
>
<div
class=
"dropdown profile-element"
>
<span>
<div>
<img
alt=
"image"
class=
"img-circle"
width=
"48"
height=
"48"
src=
"{{ request.user.avatar_url }}"
/>
<img
alt=
"image"
height=
"40"
src=
"/static/img/logo.png"
/>
</span>
</div>
<a
data-toggle=
"dropdown"
class=
"dropdown-toggle"
href=
"#"
>
<div>
<span
class=
"clear"
>
<span>
Jumpserver
</span>
<span
class=
"block m-t-xs"
>
</div>
<strong
class=
"font-bold"
>
{{ request.user.name }}
<span
style=
"color: #8095a8"
></span></strong>
</span>
<span
class=
"text-muted text-xs block"
>
{{ request.user.get_role_display | default:_('User') }}
<b
class=
"caret"
></b>
</span>
</span>
</a>
<ul
class=
"dropdown-menu animated fadeInRight m-t-xs"
>
<li><a
href=
"{% url 'users:user-profile' %}"
>
{% trans 'Profile' %}
</a></li>
<li><a
href=
"{% url 'users:user-profile-update' %}"
>
{% trans 'Profile settings' %}
</a></li>
<li
class=
"divider"
></li>
{% if request.user.is_superuser %}
{% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
<li><a
id=
"switch_admin"
>
{% trans 'Admin page' %}
</a></li>
{% else %}
<li><a
id=
"switch_user"
>
{% trans 'User page' %}
</a></li>
{% endif %}
{% endif %}
<li><a
href=
"{% url 'users:logout' %}"
>
{% trans 'Logout' %}
</a></li>
</ul>
</div>
</div>
<div
class=
"clearfix"
></div>
<div
class=
"logo-element"
>
<div
class=
"logo-element"
>
JMS
<img
alt=
"image"
height=
"40"
src=
"/static/img/logo.png"
/>
</div>
</div>
</li>
</li>
<script>
<script>
...
...
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