github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

修改该bug

pull/6/head
guanghongwei 2015-04-11 12:52:17 +08:00
parent 78f00e5c5f
commit 3b00cfa97d
8 changed files with 91 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jumpserver/templatetags/mytags.py
View File

@ -221,6 +221,17 @@ def to_name(user_id):
return '闈炴硶鐢ㄦ埛'
@register.filter(name='to_dept_name')
def to_dept_name(user_id):
try:
user = User.objects.filter(id=int(user_id))
if user:
user = user[0]
return user.dept.name
except:
return '闈炴硶閮ㄩ棬'
@register.filter(name='to_role_name')
def to_role_name(role_id):
role_dict = {'0': '鏅氱敤鎴', '1': '閮ㄩ棬绠＄悊鍛', '2': '瓒呯骇绠＄悊鍛'}

4
jumpserver/urls.py
View File

@ -10,8 +10,8 @@ urlpatterns = patterns('',
(r'^base/$', 'jumpserver.views.base'),
(r'^login/$', 'jumpserver.views.login'),
(r'^logout/$', 'jumpserver.views.logout'),
(r'^upload/$', 'jumpserver.views.upload'),
(r'^download/$', 'jumpserver.views.download'),
(r'^file/upload/$', 'jumpserver.views.upload'),
(r'^file/download/$', 'jumpserver.views.download'),
(r'^juser/', include('juser.urls')),
(r'^jasset/', include('jasset.urls')),
(r'^jlog/', include('jlog.urls')),

4
jumpserver/views.py
View File

@ -287,6 +287,10 @@ def install(request):
return HttpResponse('Ok')
def download(request):
return render_to_response('download.html', locals(), context_instance=RequestContext(request))
def transfer(sftp, filenames):
# pool = Pool(processes=5)
for filename, file_path in filenames.items():

39
templates/download.html Normal file
View File

@ -0,0 +1,39 @@
{% extends 'base.html' %}
{% load mytags %}
{% block content %}
{% include 'nav_cat_bar.html' %}
<div class="wrapper wrapper-content animated fadeIn">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>涓嬭浇鏂囦欢</h5>
<div class="ibox-tools">
<a class="collapse-link">
<i class="fa fa-chevron-up"></i>
</a>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-wrench"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li><a href="#">Config option 1</a>
</li>
<li><a href="#">Config option 2</a>
</li>
</ul>
<a class="close-link">
<i class="fa fa-times"></i>
</a>
</div>
</div>
<div class="ibox-content">
<h2>涓嬭浇鏂囦欢鍙仈绯荤鐞嗗憳鍦ㄦ湇鍔″櫒瀹夎lrzsz锛浣跨敤sz鍛戒护涓嬭浇銆 </h2>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

4
templates/foot_script.html
View File

@ -33,4 +33,8 @@
if($("."+str1).length>0) {
$("."+str1).addClass('active');
}
if(str.length==0){
$("#index").addClass('active');
}
</script>

20
templates/jperm/dept_perm_edit.html
View File

@ -2,20 +2,22 @@
{% load mytags %}
{% block content %}
{% include 'nav_cat_bar.html' %}
<script>
function filter_ip(text, noselect, total){
alert(text);
<script type="text/javascript">
function search_ip(text, noselect, total){
$("#" + noselect).children().each(
function(){
$(this).remove();
});
$("#" + total).children().each(function{
if ($(this).text().search(text) != -1){
$("#" + total).children().each(function(){
if($(this).text().search(text) != -1){
$("#" + noselect).append($(this).clone())
}
})
}
</script>
<div class="wrapper wrapper-content animated fadeInRight">
@ -23,7 +25,7 @@ function filter_ip(text, noselect, total){
<div class="col-lg-10">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5> 閮ㄩ棬鎺堟潈娣诲姞 </h5>
<h5> 閮ㄩ棬鎺堟潈缂栬緫 </h5>
<div class="ibox-tools">
<a class="collapse-link">
<i class="fa fa-chevron-up"></i>
@ -77,12 +79,12 @@ function filter_ip(text, noselect, total){
<div class="form-group">
<label for="group_name" class="col-sm-2 control-label">杩囨护</label>
<div class="col-sm-4">
<input id="noselect" class="form-control" onchange="filter_ip(this.value, 'assets', 'assets_total')">
<input id="noselect" class="form-control" oninput="search_ip(this.value, 'assets', 'assets_total')">
</div>
<div class="col-sm-1">
</div>
<div id="select" class="col-sm-3">
<input class="form-control">
<input class="form-control" oninput="search_ip(this.value, 'asset_select', 'asset_select_total')">
</div>
</div>
@ -101,7 +103,7 @@ function filter_ip(text, noselect, total){
<div class="col-sm-1">
<div class="btn-group" style="margin-top: 60px;">
<button type="button" class="btn btn-white" onclick="move('assets', 'asset_select')"><i class="fa fa-chevron-right"></i></button>
<button type="button" class="btn btn-white" onclick="move('assets', 'asset_select' )"><i class="fa fa-chevron-right"></i></button>
<button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button>
</div>
</div>

12
templates/nav.html
View File

@ -3,7 +3,7 @@
<div class="sidebar-collapse">
<ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %}
<li>
<li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span><span class="label label-info pull-right"></span></a>
<!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@ -74,7 +74,7 @@
<div class="sidebar-collapse">
<ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %}
<li>
<li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span><span class="label label-info pull-right"></span></a>
<!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
@ -133,7 +133,7 @@
<div class="sidebar-collapse">
<ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %}
<li>
<li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">浠〃鐩</span><span class="label label-info pull-right"></span></a>
</li>
<li class="user_detail">
@ -153,11 +153,11 @@
<a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">鐧诲綍鍘嗗彶</span><span class="label label-info pull-right"></span></a>
</li>
<li>
<li id="file">
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">涓婁紶涓嬭浇</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li><a href="/upload/">鏂囦欢涓婁紶</a></li>
<li><a href="/download/">鏂囦欢涓嬭浇</a></li>
<li class="upload"><a href="/file/upload/">鏂囦欢涓婁紶</a></li>
<li class="download"><a href="/file/download/">鏂囦欢涓嬭浇</a></li>
</ul>
</li>

20
templates/nav_li_profile.html
View File

@ -1,12 +1,19 @@
{% load mytags %}
<li class="nav-header">
<div class="dropdown profile-element"> <span>
<img alt="image" class="img-circle" width="48" height="48" src="/static/img/{{ session_role_id | to_avatar }}.png" />
{# <img alt="image" class="img-circle" src="/static/img/profile_small.jpg">#}
</span>
<div class="dropdown profile-element">
<span>
<img alt="image" class="img-circle" width="48" height="48" src="/static/img/{{ session_role_id | to_avatar }}.png" />
</span>
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
<span class="clear"> <span class="block m-t-xs"> <strong class="font-bold">{{ session_user_id | to_name}}</strong>
</span> <span class="text-muted text-xs block">{{ session_role_id | to_role_name }} <b class="caret"></b></span> </span> </a>
<span class="clear">
<span class="block m-t-xs">
<strong class="font-bold">{{ session_user_id | to_name}} <span style="color: #8095a8">{{ session_user_id | to_dept_name}}</span></strong>
</span>
<span class="text-muted text-xs block">
{{ session_role_id | to_role_name }} <b class="caret"></b>
</span>
</span>
</a>
<ul class="dropdown-menu animated fadeInRight m-t-xs">
<li><a value="/juser/profile/?id={{ session_user_id }}" class="iframe">涓汉淇℃伅</a></li>
<li><a href="/juser/chg_info/">淇敼淇℃伅</a></li>
@ -16,6 +23,7 @@
<li><a href="/logout/">娉ㄩ攢</a></li>
</ul>
</div>
<div class="logo-element">
JS+
</div>