Permalink
Browse files

更换nav ico, 修复需要登陆,登陆后跳转到登陆前页面

  • Loading branch information...
1 parent d58ba82 commit 8479989ea856ea8e05b666c5e52372ac5afb60a9 @ibuler ibuler committed Nov 17, 2015
Showing with 16 additions and 20 deletions.
  1. +4 −1 docs/requirements.txt
  2. +1 −1 jumpserver/api.py
  3. +1 −1 jumpserver/views.py
  4. +3 −0 keys/README.md
  5. +3 −13 templates/index.html
  6. +4 −4 templates/nav.html
@@ -10,4 +10,7 @@ xlsxwriter==0.7.7
xlrd==0.9.4
django-bootstrap-form
tornado
-ansible
+ansible
+pyinotify
+passlib
+argparse
View
@@ -197,9 +197,9 @@ def require_role(role='user'):
def _deco(func):
def __deco(request, *args, **kwargs):
+ request.session['pre_url'] = request.path
if not request.user.is_authenticated():
return HttpResponseRedirect('/login/')
-
if role == 'admin':
# if request.session.get('role_id', 0) < 1:
if request.user.role == 'CU':
View
@@ -235,7 +235,7 @@ def Login(request):
request.session['role_id'] = 1
else:
request.session['role_id'] = 0
- return HttpResponseRedirect(request.GET.get('next', '/'), )
+ return HttpResponseRedirect(request.session.get('pre_url', '/'))
# response.set_cookie('username', username, expires=604800)
# response.set_cookie('seed', PyCrypt.md5_crypt(password), expires=604800)
# return response
View
@@ -0,0 +1,3 @@
+看山是山,看水是水
+看山不是山,看水不是水
+看山是山,看水是水
View
@@ -14,7 +14,6 @@
</div>
<div class="ibox-content">
<h1 class="no-margins"><a href="/juser/user_list/">{{ users.count}}</a></h1>
-{# <div class="stat-percent font-bold text-success">{{ percent_user }} <i class="fa fa-bolt"></i></div>#}
<small>All user</small>
</div>
</div>
@@ -27,7 +26,6 @@ <h1 class="no-margins"><a href="/juser/user_list/">{{ users.count}}</a></h1>
</div>
<div class="ibox-content">
<h1 class="no-margins"><a href="/jasset/host_list/">{{ hosts.count }}</a></h1>
-{# <div class="stat-percent font-bold text-info">{{ percent_host }} <i class="fa fa-level-up"></i></div>#}
<small>All host</small>
</div>
</div>
@@ -37,7 +35,7 @@ <h1 class="no-margins"><a href="/jasset/host_list/">{{ hosts.count }}</a></h1>
<div class="ibox float-e-margins">
<div class="ibox-title">
<span class="label label-primary pull-right">Online</span>
- <h5>实时在线用户</h5>
+ <h5>在线用户</h5>
</div>
<div class="ibox-content">
<h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_users">{{ online_user | length }}</span></a></h1>
@@ -55,7 +53,6 @@ <h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_users"
</div>
<div class="ibox-content">
<h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_hosts">{{ online_host | length }}</span></a></h1>
-{# <div class="stat-percent font-bold text-danger">{{ percent_online_host }} <i class="fa fa-level-down"></i></div>#}
<small>Connected host</small>
</div>
</div>
@@ -169,7 +166,7 @@ <h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_hosts"
</div>
</div>
<div class="ibox-content ibox-heading">
- <h3><i class="fa fa-user"></i> 一周Top10资产 </h3>
+ <h3><i class="fa fa-inbox"></i> 一周Top10资产 </h3>
<small><i class="fa fa-map-marker"></i> 登录次数及最近一次登录记录. </small>
</div>
<div class="ibox-content inspinia-timeline">
@@ -309,14 +306,7 @@ <h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_hosts"
</div>
</div>
</div>
-
- <!--</div>-->
- <!--<div class="col-xm-6" id="top10" style="width:50%;height:400px;"></div>-->
- <!--<div class="col-xm-6" id="usertop10" style="width:50%;height:400px;"></div>-->
- <!--<div class="row">-->
- <!--<div class="col-lg-6" id="hosttop10" style="width:50%;height:400px; margin-top: 20px"></div>-->
- <!--</div>-->
-</div>
+ </div>
</div>
{% endblock %}
View
@@ -4,10 +4,10 @@
<ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %}
<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="/"><i class="fa fa-dashboard"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
</li>
<li id="juser">
- <a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
+ <a href="#"><i class="fa fa-group"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li class="group_list group_edit"><a href="/juser/group_list/">查看用户组</a></li>
<li class="group_add"><a href="/juser/group_add/">添加用户组</a></li>
@@ -16,7 +16,7 @@
</ul>
</li>
<li id="jasset">
- <a><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
+ <a><i class="fa fa-inbox"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li class="group_add"><a href="/jasset/group_add/">添加资产组</a></li>
<li class="group_list group_detail group_edit"><a href="/jasset/group_list/">查看资产组</a></li>
@@ -44,7 +44,7 @@
<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 id="setting">
- <a href="/setting/"><i class="fa fa-files-o"></i> <span class="nav-label">设置</span><span class="label label-info pull-right"></span></a>
+ <a href="/setting/"><i class="fa fa-gears"></i> <span class="nav-label">设置</span><span class="label label-info pull-right"></span></a>
</li>
<li class="special_link">
<a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">访问官网</span></a>

0 comments on commit 8479989

Please sign in to comment.