修正几处图标显示不正常的错误。

pull/105/head
Apex Liu 2018-04-18 13:44:46 +08:00
parent 8de120ba92
commit c54510deb0
8 changed files with 33 additions and 9 deletions

View File

@ -30,7 +30,7 @@ $app.on_init = function (cb_stack, cb_args) {
var _t = [];
_t.push('<div class="alert alert-warning">');
_t.push('<i class="fa fa-warning"></i> 注意请确保您在执行后续创建操作之前已经在MySQL中使用 <span class="bold">UTF8字符集</span> 创建了库“');
_t.push('<i class="fas fa-exclamation-triangle"></i> 注意请确保您在执行后续创建操作之前已经在MySQL中使用 <span class="bold">UTF8字符集</span> 创建了库“');
_t.push($app.options.db.mysql_db);
_t.push('”,并且用户“');
_t.push($app.options.db.mysql_user);

View File

@ -1133,6 +1133,10 @@ $app.create_dlg_sel_user = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的操作者!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,
@ -1272,6 +1276,10 @@ $app.create_dlg_sel_user_group = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的操作者!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,
@ -1453,6 +1461,10 @@ $app.create_dlg_sel_acc = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的资产!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,
@ -1592,6 +1604,10 @@ $app.create_dlg_sel_acc_group = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的资产!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,
@ -1753,6 +1769,10 @@ $app.create_dlg_sel_host = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的资产!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,
@ -1893,6 +1913,10 @@ $app.create_dlg_sel_host_group = function () {
dlg.on_add = function () {
var items = dlg.get_selected_items();
if(items.length === 0) {
$tp.notify_error('请先选择要添加的资产!');
return;
}
$tp.ajax_post_json('/ops/policy/add-members', {
policy_id: $app.options.policy_id,

View File

@ -11,7 +11,7 @@ $tp.notify_error = function (message_, title_, timeout_) {
//sticky:true,
class_name: 'gritter-error',
time: _t,
title: '<i class="fa fa-warning fa-fw"></i> 错误:' + _title,
title: '<i class="fas fa-exclamation-triangle fa-fw"></i> 错误:' + _title,
text: message_
});
console.error('错误', _title, message_);
@ -58,7 +58,7 @@ $tp.disable_dom = function (dom_selector, message) {
html.push('<div id="tp-dom-disable-overlay" class="disable-bg"></div>');
var has_message = false;
if (!_.isUndefined(message) && !_.isNull(message) && message.length > 0) {
html.push('<div id="tp-dom-disable-message" class="disable-message"><i class="fa fa-warning fa-fw"></i> ' + message + '</div>');
html.push('<div id="tp-dom-disable-message" class="disable-message"><i class="fas fa-exclamation-triangle fa-fw"></i> ' + message + '</div>');
has_message = true;
}
@ -97,7 +97,7 @@ $tp.disable_dom = function (dom_selector, message) {
$tp.dlg_confirm = function (cb_stack, cb_args) {
var self = {};
self._cb_stack = cb_stack;
self._title = cb_args.title || '<i class="fa fa-warning"></i> 操作确认';
self._title = cb_args.title || '<i class="fas fa-exclamation-triangle"></i> 操作确认';
self._msg = cb_args.msg || '';
self._btn_yes = cb_args.btn_yes || '确定';
self._btn_no = cb_args.btn_no || '取消';

View File

@ -688,7 +688,7 @@ $tp.create_table = function (options) {
_tbl.loading_timer = null;
}
var msg_loading = '<tr><td class="loading" colspan="' + _tbl.column_count + '" style="text-align:center;background-color:#f0d4d2;"><i class="fa fa-warning fa-fw"></i> 糟糕!加载失败了...</td></tr>';
var msg_loading = '<tr><td class="loading" colspan="' + _tbl.column_count + '" style="text-align:center;background-color:#f0d4d2;"><i class="fas fa-exclamation-triangle fa-fw"></i> 糟糕!加载失败了...</td></tr>';
$('#' + _tbl.dom_id + ' tbody').empty().append($(msg_loading))
};

View File

@ -100,7 +100,7 @@ $app.on_init = function (cb_stack) {
$app.dom.find.input_username.focus();
} else if ($app.options.mode === 2) {
// show 'error' page
$app.dom.icon_bg.addClass('fa fa-warning').css('color', '#ff6242');
$app.dom.icon_bg.addClass('fas fa-exclamation-triangle').css('color', '#ff6242');
if ($app.options.code === TPE_NOT_EXISTS) {
$app.dom.title.text('链接无效');
$app.dom.error.message.html('当前使用的密码重置链接无效可能已经因过期而被清除密码重置链接仅在24小时内有效请及时设置您的新密码');

View File

@ -38,7 +38,7 @@
<p>TELEPORT支持 SQLite 和 MySQL 数据库,您目前使用的配置如下:</p>
<table id="db-info" class="table"></table>
<div class="alert alert-warning">
<i class="fa fa-warning"></i> 注意:如果以上配置并不是您所期望的,请修改您的配置文件,然后刷新本页面。
<i class="fas fa-exclamation-triangle"></i> 注意:如果以上配置并不是您所期望的,请修改您的配置文件,然后刷新本页面。
<a href="https://github.com/eomsoft/teleport/wiki/deployment-config" target="_blank">如何设置配置文件?</a>
</div>
</div>

View File

@ -266,7 +266,7 @@
<button type="button" class="btn btn-sm btn-primary" id="btn-send-reset-email" style="margin-top:10px;"><i class="fa fa-send fa-fw"></i> 发送邮件</button>
</div>
<div id="cannot-send-email" class="alert alert-warning" style="margin-top:10px;">
<i class="fa fa-warning fa-fw"></i> <span id="msg-cannot-send-email">用户未设置邮箱</span>,密码重置邮件功能无法使用,请使用手动重置方式。
<i class="fas fa-exclamation-triangle fa-fw"></i> <span id="msg-cannot-send-email">用户未设置邮箱</span>,密码重置邮件功能无法使用,请使用手动重置方式。
</div>
</div>
</div>

View File

@ -151,7 +151,7 @@ class DoGetGroupsHandler(TPBaseJsonHandler):
except:
return self.write_json(TPE_JSON_FORMAT)
print('---get groups:', args)
# print('---get groups:', args)
sql_filter = {}
sql_order = dict()