Merge pull request #185 from sunYanxl/dev

feat(logview): add navigation in logview
Tencent · Jul 19, 2018 · c121e89 · c121e89
2 parents a1cb016 + 07947d1
commit c121e89
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ feature/bugfix PR
 ### PR流程
 TSW团队会查看所有的PR，我们会运行一些代码检查和测试，一经测试通过，我们会接受这次PR，但不会立即将代码合并到master分支上，会有一点延迟。
 
-当您准备pull requests时，请确保已经完成以下几个步骤:
+当您准备PR时，请确保已经完成以下几个步骤:
 
 1. 将仓库fork下来并基于`master`分支创建您的开发分支。
 2. 如果您更改了APIs请更新代码及文档。

diff --git a/README_en.md b/README_en.md
@@ -69,7 +69,7 @@ docker run -v configure_dir:/data/release/node_modules -p 8080:80 tsw
 
 Find a bug or have a feature request? Please read the [issues](https://github.com/Tencent/TSW/issues) guidelines and search for existing and closed issues.
 
-If your problem or idea is not addressed yet, please read through our [contributing guidelines](./CONTRIBUTING.md) and open a new [issues](https://github.com/Tencent/TSW/issues).
+If your problem or idea is not addressed yet, please read through our [contributing guidelines](./CONTRIBUTING_en.md) and open a new [issues](https://github.com/Tencent/TSW/issues).
 
 ## License
 

diff --git a/bin/tsw/util/auto-report/src/view.tmpl.html b/bin/tsw/util/auto-report/src/view.tmpl.html
@@ -74,14 +74,16 @@
 </head>
 <body>
     <div class="view-title">
-        <a class="button" href="<%=window && window.request && window.request.REQUEST && window.request.REQUEST.pathname && window.request.REQUEST.pathname.replace('/log/view/','/log/download/')%>" target="_blank">下载全部抓包</a>
         <a class="button r" href="https://www.telerik.com/fiddler" target="_blank">Fiddler下载</a>
         <a class="button r" href="https://github.com/avwo/whistle" target="_blank">Whistle下载(mac推荐)</a>
         <label class="button label" style="cursor:pointer;" id="showErrorLogItem"><input type="checkbox" id="showErrorLogItemChk" value="showErrorLogItem">仅显示有错误的</label>
         <label class="button label" style="cursor:pointer;" id="showRequestListItem"><input type="checkbox" id="showRequestListChk" value="showRequestList">快速显示请求列表</label>
         <%if(appid){%>
             <a class="button" href="/app/status" target="_blank">实时监控</a>
             <a class="button" href="/h5test/page" target="_blank">测试环境</a>
+            <a class="button" href="/profile" target="_blank">个人主页</a>
+            <a class="button" href="/runtime/report" target="_blank">runtime</a>
+            <a class="button" href="/project" target="_blank">应用详情</a>
         <%}else{%>
             <a class="button" href="/h5test/page/alpha" target="_blank">临时染色</a>
         <%}%>

diff --git a/bin/tsw/util/auto-report/tmpl.js b/bin/tsw/util/auto-report/tmpl.js
@@ -293,11 +293,9 @@ define(function(require, exports, module) {
             groupArr = tmp;
 
             var XSS = plug('util/xss.js');
-            __p.push('<html>\n<head>\n    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n    <title>TSW云抓包&#8482;</title>\n    <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />\n    <link href="/static/tsw/styles/logview/style.css" rel="stylesheet">\n</head>\n<body>\n    <div class="view-title">\n        <a class="button" href="');
-            _p(window && window.request && window.request.REQUEST && window.request.REQUEST.pathname && window.request.REQUEST.pathname.replace('/log/view/', '/log/download/'));
-            __p.push('" target="_blank">下载全部抓包</a>\n        <a class="button r" href="https://www.telerik.com/fiddler" target="_blank">Fiddler下载</a>\n        <a class="button r" href="https://github.com/avwo/whistle" target="_blank">Whistle下载(mac推荐)</a>\n        <label class="button label" style="cursor:pointer;" id="showErrorLogItem"><input type="checkbox" id="showErrorLogItemChk" value="showErrorLogItem">仅显示有错误的</label>\n        <label class="button label" style="cursor:pointer;" id="showRequestListItem"><input type="checkbox" id="showRequestListChk" value="showRequestList">快速显示请求列表</label>');
+            __p.push('<html>\n<head>\n    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n    <title>TSW云抓包&#8482;</title>\n    <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />\n    <link href="/static/tsw/styles/logview/style.css" rel="stylesheet">\n</head>\n<body>\n    <div class="view-title">\n        <a class="button r" href="https://www.telerik.com/fiddler" target="_blank">Fiddler下载</a>\n        <a class="button r" href="https://github.com/avwo/whistle" target="_blank">Whistle下载(mac推荐)</a>\n        <label class="button label" style="cursor:pointer;" id="showErrorLogItem"><input type="checkbox" id="showErrorLogItemChk" value="showErrorLogItem">仅显示有错误的</label>\n        <label class="button label" style="cursor:pointer;" id="showRequestListItem"><input type="checkbox" id="showRequestListChk" value="showRequestList">快速显示请求列表</label>');
             if (appid) {
-                __p.push('            <a class="button" href="/app/status" target="_blank">实时监控</a>\n            <a class="button" href="/h5test/page" target="_blank">测试环境</a>');
+                __p.push('            <a class="button" href="/app/status" target="_blank">实时监控</a>\n            <a class="button" href="/h5test/page" target="_blank">测试环境</a>\n            <a class="button" href="/profile" target="_blank">个人主页</a>\n            <a class="button" href="/runtime/report" target="_blank">runtime</a>\n            <a class="button" href="/project" target="_blank">应用详情</a>');
             } else {
                 __p.push('            <a class="button" href="/h5test/page/alpha" target="_blank">临时染色</a>');
             }__p.push('        <label class="button" target="_blank" title="item/user/userLimit">');