From e60a3a697ec46064afb383ec7efe8b7fcc340575 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sat, 7 Nov 2015 17:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95web=20termi?=
 =?UTF-8?q?nal=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run_websocket.py               | 4 ++--
 templates/jlog/log_online.html | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/run_websocket.py b/run_websocket.py
index 120dd1097..18c297ad5 100644
--- a/run_websocket.py
+++ b/run_websocket.py
@@ -50,8 +50,8 @@ def require_auth(func):
         client = tornado.httpclient.HTTPClient()
         # response = client.fetch('http://some/url') + urllib.urlencode({'username': username,
         #                                                                'asset_name': asset_name, 'token': token})
-        return request.close()
-        # return func(request, *args, **kwargs)
+        # return request.close()
+        return func(request, *args, **kwargs)
     return _deco
 
 
diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html
index 3bc55bc5c..96d8a9d07 100644
--- a/templates/jlog/log_online.html
+++ b/templates/jlog/log_online.html
@@ -50,7 +50,7 @@
         <div class="col-lg-12">
             <div class="ibox float-e-margins">
                 <div id="ibox-content" class="ibox-title">
-                    <h5> 用户日志详细信息列表 </h5>
+                    <h5> 用户日志详细信息列表 <input type="button" id="test_connect" class="btn btn-primary" value="测试连接 web terminal" /> </h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -188,6 +188,10 @@
             }});
            return false;
         });
+
+        $('#test_connect').click(function(){
+            window.open('/jlog/web_terminal/?asset_name="hello', '播放', 'height=400, width=600, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no');
+        });
     });
 
 {#    function log_search(){#}