From 4294ecaf26c3a584214262eb87332b3a0f5c3bb3 Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Thu, 10 Dec 2015 22:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86rule=20=E5=92=8C=20r?=
 =?UTF-8?q?ole=E3=80=80=E7=9A=84detail=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/jperm/perm_role_detail.html | 120 ++++++++++++--------------
 templates/jperm/perm_rule_detail.html | 104 +++++++++++-----------
 2 files changed, 105 insertions(+), 119 deletions(-)

diff --git a/templates/jperm/perm_role_detail.html b/templates/jperm/perm_role_detail.html
index b20cd9833..6b9c7493a 100644
--- a/templates/jperm/perm_role_detail.html
+++ b/templates/jperm/perm_role_detail.html
@@ -30,21 +30,15 @@
                     <div class="ibox-content">
                         <div>
                             <div class="text-left">
-                                <table class="table table-striped" id="ugedit" >
-                                    <thead>
-                                        <tr>
-                                            <th class="text-center">时间</th>
-                                            <th class="text-center">名称</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
+                                <table class="table" id="ugedit" >
+                                            <td class="text-navy text-left">时间</td>
+                                            <td class="text-navy text-right">名称</td>
                                     {% for rule in rules %}
                                         <tr class="gradeX">
-                                            <td class="text-center"> {{ 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-left"> {{ rule.date_added | date:"Y-m-d H:i:s"}} </td>
+                                            <td class="text-right"> <a href="/jperm/perm_rule_detail/?id={{ rule.id }}">{{ rule.name }}</a> </td>
                                         </tr>
                                     {% endfor %}
-                                    </tbody>
                                 </table>
                             </div>
                         </div>
@@ -74,38 +68,31 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                            <div class="text-center" style="float: left;">
-                                <table class="table table-striped" id="ugedit" >
-                                   <thead>
-                                        <tr>
-                                            <th class="text-center">用户</th>
-                                        </tr>
-                                   </thead>
+                            <div class="text-center">
+                                <table class="table" id="agedit" >
+                                    <td class="text-navy text-left">用户</td>
+                                    <td class="text-navy text-right">用户组</td>
+                                    <tr>
+                                        <td>
+                                            <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>
-                                    {% 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>
+                                    </tr>
                                 </table>
                             </div>
                     </div>
@@ -114,7 +101,7 @@
             <div class="col-sm-4">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
-                        <span class="label label-primary"><b>授权主机/主机组</b></span>
+                        <span class="label label-primary"><b>授权主机组/主机组</b></span>
                         <div class="ibox-tools">
                             <a class="collapse-link">
                                 <i class="fa fa-chevron-up"></i>
@@ -134,28 +121,31 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                            <div class="text-center" style="float:left;">
-                                <table class="table table-striped" id="agedit" >
-                                        <tr>
-                                            <th class="text-center">主机</th>
-                                        </tr>
-                                    {% for asset in assets %}
-                                        <tr class="gradeX">
-                                            <td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
-                                        </tr>
-                                    {% endfor %}
-                                </table>
-                            </div>
-                            <div class="text-center" style="float:right;">
-                                <table class="table table-striped" id="agedit" >
-                                        <tr>
-                                            <th class="text-center">主机组</th>
-                                        </tr>
-                                    {% for group in asset_groups %}
-                                        <tr class="gradeX">
-                                            <td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
-                                        </tr>
-                                    {% endfor %}
+                            <div class="text-center">
+                                <table class="table" id="agedit" >
+                                    <td class="text-navy text-left">主机</td>
+                                    <td class="text-navy text-right">主机组</td>
+                                    <tr>
+                                        <td>
+                                            <table class="table progress-striped text-left">
+                                            {% for asset in assets %}
+                                                <tr class="gradeX">
+                                                    <td> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
+                                                </tr>
+                                            {% endfor %}
+                                            </table>
+                                        </td>
+                                        <td>
+                                            <table class="table progress-striped text-right">
+                                            {% for group in asset_groups %}
+                                                <tr class="gradeX-">
+                                                    <td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
+                                                </tr>
+                                            {% endfor %}
+                                            </table>
+                                        </td>
+
+                                    </tr>
                                 </table>
                             </div>
                     </div>
diff --git a/templates/jperm/perm_rule_detail.html b/templates/jperm/perm_rule_detail.html
index e9184253e..ccecce500 100644
--- a/templates/jperm/perm_rule_detail.html
+++ b/templates/jperm/perm_rule_detail.html
@@ -83,38 +83,31 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                            <div class="text-center" style="float: left;">
-                                <table class="table table-striped" id="ugedit" >
-                                   <thead>
-                                        <tr>
-                                            <th class="text-center">用户</th>
-                                        </tr>
-                                   </thead>
+                            <div class="text-center">
+                                <table class="table" id="agedit" >
+                                    <td class="text-navy text-left">用户</td>
+                                    <td class="text-navy text-right">用户组</td>
+                                    <tr>
+                                        <td>
+                                            <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>
-                                    {% 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>
+                                    </tr>
                                 </table>
                             </div>
                     </div>
@@ -123,7 +116,7 @@
             <div class="col-sm-4">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
-                        <span class="label label-primary"><b>授权主机/主机组</b></span>
+                        <span class="label label-primary"><b>授权主机组/主机组</b></span>
                         <div class="ibox-tools">
                             <a class="collapse-link">
                                 <i class="fa fa-chevron-up"></i>
@@ -143,28 +136,31 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                            <div class="text-center" style="float:left;">
-                                <table class="table table-striped" id="agedit" >
-                                        <tr>
-                                            <th class="text-center">主机</th>
-                                        </tr>
-                                    {% for asset in assets %}
-                                        <tr class="gradeX">
-                                            <td class="text-center"> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
-                                        </tr>
-                                    {% endfor %}
-                                </table>
-                            </div>
-                            <div class="text-center" style="float:right;">
-                                <table class="table table-striped" id="agedit" >
-                                        <tr>
-                                            <th class="text-center">主机组</th>
-                                        </tr>
-                                    {% for group in asset_groups %}
-                                        <tr class="gradeX">
-                                            <td class="text-center"> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
-                                        </tr>
-                                    {% endfor %}
+                            <div class="text-center">
+                                <table class="table" id="agedit" >
+                                    <td class="text-navy text-left">主机</td>
+                                    <td class="text-navy text-right">主机组</td>
+                                    <tr>
+                                        <td>
+                                            <table class="table progress-striped text-left">
+                                            {% for asset in assets %}
+                                                <tr class="gradeX">
+                                                    <td> <a href="/jasset/asset_detail/?id={{ asset.id }}">{{ asset.ip }}</a> </td>
+                                                </tr>
+                                            {% endfor %}
+                                            </table>
+                                        </td>
+                                        <td>
+                                            <table class="table progress-striped text-right">
+                                            {% for group in asset_groups %}
+                                                <tr class="gradeX-">
+                                                    <td> <a href="/jasset/asset_list/?group_id={{ group.id }}">{{ group.name }}</a> </td>
+                                                </tr>
+                                            {% endfor %}
+                                            </table>
+                                        </td>
+
+                                    </tr>
                                 </table>
                             </div>
                     </div>