修改Logo

This commit is contained in:
q4speed
2018-01-02 17:07:00 +08:00
parent bf34c2e320
commit 8160425672
5 changed files with 50 additions and 134 deletions

View File

@@ -289,4 +289,29 @@ div.dataTables_wrapper div.dataTables_filter {
margin-bottom:0;
margin-left: 10px;
margin-right: 10px
}
.navbar-default {
background-color: #2f4050;
border-color: #2f4050;
}
.nav-header {
padding: 0;
background: #202c37;
}
.profile-element {
margin-left: 20px;
}
.profile-element div {
line-height: 60px;
float: left;
font-size: 22px;
color: #1ab394;
}
.profile-element div + div {
margin-left: 5px;
}

View File

@@ -18,11 +18,26 @@
<span class="m-r-sm text-muted welcome-message">{% trans 'Help' %}</span>
</a>
</li>
<li>
<li class="dropdown">
{% if user.is_authenticated %}
<a href="{% url 'users:logout' %}">
<i class="fa fa-sign-out"></i>{% trans 'Logout' %}
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
<span class="m-r-sm text-muted welcome-message">
<strong class="font-bold"> {{ request.user.name }}<span style="color: #8095a8"></span></strong><b class="caret"></b>
</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>
{% else %}
<a href="{% url 'users:login' %}">
<i class="fa fa-sign-in"></i>{% trans 'Login' %}

View File

@@ -2,36 +2,14 @@
{% load i18n %}
<li class="nav-header">
<div class="dropdown profile-element">
<span>
<img alt="image" class="img-circle" width="48" height="48" src="{{ request.user.avatar_url }}"/>
</span>
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
<span class="clear">
<span class="block m-t-xs">
<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 class="logo-element">
JMS
<div>
<img alt="image" height="40" src="/static/img/logo.png"/>
</div>
<div>
<span>Jumpserver</span>
</div>
</div>
<div class="clearfix"></div>
</li>
<script>
$(document).ready(function () {