diff --git a/server/www/teleport/static/js/_sidebar_nav_menu.js b/server/www/teleport/static/js/_sidebar_nav_menu.js new file mode 100644 index 0000000..beacf6e --- /dev/null +++ b/server/www/teleport/static/js/_sidebar_nav_menu.js @@ -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('未能检测到'); + } +}; diff --git a/server/www/teleport/static/js/asset/host-list.js b/server/www/teleport/static/js/asset/host-list.js index 51ed881..2844c68 100644 --- a/server/www/teleport/static/js/asset/host-list.js +++ b/server/www/teleport/static/js/asset/host-list.js @@ -2,7 +2,7 @@ $app.on_init = function (cb_stack) { $app.dom = { - assist_ver: $('#tp-assist-ver'), + // assist_ver: $('#tp-assist-ver'), btn_refresh_host: $('#btn-refresh-host'), btn_add_host: $('#btn-add-host'), chkbox_host_select_all: $('#table-host-select-all'), @@ -19,14 +19,14 @@ $app.on_init = function (cb_stack) { upload_file_message: $('#upload-file-message') }; - $tp.assist_checked = function () { - console.log("---------"); - if ($tp.assist.running) { - $app.dom.assist_ver.html($tp.assist.version); - } else { - $app.dom.assist_ver.html('未能检测到'); - } - }; + // $tp.assist_checked = function () { + // console.log("---------"); + // if ($tp.assist.running) { + // $app.dom.assist_ver.html($tp.assist.version); + // } else { + // $app.dom.assist_ver.html('未能检测到'); + // } + // }; cb_stack .add($app.create_controls) diff --git a/server/www/teleport/static/js/system/config.js b/server/www/teleport/static/js/system/config.js index a41a40b..d20cbba 100644 --- a/server/www/teleport/static/js/system/config.js +++ b/server/www/teleport/static/js/system/config.js @@ -29,7 +29,7 @@ $app.create_info_table = function () { core_info: $('#core-info-kv') }; - _info.init = function () { + _info.init = function (cb_stack) { var h = []; 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('')); + cb_stack.exec(); }; _info._make_info = function (k, v) { diff --git a/server/www/teleport/static/js/system/role.js b/server/www/teleport/static/js/system/role.js index 7064210..b9b88dc 100644 --- a/server/www/teleport/static/js/system/role.js +++ b/server/www/teleport/static/js/system/role.js @@ -32,7 +32,7 @@ $app.on_init = function (cb_stack) { cb_stack.exec(); }; -$app.create_controls = function () { +$app.create_controls = function (cb_stack) { console.log($app.role_list); var nodes = []; var selected_role_id = 0; @@ -149,6 +149,8 @@ $app.create_controls = function () { $app.dom.btn_remove_role.click(function () { $app.remove_role(); }); + + cb_stack.exec(); }; $app.show_role = function (role_id, edit_mode) { diff --git a/server/www/teleport/view/_sidebar_nav_menu.mako b/server/www/teleport/view/_sidebar_nav_menu.mako index ffb4945..2df9ecf 100644 --- a/server/www/teleport/view/_sidebar_nav_menu.mako +++ b/server/www/teleport/view/_sidebar_nav_menu.mako @@ -130,6 +130,14 @@ '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 @@
-
服务端:v${app_ver.TP_SERVER_VER}
+##
服务端:v${app_ver.TP_SERVER_VER}
+##
助手:
+ +
服务端:v${app_ver.TP_SERVER_VER}
+
助手:
+
技术预览版

diff --git a/server/www/teleport/view/asset/host-list.mako b/server/www/teleport/view/asset/host-list.mako index d76fc52..90eb5be 100644 --- a/server/www/teleport/view/asset/host-list.mako +++ b/server/www/teleport/view/asset/host-list.mako @@ -6,7 +6,7 @@ <%inherit file="../page_base.mako"/> <%block name="extend_js_file"> - +## @@ -19,7 +19,7 @@ <%block name="breadcrumb_extra"> diff --git a/server/www/teleport/view/audit/record.mako b/server/www/teleport/view/audit/record.mako index 77146e6..9324e13 100644 --- a/server/www/teleport/view/audit/record.mako +++ b/server/www/teleport/view/audit/record.mako @@ -6,7 +6,7 @@ <%inherit file="../page_base.mako"/> <%block name="extend_js_file"> - +## diff --git a/server/www/teleport/view/ops/remote-list.mako b/server/www/teleport/view/ops/remote-list.mako index cd4a09b..5dc8a70 100644 --- a/server/www/teleport/view/ops/remote-list.mako +++ b/server/www/teleport/view/ops/remote-list.mako @@ -6,7 +6,7 @@ <%inherit file="../page_base.mako"/> <%block name="extend_js_file"> - +## diff --git a/server/www/teleport/view/page_base.mako b/server/www/teleport/view/page_base.mako index cacf535..1766003 100644 --- a/server/www/teleport/view/page_base.mako +++ b/server/www/teleport/view/page_base.mako @@ -89,6 +89,8 @@ + + <%block name="extend_js_file"/>