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

Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev

pull/26/head
ibuler 2015-12-11 11:45:25 +08:00
parent 34cbb13b8a aa262d0430
commit ba955df493
2 changed files with 105 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
templates/jperm/perm_role_detail.html
View File

@ -30,21 +30,15 @@
<div class="ibox-content"> <div class="ibox-content">
<div> <div>
<div class="text-left"> <div class="text-left">
<table class="table table-striped" id="ugedit" > <table class="table" id="ugedit" >
<thead> <td class="text-navy text-left">时间</td>
<tr> <td class="text-navy text-right">名称</td>
<th class="text-center">时间</th>
<th class="text-center">名称</th>
</tr>
</thead>
<tbody>
{% for rule in rules %} {% for rule in rules %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center"> {{ rule.date_added | date:"Y-m-d H:i:s"}} </td> <td class="text-left"> {{ rule.date_added | date:"Y-m-d H:i:s"}} </td>
<td class="text-center"> <a href="/jperm/perm_rule_detail/?id={{ rule.id }}">{{ rule.name }}</a> </td> <td class="text-right"> <a href="/jperm/perm_rule_detail/?id={{ rule.id }}">{{ rule.name }}</a> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody>
</table> </table>
</div> </div>
</div> </div>
@ -74,38 +68,31 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center" style="float: left;"> <div class="text-center">
<table class="table table-striped" id="ugedit" > <table class="table" id="agedit" >
<thead> <td class="text-navy text-left">用户</td>
<tr> <td class="text-navy text-right">用户组</td>
<th class="text-center">用户</th> <tr>
</tr> <td>
</thead> <table class="table progress-striped text-left">
{% for user in users %}
<tr class="gradeX">
<td> <a href="/jasset/asset_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
</tr>
{% endfor %}
</table>
</td>
<td>
<table class="table progress-striped text-right">
{% for group in user_groups %}
<tr class="gradeX-">
<td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</table>
</td>
<tbody> </tr>
{% for user in users %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="text-center" style="float: right;">
<table class="table table-striped" id="ugedit" >
<thead>
<tr>
<th class="text-center">用户组</th>
</tr>
</thead>
<tbody>
{% for group in user_groups %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_list/?gid={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table> </table>
</div> </div>
</div> </div>
@ -114,7 +101,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<span class="label label-primary"><b>授权主机/主机组</b></span> <span class="label label-primary"><b>授权主机组/主机组</b></span>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
@ -134,28 +121,31 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center" style="float:left;"> <div class="text-center">
<table class="table table-striped" id="agedit" > <table class="table" id="agedit" >
<tr> <td class="text-navy text-left">主机</td>
<th class="text-center">主机</th> <td class="text-navy text-right">主机组</td>
</tr> <tr>
{% for asset in assets %} <td>
<tr class="gradeX"> <table class="table progress-striped text-left">
<td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td> {% for asset in assets %}
</tr> <tr class="gradeX">
{% endfor %} <td> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
</table> </tr>
</div> {% endfor %}
<div class="text-center" style="float:right;"> </table>
<table class="table table-striped" id="agedit" > </td>
<tr> <td>
<th class="text-center">主机组</th> <table class="table progress-striped text-right">
</tr> {% for group in asset_groups %}
{% for group in asset_groups %} <tr class="gradeX-">
<tr class="gradeX"> <td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
<td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td> </tr>
</tr> {% endfor %}
{% endfor %} </table>
</td>
</tr>
</table> </table>
</div> </div>
</div> </div>

104
templates/jperm/perm_rule_detail.html
View File

@ -83,38 +83,31 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center" style="float: left;"> <div class="text-center">
<table class="table table-striped" id="ugedit" > <table class="table" id="agedit" >
<thead> <td class="text-navy text-left">用户</td>
<tr> <td class="text-navy text-right">用户组</td>
<th class="text-center">用户</th> <tr>
</tr> <td>
</thead> <table class="table progress-striped text-left">
{% for user in users %}
<tr class="gradeX">
<td> <a href="/jasset/asset_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
</tr>
{% endfor %}
</table>
</td>
<td>
<table class="table progress-striped text-right">
{% for group in user_groups %}
<tr class="gradeX-">
<td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</table>
</td>
<tbody> </tr>
{% for user in users %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_detail/?id={{ user.id }}">{{ user.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="text-center" style="float: right;">
<table class="table table-striped" id="ugedit" >
<thead>
<tr>
<th class="text-center">用户组</th>
</tr>
</thead>
<tbody>
{% for group in user_groups %}
<tr class="gradeX">
<td class="text-center"> <a href="/juser/user_list/?gid={{ group.id }}">{{ group.name }}</a> </td>
</tr>
{% endfor %}
</tbody>
</table> </table>
</div> </div>
</div> </div>
@ -123,7 +116,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<span class="label label-primary"><b>授权主机/主机组</b></span> <span class="label label-primary"><b>授权主机组/主机组</b></span>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
@ -143,28 +136,31 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center" style="float:left;"> <div class="text-center">
<table class="table table-striped" id="agedit" > <table class="table" id="agedit" >
<tr> <td class="text-navy text-left">主机</td>
<th class="text-center">主机</th> <td class="text-navy text-right">主机组</td>
</tr> <tr>
{% for asset in assets %} <td>
<tr class="gradeX"> <table class="table progress-striped text-left">
<td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td> {% for asset in assets %}
</tr> <tr class="gradeX">
{% endfor %} <td> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
</table> </tr>
</div> {% endfor %}
<div class="text-center" style="float:right;"> </table>
<table class="table table-striped" id="agedit" > </td>
<tr> <td>
<th class="text-center">主机组</th> <table class="table progress-striped text-right">
</tr> {% for group in asset_groups %}
{% for group in asset_groups %} <tr class="gradeX-">
<tr class="gradeX"> <td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
<td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td> </tr>
</tr> {% endfor %}
{% endfor %} </table>
</td>
</tr>
</table> </table>
</div> </div>
</div> </div>