Skip to content

J
jumpserver
Commit 81604256 authored by q4speed's avatar q4speed
Browse files
Options

修改Logo

parent bf34c2e3
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 134 deletions
apps/static/css/jumpserver.css
View file @ 81604256
...@@ -289,4 +289,29 @@ div.dataTables_wrapper div.dataTables_filter { ...@@ -289,4 +289,29 @@ 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 {
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;
} }
\ No newline at end of file
apps/templates/_header_bar.html
View file @ 81604256
...@@ -18,11 +18,26 @@ ...@@ -18,11 +18,26 @@
<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">
<strong class="font-bold"> {{ request.user.name }}<span style="color: #8095a8"></span></strong><b class="caret"></b>
</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 @ 81604256
...@@ -2,36 +2,14 @@ ...@@ -2,36 +2,14 @@
{% 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 class="logo-element">
JMS
</div> </div>
<div class="clearfix"></div>
</li> </li>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
......
jumpserver/apps/templates/_header_bar.html deleted 100644 → 0
View file @ bf34c2e3
{% load i18n %}
<div class="row border-bottom">
<nav class="navbar navbar-static-top white-bg" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
<form role="search" class="navbar-form-custom" method="get" action="">
<div class="form-group">
<input type="text" placeholder="{% trans 'Search' %}..." class="form-control" name="search" id="top-search">
</div>
</form>
</div>
<ul class="nav navbar-top-links navbar-right">
<li>
<span class="m-r-sm text-muted welcome-message">{% trans 'Welcome to use Jumpserver system' %}</span>
</li>
<li class="dropdown">
<a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
<span class="m-r-sm text-muted welcome-message">{% trans 'Help' %}</span>
</a>
</li>
<li class="dropdown">
{% if user.is_authenticated %}
<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' %}
</a>
{% endif %}
</li>
</ul>
</nav>
</div>
<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-sm-10">
<h2></h2>
<ol class="breadcrumb">
<li>
<a href="">{% trans 'Dashboard' %}</a>
</li>
<li>
{% if app %}
<a>{{ app }}</a>
{% endif %}
</li>
{% if action %}
<li class="active">
<strong>{{ action }}</strong>
</li>
{% endif %}
</ol>
</div>
<div class="col-sm-2">
</div>
</div>
jumpserver/apps/templates/_user_profile.html deleted 100644 → 0
View file @ bf34c2e3
{% load static %}
{% load i18n %}
<li class="nav-header">
<div class="dropdown profile-element">
<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 () {
})
.on('click', '#switch_admin', function () {
setTimeout(function () {
setCookie("IN_ADMIN_PAGE", "Yes");
window.location = "/"
}, 100)
})
.on('click', '#switch_user', function () {
setTimeout(function () {
console.log("Set to No");
setCookie("IN_ADMIN_PAGE", "No");
window.location = "/"
}, 100);
})
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment