From 573b3a8743253036eecbeb9c183a201e81ed85c7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 26 Oct 2016 19:31:54 +0800
Subject: [PATCH] Update log_command modal

---
 .../audits/_proxy_log_command_modal.html      | 27 ++++++++
 .../templates/audits/proxy_log_list.html      | 68 ++++++++++---------
 2 files changed, 63 insertions(+), 32 deletions(-)
 create mode 100644 apps/audits/templates/audits/_proxy_log_command_modal.html

diff --git a/apps/audits/templates/audits/_proxy_log_command_modal.html b/apps/audits/templates/audits/_proxy_log_command_modal.html
new file mode 100644
index 000000000..a0e4290ea
--- /dev/null
+++ b/apps/audits/templates/audits/_proxy_log_command_modal.html
@@ -0,0 +1,27 @@
+{% extends '_modal.html' %}
+{% load i18n %}
+{% block modal_id %}Proxy command list{% endblock %}
+{% block modal_title%}{% trans "Proxy command list" %}{% endblock %}
+{% block modal_body %}
+<div class="ibox-content">
+    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="10">
+        <thead>
+        <tr>
+            <th data-toggle="true">ID</th>
+            <th>Command</th>
+            <th data-hide="all">Output</th>
+            <th>Datetime</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for command in object_list %}
+            <tr>
+                <td>{{ command.command_no }}</td>
+                <td>{{ command.command }}</td>
+                <td>{{ command.output_decode |safe }}</td>
+                <td>{{ command.datetime }}</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
diff --git a/apps/audits/templates/audits/proxy_log_list.html b/apps/audits/templates/audits/proxy_log_list.html
index 237fe1efb..3865660fa 100644
--- a/apps/audits/templates/audits/proxy_log_list.html
+++ b/apps/audits/templates/audits/proxy_log_list.html
@@ -1,49 +1,53 @@
 {% extends '_base_list.html' %}
 {% load i18n static %}
 {% block custom_head_css_js %}
-{{ block.super }}
-<style>
-    div.dataTables_wrapper div.dataTables_filter,
-    .dataTables_length {
-        float: right !important;
-    }
+    {{ block.super }}
+    <link href="{% static "css/plugins/footable/footable.core.css" %}" rel="stylesheet">
+    <style>
+        div.dataTables_wrapper div.dataTables_filter,
+        .dataTables_length {
+            float: right !important;
+        }
 
-    div.dataTables_wrapper div.dataTables_filter {
-        margin-left: 15px;
-    }
+        div.dataTables_wrapper div.dataTables_filter {
+            margin-left: 15px;
+        }
 </style>
 {% endblock %}
 {% block table_search %}{% endblock %}
 {% block table_container %}
 {#<div class="uc pull-left m-l-5 m-r-5"><a href="{% url "users:user-create" %}" class="btn btn-sm btn-primary"> {% trans "Create user" %} </a></div>#}
-<table class="table table-striped table-bordered table-hover " id="proxy_log_list_table" >
-    <thead>
-        <tr>
-            <th class="text-center">
-                <div class="checkbox checkbox-default">
-                    <input type="checkbox" class="ipt_check_all">
-                </div>
-            </th>
-            <th class="text-center">{% trans 'Username' %}</th>
-            <th class="text-center">{% trans 'IP' %}</th>
-            <th class="text-center">{% trans 'System user' %}</th>
-{#            <th class="text-center">{% trans 'Login type' %}</th>#}
-            <th class="text-center">{% trans 'Command' %}</th>
-            <th class="text-center">{% trans 'Success' %}</th>
-            <th class="text-center">{% trans 'Finished' %}</th>
-            <th class="text-center">{% trans 'Date start' %}</th>
-            <th class="text-center">{% trans 'Time' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
+    <table class="table table-striped table-bordered table-hover " id="proxy_log_list_table" >
+        <thead>
+            <tr>
+                <th class="text-center">
+                    <div class="checkbox checkbox-default">
+                        <input type="checkbox" class="ipt_check_all">
+                    </div>
+                </th>
+                <th class="text-center">{% trans 'Username' %}</th>
+                <th class="text-center">{% trans 'IP' %}</th>
+                <th class="text-center">{% trans 'System user' %}</th>
+    {#            <th class="text-center">{% trans 'Login type' %}</th>#}
+                <th class="text-center">{% trans 'Command' %}</th>
+                <th class="text-center">{% trans 'Success' %}</th>
+                <th class="text-center">{% trans 'Finished' %}</th>
+                <th class="text-center">{% trans 'Date start' %}</th>
+                <th class="text-center">{% trans 'Time' %}</th>
+                <th class="text-center">{% trans 'Action' %}</th>
+            </tr>
+        </thead>
+        <tbody>
+        </tbody>
+    </table>
+    {% include 'audits/_proxy_log_command_modal.html' %}
 {% endblock %}
 {% block custom_foot_js %}
 <script src="{% static 'js/jquery.form.min.js' %}"></script>
+<script src="{% static "js/plugins/footable/footable.all.min.js" %}"></script>
 <script>
 $(document).ready(function(){
+    $('.footable').footable();
     var options = {
         ele: $('#proxy_log_list_table'),
         columnDefs: [