github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

在侧边栏显示助手版本，以及助手设置链接。

pull/105/head
Apex Liu 2018-04-17 02:47:30 +08:00
parent 60d3f63d7d
commit d88af1ed77
9 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/www/teleport/static/js/_sidebar_nav_menu.js Normal file
View File

@ -0,0 +1,9 @@
"use strict";
$tp.assist_checked = function () {
if ($tp.assist.running) {
$('#sidebar-tp-assist-ver').html('v'+$tp.assist.version);
} else {
$('#sidebar-tp-assist-ver').html('未能检测到');
}
};

18
server/www/teleport/static/js/asset/host-list.js
View File

@ -2,7 +2,7 @@
$app.on_init = function (cb_stack) { $app.on_init = function (cb_stack) {
$app.dom = { $app.dom = {
assist_ver: $('#tp-assist-ver'), // assist_ver: $('#tp-assist-ver'),
btn_refresh_host: $('#btn-refresh-host'), btn_refresh_host: $('#btn-refresh-host'),
btn_add_host: $('#btn-add-host'), btn_add_host: $('#btn-add-host'),
chkbox_host_select_all: $('#table-host-select-all'), chkbox_host_select_all: $('#table-host-select-all'),
@ -19,14 +19,14 @@ $app.on_init = function (cb_stack) {
upload_file_message: $('#upload-file-message') upload_file_message: $('#upload-file-message')
}; };
$tp.assist_checked = function () { // $tp.assist_checked = function () {
console.log("---------"); // console.log("---------");
if ($tp.assist.running) { // if ($tp.assist.running) {
$app.dom.assist_ver.html($tp.assist.version); // $app.dom.assist_ver.html($tp.assist.version);
} else { // } else {
$app.dom.assist_ver.html('<a href="http://teleport.eomsoft.net/download" target="_blank" class="error">未能检测到</a>'); // $app.dom.assist_ver.html('<a href="http://teleport.eomsoft.net/download" target="_blank" class="error">未能检测到</a>');
} // }
}; // };
cb_stack cb_stack
.add($app.create_controls) .add($app.create_controls)

3
server/www/teleport/static/js/system/config.js
View File

@ -29,7 +29,7 @@ $app.create_info_table = function () {
core_info: $('#core-info-kv') core_info: $('#core-info-kv')
}; };
_info.init = function () { _info.init = function (cb_stack) {
var h = []; var h = [];
h.push(_info._make_info('WEB服务版本', $app.options.web_cfg.version)); h.push(_info._make_info('WEB服务版本', $app.options.web_cfg.version));
@ -65,6 +65,7 @@ $app.create_info_table = function () {
_info.dom.core_info.append(h.join('')); _info.dom.core_info.append(h.join(''));
cb_stack.exec();
}; };
_info._make_info = function (k, v) { _info._make_info = function (k, v) {

4
server/www/teleport/static/js/system/role.js
View File

@ -32,7 +32,7 @@ $app.on_init = function (cb_stack) {
cb_stack.exec(); cb_stack.exec();
}; };
$app.create_controls = function () { $app.create_controls = function (cb_stack) {
console.log($app.role_list); console.log($app.role_list);
var nodes = []; var nodes = [];
var selected_role_id = 0; var selected_role_id = 0;
@ -149,6 +149,8 @@ $app.create_controls = function () {
$app.dom.btn_remove_role.click(function () { $app.dom.btn_remove_role.click(function () {
$app.remove_role(); $app.remove_role();
}); });
cb_stack.exec();
}; };
$app.show_role = function (role_id, edit_mode) { $app.show_role = function (role_id, edit_mode) {

15
server/www/teleport/view/_sidebar_nav_menu.mako
View File

@ -130,6 +130,14 @@
'name': '系统设置', 'name': '系统设置',
}, },
] ]
},
{
'privilege': const.TP_PRIVILEGE_LOGIN_WEB,
'id': 'assist',
'link': 'http://127.0.0.1:50022/config',
'target': '_blank',
'name': '助手设置',
'icon': 'fa-flash'
} }
] ]
%> %>
@ -205,7 +213,12 @@
<hr style="border:none;border-bottom:1px dotted #4a4a4a;margin-bottom:0;"/> <hr style="border:none;border-bottom:1px dotted #4a4a4a;margin-bottom:0;"/>
<div style="color:#717171;font-size:90%;margin-top:5px;text-align:center;"> <div style="color:#717171;font-size:90%;margin-top:5px;text-align:center;">
<div style="margin-top:5px;text-align:center;">服务端：<span class="mono">v${app_ver.TP_SERVER_VER}</span></div> ## <div style="margin-top:5px;text-align:center;">服务端：<span class="mono">v${app_ver.TP_SERVER_VER}</span></div>
## <div style="margin-top:5px;text-align:center;">助手：<span class="mono"><span id="sidebar-tp-assist-ver"></span></span></div>
<div style="color:#717171;font-size:90%;margin-top:5px;"><span style="display:inline-block;width:50px;text-align: right">服务端：</span><span class="mono">v${app_ver.TP_SERVER_VER}</span></div>
<div style="color:#717171;font-size:90%;margin-top:5px;"><span style="display:inline-block;width:50px;text-align: right">助手：</span><span class="mono"><span id="sidebar-tp-assist-ver"><i class="fa fa-cog fa-spin"></i></span></span></div>
<div style="font-size:80%;margin-top:5px;text-align:center;"><span class="error">技术预览版</span></div> <div style="font-size:80%;margin-top:5px;text-align:center;"><span class="error">技术预览版</span></div>
</div> </div>
<hr style="border:none;border-bottom:1px dotted #4a4a4a;margin-bottom:20px;margin-top:5px;"/> <hr style="border:none;border-bottom:1px dotted #4a4a4a;margin-bottom:20px;margin-top:5px;"/>

