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

[Compat] compat py3 change bootstrap form to bootstrap3

pull/417/head
ibuler 2017-04-07 23:52:46 +08:00
parent a320b9e05e
commit bcc065eb8f
28 changed files with 160 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/applications/templates/applications/terminal_modal_accept.html
View File

@ -4,15 +4,15 @@
{% block modal_class %}modal-lg{% endblock %} {% block modal_class %}modal-lg{% endblock %}
{% block modal_title%}{% trans "Accept terminal registration" %}{% endblock %} {% block modal_title%}{% trans "Accept terminal registration" %}{% endblock %}
{% block modal_body %} {% block modal_body %}
{% load bootstrap %} {% load bootstrap3 %}
<form action="{% url 'applications:terminal-modal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept" enctype="multipart/form-data"> <form action="{% url 'applications:terminal-modal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<p class="alert alert-danger" id="modal-error" style="display: none"></p> <p class="alert alert-danger" id="modal-error" style="display: none"></p>
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.remote_addr|bootstrap_horizontal }} {% bootstrap_field form.remote_addr layout="horizontal" %}
{{ form.type|bootstrap_horizontal }} {% bootstrap_field form.type layout="horizontal" %}
{{ form.url|bootstrap_horizontal }} {% bootstrap_field form.url layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
</form> </form>
{% endblock %} {% endblock %}

12
apps/applications/templates/applications/terminal_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -31,14 +31,14 @@
<form method="post" class="form-horizontal" action="" enctype="multipart/form-data"> <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Info' %}</h3> <h3>{% trans 'Info' %}</h3>
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.remote_addr|bootstrap_horizontal }} {% bootstrap_field form.remote_addr layout="horizontal" %}
{{ form.type|bootstrap_horizontal }} {% bootstrap_field form.type layout="horizontal" %}
{{ form.url|bootstrap_horizontal }} {% bootstrap_field form.url layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Other' %}</h3> <h3>{% trans 'Other' %}</h3>
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

2
apps/assets/templates/assets/_asset_bulk_update_modal.html
View File

@ -4,7 +4,7 @@
{% block modal_class %}modal-lg{% endblock %} {% block modal_class %}modal-lg{% endblock %}
{% block modal_title%}{% trans "Update Asset" %}{% endblock %} {% block modal_title%}{% trans "Update Asset" %}{% endblock %}
{% block modal_body %} {% block modal_body %}
{% load bootstrap %} {% load bootstrap3 %}
<p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p> <p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p>
<div class="ydxbd" id="ydxbd" style="display: block;"> <div class="ydxbd" id="ydxbd" style="display: block;">
<div> <div>

2
apps/assets/templates/assets/_asset_group_bulk_update_modal.html
View File

@ -4,7 +4,7 @@
{% block modal_class %}modal-lg{% endblock %} {% block modal_class %}modal-lg{% endblock %}
{% block modal_title%}{% trans "Update Asset Group" %}{% endblock %} {% block modal_title%}{% trans "Update Asset Group" %}{% endblock %}
{% block modal_body %} {% block modal_body %}
{% load bootstrap %} {% load bootstrap3 %}
<p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p> <p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p>
<form method="post" class="form-horizontal" action="" id="fm_asset_group_bulk_update"> <form method="post" class="form-horizontal" action="" id="fm_asset_group_bulk_update">

20
apps/assets/templates/assets/_system_user.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -40,14 +40,14 @@
</div> </div>
{% endif %} {% endif %}
<h3>{% trans 'Basic' %}</h3> <h3>{% trans 'Basic' %}</h3>
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.username|bootstrap_horizontal }} {% bootstrap_field form.username layout="horizontal" %}
{{ form.protocol|bootstrap_horizontal }} {% bootstrap_field form.protocol layout="horizontal" %}
<h3>{% trans 'Auth' %}</h3> <h3>{% trans 'Auth' %}</h3>
{{ form.auth_method|bootstrap_horizontal }} {% bootstrap_field form.auth_method layout="horizontal" %}
{% block auth %} {% block auth %}
<div class="password-auth hidden"> <div class="password-auth hidden">
{{ form.password|bootstrap_horizontal }} {% bootstrap_field form.password layout="horizontal" %}
</div> </div>
<div class="public-key-auth"> <div class="public-key-auth">
<div class="form-group"> <div class="form-group">
@ -57,7 +57,7 @@
</div> </div>
</div> </div>
<div> <div>
{{ form.private_key_file|bootstrap_horizontal }} {% bootstrap_field form.private_key_file layout="horizontal" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
@ -68,9 +68,9 @@
</div> </div>
</div> </div>
<h3>{% trans 'Other' %}</h3> <h3>{% trans 'Other' %}</h3>
{{ form.sudo|bootstrap_horizontal }} {% bootstrap_field form.sudo layout="horizontal" %}
{{ form.shell|bootstrap_horizontal }} {% bootstrap_field form.shell layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">
<button class="btn btn-white" type="reset">{% trans 'Reset' %}</button> <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>

14
apps/assets/templates/assets/admin_user_create_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -34,12 +34,12 @@
{% endif %} {% endif %}
<form enctype="multipart/form-data" method="post" class="form-horizontal" action="" > <form enctype="multipart/form-data" method="post" class="form-horizontal" action="" >
{% csrf_token %} {% csrf_token %}
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.username|bootstrap_horizontal }} {% bootstrap_field form.username layout="horizontal" %}
{{ form.password|bootstrap_horizontal }} {% bootstrap_field form.password layout="horizontal" %}
{{ form.private_key_file|bootstrap_horizontal }} {% bootstrap_field form.private_key_file layout="horizontal" %}
{{ form.assets|bootstrap_horizontal }} {% bootstrap_field form.assets layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

24
apps/assets/templates/assets/asset_create.html
View File

@ -1,6 +1,6 @@
{% extends '_base_create_update.html' %} {% extends '_base_create_update.html' %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% block form %} {% block form %}
@ -12,26 +12,26 @@
{% endif %} {% endif %}
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Basic' %}</h3> <h3>{% trans 'Basic' %}</h3>
{{ form.hostname|bootstrap_horizontal }} {% bootstrap_field form.hostname layout="horizontal" %}
{{ form.ip|bootstrap_horizontal }} {% bootstrap_field form.ip layout="horizontal" %}
{{ form.public_ip|bootstrap_horizontal }} {% bootstrap_field form.public_ip layout="horizontal" %}
{{ form.port|bootstrap_horizontal }} {% bootstrap_field form.port layout="horizontal" %}
{{ form.type|bootstrap_horizontal }} {% bootstrap_field form.type layout="horizontal" %}
{{ form.env|bootstrap_horizontal }} {% bootstrap_field form.env layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Group' %}</h3> <h3>{% trans 'Group' %}</h3>
{{ form.idc|bootstrap_horizontal }} {% bootstrap_field form.idc layout="horizontal" %}
{{ form.groups|bootstrap_horizontal }} {% bootstrap_field form.groups layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Asset user' %}</h3> <h3>{% trans 'Asset user' %}</h3>
{{ form.admin_user|bootstrap_horizontal }} {% bootstrap_field form.admin_user layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Other' %}</h3> <h3>{% trans 'Other' %}</h3>
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
{{ form.is_active|bootstrap_horizontal }} {% bootstrap_field form.is_active layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>

13
apps/assets/templates/assets/asset_group_create.html
View File

@ -2,7 +2,6 @@
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap3 %} {% load bootstrap3 %}
{#{% load bootstrap %}#}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static 'css/plugins/select2/select2.min.css' %}" rel="stylesheet"> <link href="{% static 'css/plugins/select2/select2.min.css' %}" rel="stylesheet">
<script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script> <script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script>
@ -35,15 +34,13 @@
<form id="groupForm" method="post" class="form-horizontal"> <form id="groupForm" method="post" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
<h3 class="widget-head-color-box">资产组信息</h3> <h3 class="widget-head-color-box">资产组信息</h3>
{% bootstrap_field form.name layout="horizontal" %} {% bootstrap_field form.name layout="horizontal" %}
{% bootstrap_field form.comment layout="horizontal" %} {% bootstrap_field form.comment layout="horizontal" %}
{# {{ form.name|bootstrap_horizontal }}#}
{# {{ form.comment|bootstrap_horizontal }}#}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3 class="widget-head-color-box">用户选择的资产</h3> <h3 class="widget-head-color-box">用户选择的资产</h3>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label" id="asset_on_count">已选（{{ assets_count }}）</label> <label class="col-sm-2 control-label" id="asset_on_count">已选（{{ assets_count }}）</label>
<div class="col-sm-8" id="asset_sed"> <div class="col-sm-9" id="asset_sed">
<div class="form-asset-on" id="add_asset"> <div class="form-asset-on" id="add_asset">
<p id="asset_on_p"> <p id="asset_on_p">
{% for asset in assets_on_list %} {% for asset in assets_on_list %}
@ -54,8 +51,6 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{# <h3 class="widget-head-color-box">资产用户</h3>#}
{# {{ form.system_users|bootstrap_horizontal }}#}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-5"> <div class="col-sm-4 col-sm-offset-5">
<button class="btn btn-white" type="reset"> 重置 </button> <button class="btn btn-white" type="reset"> 重置 </button>

36
apps/assets/templates/assets/asset_modal_update.html
View File

@ -1,28 +1,28 @@
{% extends '_base_create_update.html' %} {% extends '_base_create_update.html' %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% block form %} {% block form %}
<div style="display:none" id="ridd"> <div style="display:none" id="ridd">
{{ form.port|bootstrap_horizontal }} {% bootstrap_field form.port layout="horizontal" %}
{{ form.type|bootstrap_horizontal }} {% bootstrap_field form.type layout="horizontal" %}
{{ form.idc|bootstrap_horizontal }} {% bootstrap_field form.idc layout="horizontal" %}
{{ form.groups|bootstrap_horizontal }} {% bootstrap_field form.groups layout="horizontal" %}
{{ form.admin_user|bootstrap_horizontal }} {% bootstrap_field form.admin_user layout="horizontal" %}
{{ form.system_users|bootstrap_horizontal }} {% bootstrap_field form.system_users layout="horizontal" %}
{{ form.brand|bootstrap_horizontal }} {% bootstrap_field form.brand layout="horizontal" %}
{{ form.cpu|bootstrap_horizontal }} {% bootstrap_field form.cpu layout="horizontal" %}
{{ form.memory|bootstrap_horizontal }} {% bootstrap_field form.memory layout="horizontal" %}
{{ form.disk|bootstrap_horizontal }} {% bootstrap_field form.disk layout="horizontal" %}
{{ form.os|bootstrap_horizontal }} {% bootstrap_field form.os layout="horizontal" %}
{{ form.cabinet_no|bootstrap_horizontal }} {% bootstrap_field form.cabinet_no layout="horizontal" %}
{{ form.cabinet_pos|bootstrap_horizontal }} {% bootstrap_field form.cabinet_pos layout="horizontal" %}
{{ form.status|bootstrap_horizontal }} {% bootstrap_field form.status layout="horizontal" %}
{{ form.env|bootstrap_horizontal }} {% bootstrap_field form.env layout="horizontal" %}
{{ form.tags|bootstrap_horizontal }} {% bootstrap_field form.tags layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<form action="" class="form-horizontal"> <form action="" class="form-horizontal">

34
apps/assets/templates/assets/asset_update.html
View File

@ -1,6 +1,6 @@
{% extends '_base_create_update.html' %} {% extends '_base_create_update.html' %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% block custom_head_css_js_create %} {% block custom_head_css_js_create %}
@ -17,37 +17,37 @@
{% endif %} {% endif %}
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Basic' %}</h3> <h3>{% trans 'Basic' %}</h3>
{{ form.hostname|bootstrap_horizontal }} {% bootstrap_field form.hostname layout="horizontal" %}
{{ form.ip|bootstrap_horizontal }} {% bootstrap_field form.ip layout="horizontal" %}
{{ form.public_ip|bootstrap_horizontal }} {% bootstrap_field form.public_ip layout="horizontal" %}
{{ form.port|bootstrap_horizontal }} {% bootstrap_field form.port layout="horizontal" %}
{{ form.type|bootstrap_horizontal }} {% bootstrap_field form.type layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Group' %}</h3> <h3>{% trans 'Group' %}</h3>
{{ form.idc|bootstrap_horizontal }} {% bootstrap_field form.idc layout="horizontal" %}
{{ form.groups|bootstrap_horizontal }} {% bootstrap_field form.groups layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Asset user' %}</h3> <h3>{% trans 'Asset user' %}</h3>
{{ form.admin_user|bootstrap_horizontal }} {% bootstrap_field form.admin_user layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Configuration' %}</h3> <h3>{% trans 'Configuration' %}</h3>
{{ form.number|bootstrap_horizontal }} {% bootstrap_field form.number layout="horizontal" %}
{{ form.remote_card_ip|bootstrap_horizontal }} {% bootstrap_field form.remote_card_ip layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Location' %}</h3> <h3>{% trans 'Location' %}</h3>
{{ form.cabinet_no|bootstrap_horizontal }} {% bootstrap_field form.cabinet_no layout="horizontal" %}
{{ form.cabinet_pos|bootstrap_horizontal }} {% bootstrap_field form.cabinet_pos layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Other' %}</h3> <h3>{% trans 'Other' %}</h3>
{{ form.status|bootstrap_horizontal }} {% bootstrap_field form.status layout="horizontal" %}
{{ form.env|bootstrap_horizontal }} {% bootstrap_field form.env layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
{{ form.is_active|bootstrap_horizontal }} {% bootstrap_field form.is_active layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">

16
apps/assets/templates/assets/idc_create_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -34,16 +34,16 @@
<form id="IDCForm" method="post" class="form-horizontal"> <form id="IDCForm" method="post" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
<h3 class="widget-head-color-box">基本信息</h3> <h3 class="widget-head-color-box">基本信息</h3>
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.address|bootstrap_horizontal }} {% bootstrap_field form.address layout="horizontal" %}
{{ form.contact|bootstrap_horizontal }} {% bootstrap_field form.contact layout="horizontal" %}
{{ form.phone|bootstrap_horizontal }} {% bootstrap_field form.phone layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3 class="widget-head-color-box">IP段</h3> <h3 class="widget-head-color-box">IP段</h3>
{{ form.operator|bootstrap_horizontal }} {% bootstrap_field form.operator layout="horizontal" %}
{{ form.intranet|bootstrap_horizontal }} {% bootstrap_field form.intranet layout="horizontal" %}
{{ form.extranet|bootstrap_horizontal }} {% bootstrap_field form.extranet layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">

6
apps/assets/templates/assets/system_user_update.html
View File

@ -1,15 +1,15 @@
{% extends 'assets/_system_user.html' %} {% extends 'assets/_system_user.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block auth %} {% block auth %}
<div class="password-auth hidden"> <div class="password-auth hidden">
{{ form.password|bootstrap_horizontal }} {% bootstrap_field form.password layout="horizontal" %}
</div> </div>
<div class="public-key-auth"> <div class="public-key-auth">
<div> <div>
{{ form.private_key_file|bootstrap_horizontal }} {% bootstrap_field form.private_key_file layout="horizontal" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

4
apps/audits/utils.py
View File

@ -1,6 +1,5 @@
# ~*~ coding: utf-8 ~*~ # ~*~ coding: utf-8 ~*~
# #
from __future__ import unicode_literals from __future__ import unicode_literals
import requests import requests
import ipaddress import ipaddress
@ -10,7 +9,7 @@ from .models import LoginLog
def validate_ip(ip): def validate_ip(ip):
try: try:
ipaddress.ip_address(ip.decode('utf-8')) ipaddress.ip_address(ip)
return True return True
except ValueError: except ValueError:
print('valid error') print('valid error')
@ -35,7 +34,6 @@ def get_ip_city(ip, timeout=10):
url = 'http://int.dpool.sina.com.cn/iplookup/iplookup.php?ip=%s&format=json' % ip url = 'http://int.dpool.sina.com.cn/iplookup/iplookup.php?ip=%s&format=json' % ip
try: try:
r = requests.get(url, timeout=timeout) r = requests.get(url, timeout=timeout)
print(r)
except requests.Timeout: except requests.Timeout:
r = None r = None
city = 'Unknown' city = 'Unknown'

11
apps/jumpserver/settings.py
View File

@ -59,7 +59,6 @@ INSTALLED_APPS = [
'common.apps.CommonConfig', 'common.apps.CommonConfig',
'applications.apps.ApplicationsConfig', 'applications.apps.ApplicationsConfig',
'rest_framework', 'rest_framework',
'bootstrapform',
'bootstrap3', 'bootstrap3',
'captcha', 'captcha',
'django.contrib.auth', 'django.contrib.auth',
@ -334,3 +333,13 @@ CAPTCHA_TEST_MODE = CONFIG.CAPTCHA_TEST_MODE
COMMAND_STORE_BACKEND = 'audits.backends.command.db' COMMAND_STORE_BACKEND = 'audits.backends.command.db'
RECORD_STORE_BACKEND = 'audits.backends.record.db' RECORD_STORE_BACKEND = 'audits.backends.record.db'
# Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html
BOOTSTRAP3 = {
'horizontal_label_class': 'col-md-2',
# Field class to use in horizontal forms
'horizontal_field_class': 'col-md-9',
# Set placeholder attributes to label if no placeholder is provided
'set_placeholder': True,
}

12
apps/perms/templates/perms/asset_permission_create_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -31,15 +31,15 @@
<form method="post" class="form-horizontal" action="" > <form method="post" class="form-horizontal" action="" >
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Name' %}</h3> <h3>{% trans 'Name' %}</h3>
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'User' %}</h3> <h3>{% trans 'User' %}</h3>
{{ form.users|bootstrap_horizontal }} {% bootstrap_field form.users layout="horizontal" %}
{{ form.user_groups|bootstrap_horizontal }} {% bootstrap_field form.user_groups layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Asset' %}</h3> <h3>{% trans 'Asset' %}</h3>
{{ form.assets|bootstrap_horizontal|safe }} {{ form.assets|bootstrap_horizontal|safe }}
{{ form.asset_groups|bootstrap_horizontal }} {% bootstrap_field form.asset_groups layout="horizontal" %}
{{ form.system_users |bootstrap_horizontal }} {{ form.system_users |bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Other' %}</h3> <h3>{% trans 'Other' %}</h3>
@ -60,7 +60,7 @@
<span class="help-block ">{{ form.date_expired.errors }}</span> <span class="help-block ">{{ form.date_expired.errors }}</span>
</div> </div>
</div> </div>
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

18
apps/users/templates/users/_user.html
View File

@ -1,7 +1,7 @@
{% extends '_base_create_update.html' %} {% extends '_base_create_update.html' %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load bootstrap %} {% load bootstrap3 %}
{% block form %} {% block form %}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="alert alert-danger"> <div class="alert alert-danger">
@ -11,17 +11,17 @@
<form method="post" class="form-horizontal" action="" enctype="multipart/form-data"> <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Account' %}</h3> <h3>{% trans 'Account' %}</h3>
{{ form.username|bootstrap_horizontal }} {% bootstrap_field form.username layout="horizontal" %}
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.email|bootstrap_horizontal }} {% bootstrap_field form.email layout="horizontal" %}
{{ form.groups|bootstrap_horizontal }} {% bootstrap_field form.groups layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{% block password %} {% endblock %} {% block password %} {% endblock %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Security and Role' %}</h3> <h3>{% trans 'Security and Role' %}</h3>
{{ form.role|bootstrap_horizontal }} {% bootstrap_field form.role layout="horizontal" %}
<div class="form-group {% if form.date_expired.errors %} has-error {% endif %}" id="date_5"> <div class="form-group {% if form.date_expired.errors %} has-error {% endif %}" id="date_5">
<label for="{{ form.date_expired.id_for_label }}" class="col-sm-2 control-label">{{ form.date_expired.label }}</label> <label for="{{ form.date_expired.id_for_label }}" class="col-sm-2 control-label">{{ form.date_expired.label }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
@ -40,9 +40,9 @@
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Profile' %}</h3> <h3>{% trans 'Profile' %}</h3>
{{ form.phone|bootstrap_horizontal }} {% bootstrap_field form.phone layout="horizontal" %}
{{ form.wechat|bootstrap_horizontal }} {% bootstrap_field form.wechat layout="horizontal" %}
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

2
apps/users/templates/users/first_login.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}

2
apps/users/templates/users/first_login_done.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}

2
apps/users/templates/users/user_asset_permission.html
View File

@ -1,5 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load bootstrap %} {% load bootstrap3 %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}

4
apps/users/templates/users/user_create.html
View File

@ -1,9 +1,9 @@
{% extends 'users/_user.html' %} {% extends 'users/_user.html' %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block user_template_title %}{% trans "Create user" %}{% endblock %} {% block user_template_title %}{% trans "Create user" %}{% endblock %}
{#{% block username %}#} {#{% block username %}#}
{# {{ form.username|bootstrap_horizontal }}#} {# {% bootstrap_field form.username layout="horizontal" %}#}
{#{% endblock %}#} {#{% endblock %}#}
{% block password %} {% block password %}
<h3>{% trans 'Password' %}</h3> <h3>{% trans 'Password' %}</h3>

2
apps/users/templates/users/user_granted_asset.html
View File

@ -1,5 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load bootstrap %} {% load bootstrap3 %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}

2
apps/users/templates/users/user_group_asset_permission.html
View File

@ -1,5 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load bootstrap %} {% load bootstrap3 %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}

6
apps/users/templates/users/user_group_create_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script> <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
@ -23,7 +23,7 @@
{% endif %} {% endif %}
<form method="post" class="form-horizontal" action="" > <form method="post" class="form-horizontal" action="" >
{% csrf_token %} {% csrf_token %}
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
<div class="form-group"> <div class="form-group">
<label for="users" class="col-sm-2 control-label">{% trans 'Users' %}</label> <label for="users" class="col-sm-2 control-label">{% trans 'Users' %}</label>
<div class="col-sm-9"> <div class="col-sm-9">
@ -38,7 +38,7 @@
</select> </select>
</div> </div>
</div> </div>
{{ form.comment|bootstrap_horizontal }} {% bootstrap_field form.comment layout="horizontal" %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">
<button class="btn btn-white" type="reset">{% trans 'Cancel' %}</button> <button class="btn btn-white" type="reset">{% trans 'Cancel' %}</button>

2
apps/users/templates/users/user_group_granted_asset.html
View File

@ -1,5 +1,5 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load bootstrap %} {% load bootstrap3 %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}

8
apps/users/templates/users/user_password_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
@ -48,9 +48,9 @@
<div class="wrapper wrapper-content animated fadeInRight"> <div class="wrapper wrapper-content animated fadeInRight">
<form method="post" class="form-horizontal" action="" enctype="multipart/form-data"> <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{{ form.old_password|bootstrap_horizontal}} {% bootstrap_field form.old_password layout="horizontal" %}
{{ form.new_password|bootstrap_horizontal }} {% bootstrap_field form.new_password layout="horizontal" %}
{{ form.confirm_password|bootstrap_horizontal }} {% bootstrap_field form.confirm_password layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">

12
apps/users/templates/users/user_profile_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
@ -49,14 +49,14 @@
<form method="post" class="form-horizontal" action="" enctype="multipart/form-data"> <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<h3>{% trans 'Account' %}</h3> <h3>{% trans 'Account' %}</h3>
{{ form.username|bootstrap_horizontal }} {% bootstrap_field form.username layout="horizontal" %}
{{ form.name|bootstrap_horizontal }} {% bootstrap_field form.name layout="horizontal" %}
{{ form.email|bootstrap_horizontal }} {% bootstrap_field form.email layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3>{% trans 'Profile' %}</h3> <h3>{% trans 'Profile' %}</h3>
{{ form.phone|bootstrap_horizontal }} {% bootstrap_field form.phone layout="horizontal" %}
{{ form.wechat|bootstrap_horizontal }} {% bootstrap_field form.wechat layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

4
apps/users/templates/users/user_pubkey_update.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap %} {% load bootstrap3 %}
{% block custom_head_css_js %} {% block custom_head_css_js %}
<link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet"> <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
@ -62,7 +62,7 @@
</div> </div>
</div> </div>
<h3>{% trans 'Update public key' %}</h3> <h3>{% trans 'Update public key' %}</h3>
{{ form.public_key|bootstrap_horizontal}} {% bootstrap_field form.public_key layout="horizontal" %}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-2"> <div class="col-sm-4 col-sm-offset-2">

39
requirements/requirements.txt
View File

@ -1,22 +1,19 @@
Django==1.10 Django
django-bootstrap-form==3.2.1 django-bootstrap3
logging==0.4.9.6 Pillow
Pillow==4.0.0 djangorestframework
djangorestframework==3.5.3 ForgeryPy
ForgeryPy==0.1
openpyxl==2.4.0 openpyxl==2.4.0
celery==3.1.23 celery
paramiko==2.1.1 paramiko
ansible==2.2.2.0 ansible
django-simple-captcha==0.5.2 django-simple-captcha
django-formtools==1.0 django-formtools
sshpubkeys==2.2.0 sshpubkeys
djangorestframework-bulk==0.2.1 djangorestframework-bulk
django-redis-cache==1.7.1 django-redis-cache
requests==2.11.1 requests
itsdangerous==0.24 itsdangerous
#python-gssapi==0.6.4 eventlet
tornado==4.4.2 django-filter
eventlet==0.20.1 passlib
django-filter==1.0.0
passlib==1.7.1