orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：role="tooltip" 更改为 data-toggle="tooltip"

This commit is contained in:
Argo-MacBookPro 2018-08-03 19:40:01 +08:00
parent aa9274b2b8
commit ebf91e0f67
12 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bootstrap.Admin/Views/Admin/Notifications.cshtml
View File

@ -10,11 +10,10 @@
<link href="~/css/tasks.css" rel="stylesheet" />
}
<div class="card">
<div class="card-header">用户注册<span class="pull-right"><a id="refreshUsers" href="javascript:;" class="fa fa-refresh" title="点击刷新" role="tooltip" data-placement="left"></a></span></div>
<div class="card-header">用户注册<span class="pull-right"><a id="refreshUsers" href="javascript:;" class="fa fa-refresh" title="点击刷新" data-toggle="tooltip" data-placement="left"></a></span></div>
<div class="card-body">
<div class="tasks-widget">
<ul id="tasks-users" class="task-list ui-sortable">
</ul>
<ul id="tasks-users" class="task-list ui-sortable"></ul>
</div>
</div>
</div>

2
Bootstrap.Admin/Views/Admin/Settings.cshtml
View File

@ -64,7 +64,7 @@
</div>
</div>
<div class="card">
<div class="card-header">网站缓存<a data-method="clear" href="#" class="clearcache fa fa-times-circle-o" data-admin="@User.IsInRole("Administrators")" title="全部清除" role="tooltip" data-placement="left"></a><a data-method="refresh" href="#" class="pull-right fa fa-refresh" title="点击刷新" role="tooltip"></a></div>
<div class="card-header">网站缓存<a data-method="clear" href="#" class="clearcache fa fa-times-circle-o" data-admin="@User.IsInRole("Administrators")" title="全部清除" data-toggle="tooltip" data-placement="left"></a><a data-method="refresh" href="#" class="pull-right fa fa-refresh" title="点击刷新" data-toggle="tooltip"></a></div>
<div class="card-body">
<div class="tasks-widget">
<ul id="sortable" class="task-list ui-sortable"></ul>

2
Bootstrap.Admin/Views/Shared/Footer.cshtml
View File

@ -2,7 +2,7 @@
<footer class="site-footer">
<div class="text-center">
<span id="websiteFooter">@Model.Footer</span>
<a id="gotoTop" href="#" class="go-top" title="返回顶部" role="tooltip" data-placement="left">
<a id="gotoTop" href="#" class="go-top" title="返回顶部" data-toggle="tooltip" data-placement="left">
<i class="fa fa-angle-up"></i>
</a>
</div>

4
Bootstrap.Admin/wwwroot/css/site.css
View File

@ -506,3 +506,7 @@ label.dropdown-item:first-child {
.btn-xs {
padding: 1px 5px;
}
.form-check-label {
cursor: pointer;
}

10
Bootstrap.Admin/wwwroot/js/Groups.js
View File

@ -27,7 +27,7 @@
return $.format(htmlTemplate, element.Id, element.RoleName, element.Checked, element.Description);
}).join('')
$dialogRoleHeader.text($.format('{0}-角色授权窗口', row.GroupName));
$dialogRoleForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogRoleForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogRole.modal('show');
@ -45,7 +45,7 @@
return $.format(htmlTemplate, element.Id, element.DisplayName, element.Checked, element.UserName);
}).join('');
$dialogUserHeader.text($.format('{0}-用户授权窗口', row.GroupName));
$dialogUserForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogUserForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogUser.modal('show');
@ -79,9 +79,9 @@
sortName: 'GroupName',
queryParams: function (params) { return $.extend(params, { groupName: $("#txt_search_name").val(), description: $("#txt_group_desc").val() }); }, //传递参数（*）
columns: [{ checkbox: true },
{ title: "编辑", field: "Id", events: bsa.idEvents(), formatter: BootstrapAdmin.idFormatter },
{ title: "部门名称", field: "GroupName", sortable: true },
{ title: "部门描述", field: "Description", sortable: false }
{ title: "编辑", field: "Id", events: bsa.idEvents(), formatter: BootstrapAdmin.idFormatter },
{ title: "部门名称", field: "GroupName", sortable: true },
{ title: "部门描述", field: "Description", sortable: false }
]
});
});

2
Bootstrap.Admin/wwwroot/js/Longbow.Common.js
View File

@ -120,7 +120,7 @@
contentType: 'application/json',
dataType: 'json',
method: "post",
htmlTemplate: '<div class="form-group checkbox col-md-3 col-sm-4 col-6"><label role="tooltip" title="{3}"><input type="checkbox" value="{0}" {2}/>{1}</label></div>',
htmlTemplate: '<div class="form-group col-md-3 col-sm-4 col-6"><div class="form-check"><label class="form-check-label" title="{3}" data-toggle="tooltip"><input type="checkbox" class="form-check-input" value="{0}" {2}/>{1}</label></div></div>',
title: "",
swal: true,
modal: null,

2
Bootstrap.Admin/wwwroot/js/Menus.js
View File

@ -50,7 +50,7 @@
return $.format(htmlTemplate, element.Id, element.RoleName, element.Checked, element.Description);
}).join('')
$dialogRoleHeader.text($.format('{0}-角色授权窗口', row.Name));
$dialogRoleForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogRoleForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogRole.modal('show');

4
Bootstrap.Admin/wwwroot/js/Roles.js
View File