4
server/www/teleport/view/asset/host-list.mako
View File

@ -6,7 +6,7 @@
<%inherit file="../page_base.mako"/> <%inherit file="../page_base.mako"/>
<%block name="extend_js_file"> <%block name="extend_js_file">
<script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script> ## <script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script>
<script type="text/javascript" src="${ static_url('js/asset/host-list.js') }"></script> <script type="text/javascript" src="${ static_url('js/asset/host-list.js') }"></script>
<script type="text/javascript" src="${ static_url('plugins/jquery/ajaxfileupload.js') }"></script> <script type="text/javascript" src="${ static_url('plugins/jquery/ajaxfileupload.js') }"></script>
</%block> </%block>
@ -19,7 +19,7 @@
<%block name="breadcrumb_extra"> <%block name="breadcrumb_extra">
<ol class="breadcrumb breadcrumb-list"> <ol class="breadcrumb breadcrumb-list">
## <li><i class="fa fa-clock-o"></i> 服务器时间：<span id="tp-timer">-</span></li> ## <li><i class="fa fa-clock-o"></i> 服务器时间：<span id="tp-timer">-</span></li>
<li><i class="fa fa-flash"></i> 助手版本：<span id="tp-assist-ver"></span></li> ## <li><i class="fa fa-flash"></i> 助手版本：<span id="tp-assist-ver"></span></li>
</ol> </ol>
</%block> </%block>

2
server/www/teleport/view/audit/record.mako
View File

@ -6,7 +6,7 @@
<%inherit file="../page_base.mako"/> <%inherit file="../page_base.mako"/>
<%block name="extend_js_file"> <%block name="extend_js_file">
<script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script> ## <script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script>
<script type="text/javascript" src="${ static_url('js/audit/record-list.js') }"></script> <script type="text/javascript" src="${ static_url('js/audit/record-list.js') }"></script>
</%block> </%block>

2
server/www/teleport/view/ops/remote-list.mako
View File

@ -6,7 +6,7 @@
<%inherit file="../page_base.mako"/> <%inherit file="../page_base.mako"/>
<%block name="extend_js_file"> <%block name="extend_js_file">
<script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script> ## <script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script>
<script type="text/javascript" src="${ static_url('js/ops/remote-list.js') }"></script> <script type="text/javascript" src="${ static_url('js/ops/remote-list.js') }"></script>
</%block> </%block>

2
server/www/teleport/view/page_base.mako
View File

@ -89,6 +89,8 @@
<script type="text/javascript" src="${ static_url('js/teleport/common.js') }"></script> <script type="text/javascript" src="${ static_url('js/teleport/common.js') }"></script>
<script type="text/javascript" src="${ static_url('js/teleport/controls.js') }"></script> <script type="text/javascript" src="${ static_url('js/teleport/controls.js') }"></script>
<script type="text/javascript" src="${ static_url('js/tp-assist.js') }"></script>
<script type="text/javascript" src="${ static_url('js/_sidebar_nav_menu.js') }"></script>
<%block name="extend_js_file"/> <%block name="extend_js_file"/>