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

[Bugfix] 修改html bug

pull/828/merge
ibuler 2017-12-28 12:25:43 +08:00
parent 827246ed4c
commit e20444983d
28 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@
}
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
authFieldsDisplay();
$(auto_generate_key).change(function () {
authFieldsDisplay();

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

@ -56,7 +56,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
})
</script>
{% endblock %}

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

@ -157,7 +157,7 @@ function bindToCluster(clusters) {
jumpserver.cluster_selected = {};
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });.on('select2:select', function(evt) {
$('.select2').select2();.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.cluster_selected[data.id] = data.text;
}).on('select2:unselect', function(evt) {

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

@ -30,7 +30,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
}).on('click', '.field-tag', function() {
changeField(this);
}).on('click', '#change_all', function () {

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

@ -47,7 +47,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
{# $("#id_tags").select2({#}
{# tags: true,#}
{# maximumSelectionLength: 8 //最多能够选择的个数#}

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

@ -81,7 +81,7 @@
{% block custom_foot_js %}
<script type="text/javascript">
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
$('.select2-system-user').select2();
});

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

@ -184,7 +184,7 @@ function initTable() {
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
$('.select2.asset-select').select2()
.on('select2:select', function(evt) {

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

@ -181,7 +181,7 @@ function initTable() {
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on("select2:select", function (evt) {
var data = evt.params.data;
jumpserver.assets_selected[data.id] = data.text;

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

@ -151,7 +151,7 @@
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
})
.on('click', '.btn-delete-cluster', function () {
var name = "{{ cluster.name }}";

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

@ -125,7 +125,7 @@ function initAssetsTable() {
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on("select2:select", function (evt) {
var data = evt.params.data;
jumpserver.assets_selected[data.id] = data.text;

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

@ -212,7 +212,7 @@ function updateSystemUserCluster(clusters) {
}
jumpserver.cluster_selected = {};
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.cluster_selected[data.id] = data.text;

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

@ -18,7 +18,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
})
</script>
{% endblock %}

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

@ -79,7 +79,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
$('.input-group.date').datepicker({
format: "yyyy-mm-dd",

2
apps/perms/templates/perms/asset_permission_detail.html
View File

@ -190,7 +190,7 @@ function updateSystemUser(system_users) {
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.system_users_selected[data.id] = data.text;

0
apps/static/css/plugins/dataTables/datatables.min.css → apps/static/css/plugins/datatables/datatables.min.css vendored
View File

0
apps/static/js/plugins/dataTables/datatables.min.js → apps/static/js/plugins/datatables/datatables.min.js vendored
View File

0
apps/static/js/plugins/dataTables/i18n/English.lang → apps/static/js/plugins/datatables/i18n/English.lang
View File

0
apps/static/js/plugins/dataTables/i18n/zh-hans.json → apps/static/js/plugins/datatables/i18n/zh-hans.json
View File

4
apps/templates/_base_list.html
View File

@ -2,10 +2,10 @@
{% load static %}
{% load i18n %}
{% block custom_head_css_js %}
<link href="{% static "css/plugins/dataTables/datatables.min.css" %}" rel="stylesheet">
<link href="{% static "css/plugins/datatables/datatables.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/dataTables/dataTables.min.js" %}"></script>
<script src="{% static "js/plugins/datatables/datatables.min.js" %}"></script>
{% endblock %}
{% block content %}
<div class="wrapper wrapper-content animated fadeInRight">

4
apps/templates/_head_css_js.html
View File

@ -7,9 +7,9 @@
<link href="{% static 'css/plugins/sweetalert/sweetalert.css' %}" rel="stylesheet">
<link href="{% static 'css/style.css' %}" rel="stylesheet">
<link href="{% static 'css/plugins/vaildator/jquery.validator.css' %}" rel="stylesheet">
<link href="{% static 'css/plugins/dataTables/datatables.min.css' %}" rel="stylesheet">
<link href="{% static 'css/plugins/datatables/datatables.min.css' %}" rel="stylesheet">
<!-- scripts -->
<script src="{% static 'js/jquery-2.1.1.js' %}"></script>
<script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/plugins/dataTables/datatables.min.js' %}"></script>
<script src="{% static 'js/plugins/datatables/datatables.min.js' %}"></script>

2
apps/terminal/templates/terminal/terminal_update.html
View File

@ -57,7 +57,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
$('.input-group.date').datepicker({
format: "yyyy-mm-dd",

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

@ -56,7 +56,7 @@
<script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
$('.input-group.date').datepicker({
format: "yyyy-mm-dd",

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

@ -30,7 +30,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
}).on('click', '.field-tag', function() {
changeField(this);
}).on('click', '#change_all', function () {

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

@ -253,7 +253,7 @@ function updateUserGroups(groups) {
}
$(document).ready(function() {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.groups_selected[data.id] = data.text;

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

@ -98,7 +98,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
var options = {
ele: $('#user_assets_table'),
buttons: [],

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

@ -57,7 +57,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
})
</script>
{% endblock %}

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

@ -5,11 +5,11 @@
{% block custom_head_css_js %}
<link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
<link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
<link href="{% static "css/plugins/dataTables/datatables.min.css" %}" rel="stylesheet">
<link href="{% static "css/plugins/datatables/datatables.min.css" %}" rel="stylesheet">
<link href="{% static "css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" %}" rel="stylesheet">
<script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
<script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
<script src="{% static "js/plugins/dataTables/dataTables.min.js" %}"></script>
<script src="{% static "js/plugins/datatables/datatables.min.js" %}"></script>
{% endblock %}
{% block content %}
<div class="wrapper wrapper-content animated fadeInRight">
@ -150,7 +150,7 @@ function updateGroupMember(users) {
}
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
.on('select2:select', function(evt) {
var data = evt.params.data;
jumpserver.users_selected[data.id] = data.text;

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

@ -102,7 +102,7 @@
{% block custom_foot_js %}
<script>
$(document).ready(function () {
$('.select2').select2({ dropdownAutoWidth : true, width: 'auto' });
$('.select2').select2();
var options = {
ele: $('#user_assets_table'),
buttons: [],