Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
fd52a85d
Commit
fd52a85d
authored
Sep 30, 2016
by
江世峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix #25
parent
0dec6471
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
40 deletions
+58
-40
asset_group_create.html
apps/assets/templates/assets/asset_group_create.html
+5
-12
asset_modal_list.html
apps/assets/templates/assets/asset_modal_list.html
+42
-18
_head_css_js.html
apps/templates/_head_css_js.html
+9
-8
base.html
apps/templates/base.html
+2
-2
No files found.
apps/assets/templates/assets/asset_group_create.html
View file @
fd52a85d
...
@@ -5,18 +5,11 @@
...
@@ -5,18 +5,11 @@
{% 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>
<link
href=
"{% static 'css/plugins/dataTables/datatables.min.css' %}"
rel=
"stylesheet"
>
<script
src=
"{% static 'js/plugins/dataTables/datatables.min.js' %}"
></script>
<style>
<style>
div
.dataTables_wrapper
div
.dataTables_filter
,
<!
--table
.dataTable
tbody
tr
.selected
{
-->
.dataTables_length
{
<!
--background-color
:
white
;
-->
float
:
left
;
<!
--color
:
#676a6c
;
-->
}
<!--//
background-color
:
transparent
;
-->
<!--
}
--
>
<!
--table
.dataTable
tbody
tr
.selected
td
.text-center
{
-->
<!
--background-color
:
#B0BED9
;
-->
<!--
}
--
>
</style>
</style>
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
...
@@ -50,7 +43,7 @@
...
@@ -50,7 +43,7 @@
{{ form.name|bootstrap_horizontal }}
{{ form.name|bootstrap_horizontal }}
{{ form.comment|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-2 control-label"
>
已选
</label>
<label
class=
"col-sm-2 control-label"
>
已选
</label>
<div
class=
"col-sm-9"
id=
"asset_sed"
>
<div
class=
"col-sm-9"
id=
"asset_sed"
>
...
...
apps/assets/templates/assets/asset_modal_list.html
View file @
fd52a85d
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
<thead>
<thead>
<tr>
<tr>
<th
class=
"text-center"
style=
"background-color:white"
>
<th
class=
"text-center"
style=
"background-color:white"
>
<input
type=
"checkbox"
id=
"check_all"
onclick=
"checkAll(
'check_all', 'checked'
)"
>
<input
type=
"checkbox"
id=
"check_all"
onclick=
"checkAll()"
>
</th>
</th>
<th
id=
"th_no"
>
id
</th>
<th
id=
"th_no"
>
id
</th>
<th>
资产名称
</th>
<th>
资产名称
</th>
...
@@ -21,11 +21,12 @@
...
@@ -21,11 +21,12 @@
</thead>
</thead>
<tbody>
<tbody>
{% for asset in asset_modal_list %}
{% for asset in asset_modal_list %}
<tr>
{% if asset.id in group_assets %}
{% if asset.id in group_assets %}
<td
class=
"text-center"
><input
type=
"checkbox"
name=
"checked"
value=
"{{ asset.id }}"
checked=
"checked"
></td>
<tr
name=
"oAssets"
class=
"odd selected"
>
<td
class=
"text-center"
><input
type=
"checkbox"
name=
"checked"
value=
"{{ asset.id }}"
checked=
"checked"
></td>
{% else %}
{% else %}
<td
class=
"text-center"
><input
type=
"checkbox"
name=
"checked"
value=
"{{ asset.id }}"
></td>
<tr
name=
"oAssets"
>
<td
class=
"text-center"
><input
type=
"checkbox"
name=
"checked"
value=
"{{ asset.id }}"
></td>
{% endif %}
{% endif %}
<td>
{{ asset.id }}
</td>
<td>
{{ asset.id }}
</td>
<td>
{{ asset.hostname }}
</td>
<td>
{{ asset.hostname }}
</td>
...
@@ -54,6 +55,9 @@ $(document).ready(function(){
...
@@ -54,6 +55,9 @@ $(document).ready(function(){
"aaSorting"
:
[[
2
,
"asc"
]],
"aaSorting"
:
[[
2
,
"asc"
]],
"aoColumnDefs"
:
[
{
"bSortable"
:
false
,
"aTargets"
:
[
0
]
}],
"aoColumnDefs"
:
[
{
"bSortable"
:
false
,
"aTargets"
:
[
0
]
}],
"bAutoWidth"
:
false
,
"bAutoWidth"
:
false
,
"language"
:
{
"url"
:
"/static/js/plugins/dataTables/i18n/zh-hans.json"
},
columns
:
[
columns
:
[
{
data
:
"checkbox"
},
{
data
:
"checkbox"
},
{
data
:
"id"
},
{
data
:
"id"
},
...
@@ -64,36 +68,56 @@ $(document).ready(function(){
...
@@ -64,36 +68,56 @@ $(document).ready(function(){
{
data
:
"dp"
}
{
data
:
"dp"
}
]
]
});
});
//讲ID列隐藏
table
.
column
(
'1'
).
visible
(
false
);
table
.
column
(
'1'
).
visible
(
false
);
$
(
'#editable tbody'
).
on
(
'click'
,
'tr'
,
function
()
{
$
(
'#editable tbody'
).
on
(
'click'
,
'tr'
,
function
()
{
$
(
this
).
toggleClass
(
'selected'
);
//alert($(this).hasClass('selected'));
if
(
$
(
this
).
hasClass
(
'selected'
)){
$
(
this
).
removeClass
(
'selected'
);
this
.
children
[
0
].
children
[
0
].
checked
=
0
;
}
else
{
$
(
this
).
addClass
(
'selected'
);
this
.
children
[
0
].
children
[
0
].
checked
=
1
;
};
});
});
$
(
'#save-btn'
).
on
(
'click'
,
function
(){
$
(
'#save-btn'
).
on
(
'click'
,
function
(){
//
alert( table.rows('.selected').data().length +' row(s) selected' );
//
alert( table.rows('.selected').data().length +' row(s) selected' );
var
d
=
table
.
rows
(
'.selected'
).
data
();
var
d
=
table
.
rows
(
'.selected'
).
data
();
var
size
=
d
.
length
;
var
size
=
d
.
length
;
document
.
getElementById
(
'add_asset'
).
value
=
size
;
document
.
getElementById
(
'add_asset'
).
value
=
size
;
var
column2
=
table
.
rows
(
'.selected'
).
data
();
var
column2
=
table
.
rows
(
'.selected'
).
data
();
$
(
"#asset_sed"
).
find
(
"input[name='assets']"
).
remove
();
$
(
"#asset_sed"
).
find
(
"input[name='assets']"
).
remove
();
for
(
var
i
=
0
;
i
<
column2
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
column2
.
length
;
i
++
){
column2
[
i
].
checkbox
=
'<input name="checked" value="1" checked="" type="checkbox">'
;
var
value
=
column2
[
i
].
id
;
var
value
=
column2
[
i
].
id
;
$
(
"#asset_sed"
).
append
(
"<input type='hidden' name='assets' value='"
+
value
+
"'>"
);
$
(
"#asset_sed"
).
append
(
"<input type='hidden' name='assets' value='"
+
value
+
"'>"
);
}
}
$
(
'#modal'
).
modal
(
'hide'
);
$
(
'#modal'
).
modal
(
'hide'
);
});
});
});
//$(document).ready
var
bCheck
=
1
;
});
function
checkAll
(){
$
(
'#close-btn'
).
on
(
'click'
,
function
(){
if
(
bCheck
){
//alert('点击关闭按钮时触发;')
$
(
"tr[name='oAssets']"
).
each
(
function
(){
$
(
'#modal'
).
modal
(
'hide'
);
oCheckbox
=
this
.
children
[
0
].
children
[
0
];
});
$
(
this
).
toggleClass
(
'selected'
,
true
);
oCheckbox
.
checked
=
1
;
});
document
.
getElementById
(
'check_all'
).
checked
=
1
;
bCheck
=
0
;
}
else
{
$
(
"tr[name='oAssets']"
).
each
(
function
(){
oCheckbox
=
this
.
children
[
0
].
children
[
0
];
$
(
this
).
toggleClass
(
'selected'
,
false
);
oCheckbox
.
checked
=
0
;
});
document
.
getElementById
(
'check_all'
).
checked
=
0
;
bCheck
=
1
;
};
};
</script>
</script>
apps/templates/_head_css_js.html
View file @
fd52a85d
{% load static %}
{% load static %}
<!-- css file -->
<!-- css file -->
<link
href=
"{% static "
css
/
bootstrap
.
min
.
css
"
%}"
rel=
"stylesheet"
>
<link
href=
"{% static 'css/bootstrap.min.css' %}"
rel=
"stylesheet"
>
<link
href=
"{% static "
css
/
font-awesome
.
css
"
%}"
rel=
"stylesheet"
>
<link
href=
"{% static 'css/font-awesome.css' %}"
rel=
"stylesheet"
>
<link
href=
"{% static "
css
/
plugins
/
toastr
/
toastr
.
min
.
css
"
%}"
rel=
"stylesheet"
>
<link
href=
"{% static 'css/plugins/toastr/toastr.min.css' %}"
rel=
"stylesheet"
>
<link
href=
"{% static "
css
/
plugins
/
sweetalert
/
sweetalert
.
css
"
%}"
rel=
"stylesheet"
>
<link
href=
"{% static 'css/plugins/sweetalert/sweetalert.css' %}"
rel=
"stylesheet"
>
<link
href=
"{% static "
css
/
style
.
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/vaildator/jquery.validator.css' %}"
rel=
"stylesheet"
>
<link
href=
"{% static 'css/plugins/dataTables/datatables.min.css' %}"
rel=
"stylesheet"
>
<!-- scripts -->
<!-- scripts -->
<script
src=
"{% static 'js/jquery-2.1.1.js' %}"
></script>
<script
src=
"{% static 'js/jquery-2.1.1.js' %}"
></script>
<!-- Sweet alert -->
<script
src=
"{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"
></script>
<script
src=
"{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"
></script>
<script
src=
"{% static 'js/bootstrap.min.js' %}"
></script>
<script
src=
"{% static 'js/bootstrap.min.js' %}"
></script>
<script
src=
"{% static 'js/plugins/dataTables/datatables.min.js' %}"
></script>
\ No newline at end of file
apps/templates/base.html
View file @
fd52a85d
...
@@ -8,10 +8,10 @@
...
@@ -8,10 +8,10 @@
<title>
Jumpserver
</title>
<title>
Jumpserver
</title>
<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 '_head_css_js.html' %}
{% include '_head_css_js.html' %}
<link
href=
"{% static 'css/jumpserver.css' %}"
rel=
"stylesheet"
>
{% block custom_head_css_js %} {% endblock %}
{% block custom_head_css_js %} {% endblock %}
<link
href=
"{% static "
css
/
jumpserver
.
css
"
%}"
rel=
"stylesheet"
>
</head>
</head>
<body>
<body>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment