github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-31 23:20:37 +00:00
Code Issues Projects Releases Wiki Activity

޸jsλ

Browse Source
This commit is contained in:
guanghongwei
2015-01-31 13:45:58 +08:00
parent 795183c7ab
commit 7adbf52aeb
4 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jumpserver/views.py
View File

@@ -23,7 +23,6 @@ def skin_config(request):
return render_to_response('skin_config.html') return render_to_response('skin_config.html')
<<<<<<< HEAD
def jasset_group_add(name, comment, type): def jasset_group_add(name, comment, type):
if BisGroup.objects.filter(name=name): if BisGroup.objects.filter(name=name):
emg = u'该业务组已存在!' emg = u'该业务组已存在!'
@@ -64,7 +63,8 @@ def jasset_host_edit(j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment):
a.save() a.save()
a.bis_group = groups a.bis_group = groups
a.save() a.save()
=======
def login(request): def login(request):
"""登录界面""" """登录界面"""
if request.session.get('username'): if request.session.get('username'):
@@ -97,5 +97,3 @@ def logout(request):
request.session.delete() request.session.delete()
return HttpResponseRedirect('/login/') return HttpResponseRedirect('/login/')
>>>>>>> guanghongwei

4
templates/base.html
View File

@@ -10,6 +10,7 @@
<link rel="shortcut icon" href="/static/img/facio.ico" type="image/x-icon"> <link rel="shortcut icon" href="/static/img/facio.ico" type="image/x-icon">
{% include 'link_css.html' %} {% include 'link_css.html' %}
{% include 'head_script.html' %}
</head> </head>
@@ -27,7 +28,6 @@
</div> </div>
</div> </div>
{# <!--{% include 'script.html' %}-->#}
</body> </body>
{% include 'script.html' %} {% include 'foot_script.html' %}
</html> </html>

27
templates/foot_script.html Normal file
View File

@@ -0,0 +1,27 @@
<!-- Mainly scripts -->
<script src="/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/static/js/bootstrap-dialog.js"></script>
<script src="/static/js/mindmup-editabletable.js"></script>
<!-- Custom and plugin javascript -->
<script src="/static/js/inspinia.js"></script>
<script src="/static/js/plugins/pace/pace.min.js"></script>
<!-- iCheck box -->
{#<script src="/static/js/plugins/iCheck/icheck.min.js"></script>#}
<!-- Peity -->
<script src="/static/js/plugins/peity/jquery.peity.min.js"></script>
<!-- Peity -->
<script src="/static/js/demo/peity-demo.js"></script>
<!-- active menu -->
<script>
var str = document.location.pathname.split("/")[1];
var str1 = document.location.pathname.split("/")[2];
$("#"+str).addClass('active');
$("#"+str1).addClass('active');
</script>

27
templates/script.html → templates/head_script.html
View File

@@ -1,25 +1,6 @@
<!-- Mainly scripts -->
<script src="/static/js/jquery-2.1.1.js"></script> <script src="/static/js/jquery-2.1.1.js"></script>
<script src="/static/js/bootstrap.min.js"></script> <script src="/static/js/bootstrap.min.js"></script>
<script src="/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/static/js/bootstrap-dialog.js"></script>
<script src="/static/js/mindmup-editabletable.js"></script>
<script src="/static/js/base.js"></script> <script src="/static/js/base.js"></script>
<!-- Custom and plugin javascript -->
<script src="/static/js/inspinia.js"></script>
<script src="/static/js/plugins/pace/pace.min.js"></script>
<!-- iCheck box -->
<script src="/static/js/plugins/iCheck/icheck.min.js"></script>
<!-- Peity -->
<script src="/static/js/plugins/peity/jquery.peity.min.js"></script>
<!-- Peity -->
<script src="/static/js/demo/peity-demo.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('.i-checks').iCheck({ $('.i-checks').iCheck({
@@ -71,11 +52,3 @@
<!-- validator js --> <!-- validator js -->
<script src="/static/js/validator/jquery.validator.js"></script> <script src="/static/js/validator/jquery.validator.js"></script>
<script src="/static/js/validator/zh_CN.js"></script> <script src="/static/js/validator/zh_CN.js"></script>
<!-- active menu -->
<script>
var str = document.location.pathname.split("/")[1];
var str1 = document.location.pathname.split("/")[2];
$("#"+str).addClass('active');
$("#"+str1).addClass('active');
</script>