From d84ff9701956c743d4552a9c8dde195e8b4efbea Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 20 Apr 2015 15:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/require.txt                | 11 +++++++++++
 templates/jlog/log_offline.html |  9 +++++----
 templates/jlog/log_online.html  |  8 ++++----
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 docs/require.txt

diff --git a/docs/require.txt b/docs/require.txt
new file mode 100644
index 000000000..321d72a51
--- /dev/null
+++ b/docs/require.txt
@@ -0,0 +1,11 @@
+pexpect==3.3
+sphinx-me==0.3
+django==1.6
+python-ldap==2.4.18
+paramiko==1.15.1
+pycrypto==2.6.1
+ecdsa>=0.11
+MySQL-python==1.2.5
+readline
+django-uuidfield
+psutil
\ No newline at end of file
diff --git a/templates/jlog/log_offline.html b/templates/jlog/log_offline.html
index 30d4511eb..feda70c70 100644
--- a/templates/jlog/log_offline.html
+++ b/templates/jlog/log_offline.html
@@ -128,15 +128,16 @@
        var div_username = ' 用户名: '+'<span class="text-info">'+username+'' + '</span>';
        var div_ip = ' 主机: '+'<span class="text-info">' + ip + '</span>';
        var div_time = ' 开始时间: ' + '<span class="text-info">'+start_time +'</span>' + ' 结束时间: ' +'<span class="text-info">' + end_time + '</span'
-       var title = 'JumpServer命令统计 '+ div_username + div_ip + div_time
+       var title = 'JumpServer命令统计 '+ div_username + div_ip + div_time;
         $.ajax({url:url,success:function(data){
-        BootstrapDialog.show({title: title, message:data});
+        var tag = $('<div style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>').html(data.replace(/\n/g,"<b    r />"));
+        BootstrapDialog.show({title: title, message:tag[0]});
         }});
        return false;
-    })
+    });
     globalConfig = {
         SOCKET_HOST: "{{ web_socket_host }}"
-    }
+    };
 
     function log_search(){
         $.ajax({
diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html
index 2ae318d88..d75b27fbb 100644
--- a/templates/jlog/log_online.html
+++ b/templates/jlog/log_online.html
@@ -136,11 +136,11 @@
         BootstrapDialog.show({message:function(){
             var option, exsit_message;
             var escapeString = function (html){
-                var elem = document.createElement('div')
-                var txt = document.createTextNode(html)
-                elem.appendChild(txt)
+                var elem = document.createElement('div');
+                var txt = document.createTextNode(html);
+                elem.appendChild(txt);
                 return elem.innerHTML;
-            }
+            };
             var tag = $('<div id="log" style="height: 500px;overflow: auto;background-color: rgba(0, 0, 0, 0);"></div>');
             //告诉服务器端有用户登录
             socket.emit('login', {userid:message.id, filename:message.filename});