@ -33,7 +33,7 @@
return $.format(htmlTemplate, element.Id, element.DisplayName, element.Checked, element.UserName);
}).join('');
$dialogUserHeader.text($.format('{0}-用户授权窗口', row.RoleName));
$dialogUserForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogUserForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogUser.modal('show');
@ -51,7 +51,7 @@
return $.format(htmlTemplate, element.Id, element.GroupName, element.Checked, element.Description);
}).join('');
$dialogGroupHeader.text($.format('{0}-部门授权窗口', row.RoleName));
$dialogGroupForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogGroupForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogGroup.modal('show');

4
Bootstrap.Admin/wwwroot/js/Settings.js
View File

@ -70,7 +70,7 @@
swal: false,
callback: function (result) {
if ($.isArray(result)) {
var html = '<li class="{4}"><i class="fa fa-ellipsis-v"></i><div class="task-title"><span class="task-title-sp" role="tooltip" title="{1}">{2}</span><span class="badge badge-success">{0}</span><span class="task-value" title="{3}">{3}</span><div class="pull-right hidden-phone"><span>{7}</span><button class="btn btn-danger btn-xs fa fa-trash-o" title="{1}" data-url="{5}?cacheKey={1}" role="tooltip" data-self="{6}" data-placement="left"></button></div></div></li>';
var html = '<li class="{4}"><i class="fa fa-ellipsis-v"></i><div class="task-title"><span class="task-title-sp" data-toggle="tooltip" title="{1}">{2}</span><span class="badge badge-success">{0}</span><span class="task-value" title="{3}">{3}</span><div class="pull-right hidden-phone"><span>{7}</span><button class="btn btn-danger btn-xs fa fa-trash-o" title="{1}" data-url="{5}?cacheKey={1}" data-toggle="tooltip" data-self="{6}" data-placement="left"></button></div></div></li>';
var content = result.sort(function (x, y) {
return x.Key > y.Key ? 1 : -1;
}).map(function (ele) {
@ -114,7 +114,7 @@
}).join('');
$sortable.append($.format('<li class="title">{0}</li>', item.Desc));
$sortable.append(content);
$sortable.find('[role="tooltip"]').tooltip();
$sortable.find('[data-toggle="tooltip"]').tooltip();
}
}
});

4
Bootstrap.Admin/wwwroot/js/Users.js
View File

@ -29,7 +29,7 @@
return $.format(htmlTemplate, element.Id, element.RoleName, element.Checked, element.Description);
}).join('')
$dialogRoleHeader.text($.format('{0}-角色授权窗口', row.DisplayName));
$dialogRoleForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogRoleForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogRole.modal('show');
@ -47,7 +47,7 @@
return $.format(htmlTemplate, element.Id, element.GroupName, element.Checked, element.Description);
}).join('');
$dialogGroupHeader.text($.format('{0}-部门授权窗口', row.DisplayName));
$dialogGroupForm.html(html).find('[role="tooltip"]').each(function (index, label) {
$dialogGroupForm.html(html).find('[data-toggle="tooltip"]').each(function (index, label) {
if (label.title == "") label.title = "未设置";
}).tooltip();
$dialogGroup.modal('show');

2
Bootstrap.Admin/wwwroot/js/common-scripts.js
View File

@ -165,7 +165,7 @@ $(function () {
scrollTop: 0
}, 200);
});
$('[role="tooltip"]').tooltip();
$('[data-toggle="tooltip"]').tooltip();
// breadcrumb
var arch = $('#nav-accordion').find('a.active').last();

4
Bootstrap.Admin/wwwroot/js/noti.js
View File

@ -1,7 +1,7 @@
$(function () {
var $btnRefreshUser = $('#refreshUsers');
var htmlNewUsersHeader = '<li class="task-header"><div class="task-title notifi"><span class="task-title-sp">登陆名称</span><span class="task-value">显示名称/备注</span><span class="task-time">注册时间</span><div class="pull-right task-oper">操作</div></div></li>';
var htmlNewUsers = '<li class="list-primary"><i class="fa fa-ellipsis-v"></i><div class="task-title notifi"><span class="task-title-sp">{0}</span><span class="task-value">{4}：{1}</span><span class="task-time">{2}</span><div class="pull-right hidden-phone"><button class="btn btn-success btn-xs fa fa-check" role="tooltip" data-id="{3}" data-result="1" title="同意授权"></button><button class="btn btn-danger btn-xs fa fa-remove" role="tooltip" data-id="{3}" data-result="0" title="拒绝授权"></button></div></div></li>';
var htmlNewUsers = '<li class="list-primary"><i class="fa fa-ellipsis-v"></i><div class="task-title notifi"><span class="task-title-sp">{0}</span><span class="task-value">{4}：{1}</span><span class="task-time">{2}</span><div class="pull-right hidden-phone"><button class="btn btn-success btn-xs fa fa-check" data-toggle="tooltip" data-id="{3}" data-result="1" title="同意授权"></button><button class="btn btn-danger btn-xs fa fa-remove" data-toggle="tooltip" data-id="{3}" data-result="0" title="拒绝授权"></button></div></div></li>';
function listData() {
$btnRefreshUser.toggleClass('fa-spin');
@ -15,7 +15,7 @@
return $.format(htmlNewUsers, noti.UserName, noti.Description, noti.RegisterTime, noti.Id, noti.DisplayName);
}).join('');
$taskUsers.append(content);
$('#tasks-users').find('[role="tooltip"]').tooltip();
$('#tasks-users').find('[data-toggle="tooltip"]').tooltip();
}
$btnRefreshUser.toggleClass('fa-spin');
}