From ebf91e0f678bc7c35cba321dc2275f6ee8c9d021 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Fri, 3 Aug 2018 19:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9Arole=3D"tooltip"?=
 =?UTF-8?q?=20=E6=9B=B4=E6=94=B9=E4=B8=BA=20data-toggle=3D"tooltip"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Notifications.cshtml |  5 ++---
 Bootstrap.Admin/Views/Admin/Settings.cshtml      |  2 +-
 Bootstrap.Admin/Views/Shared/Footer.cshtml       |  2 +-
 Bootstrap.Admin/wwwroot/css/site.css             |  4 ++++
 Bootstrap.Admin/wwwroot/js/Groups.js             | 10 +++++-----
 Bootstrap.Admin/wwwroot/js/Longbow.Common.js     |  2 +-
 Bootstrap.Admin/wwwroot/js/Menus.js              |  2 +-
 Bootstrap.Admin/wwwroot/js/Roles.js              |  4 ++--
 Bootstrap.Admin/wwwroot/js/Settings.js           |  4 ++--
 Bootstrap.Admin/wwwroot/js/Users.js              |  4 ++--
 Bootstrap.Admin/wwwroot/js/common-scripts.js     |  2 +-
 Bootstrap.Admin/wwwroot/js/noti.js               |  4 ++--
 12 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Notifications.cshtml b/Bootstrap.Admin/Views/Admin/Notifications.cshtml
index 11f40d64..280672a6 100644
--- a/Bootstrap.Admin/Views/Admin/Notifications.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Notifications.cshtml
@@ -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>
diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml
index de9a32ca..c9ec6d44 100644
--- a/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -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>
diff --git a/Bootstrap.Admin/Views/Shared/Footer.cshtml b/Bootstrap.Admin/Views/Shared/Footer.cshtml
index 4c91bdab..824d1fd8 100644
--- a/Bootstrap.Admin/Views/Shared/Footer.cshtml
+++ b/Bootstrap.Admin/Views/Shared/Footer.cshtml
@@ -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>
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index 1d12ffd1..48c76cf1 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -506,3 +506,7 @@ label.dropdown-item:first-child {
 .btn-xs {
     padding: 1px 5px;
 }
+
+.form-check-label {
+    cursor: pointer;
+}
diff --git a/Bootstrap.Admin/wwwroot/js/Groups.js b/Bootstrap.Admin/wwwroot/js/Groups.js
index d01b55a1..87bd9a47 100644
--- a/Bootstrap.Admin/wwwroot/js/Groups.js
+++ b/Bootstrap.Admin/wwwroot/js/Groups.js
@@ -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 }
         ]
     });
 });
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
index 229a3024..b77322e3 100644
--- a/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
+++ b/Bootstrap.Admin/wwwroot/js/Longbow.Common.js
@@ -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,
diff --git a/Bootstrap.Admin/wwwroot/js/Menus.js b/Bootstrap.Admin/wwwroot/js/Menus.js
index a3406fb2..151d7b9f 100644
--- a/Bootstrap.Admin/wwwroot/js/Menus.js
+++ b/Bootstrap.Admin/wwwroot/js/Menus.js
@@ -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');
diff --git a/Bootstrap.Admin/wwwroot/js/Roles.js b/Bootstrap.Admin/wwwroot/js/Roles.js
index 0390d7b1..5b313144 100644
--- a/Bootstrap.Admin/wwwroot/js/Roles.js
+++ b/Bootstrap.Admin/wwwroot/js/Roles.js
@@ -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');
diff --git a/Bootstrap.Admin/wwwroot/js/Settings.js b/Bootstrap.Admin/wwwroot/js/Settings.js
index 30783c8d..5826dac5 100644
--- a/Bootstrap.Admin/wwwroot/js/Settings.js
+++ b/Bootstrap.Admin/wwwroot/js/Settings.js
@@ -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();
                                 }
                             }
                         });
diff --git a/Bootstrap.Admin/wwwroot/js/Users.js b/Bootstrap.Admin/wwwroot/js/Users.js
index a6433439..97c1507f 100644
--- a/Bootstrap.Admin/wwwroot/js/Users.js
+++ b/Bootstrap.Admin/wwwroot/js/Users.js
@@ -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');
diff --git a/Bootstrap.Admin/wwwroot/js/common-scripts.js b/Bootstrap.Admin/wwwroot/js/common-scripts.js
index 59fb6d4a..afa48639 100644
--- a/Bootstrap.Admin/wwwroot/js/common-scripts.js
+++ b/Bootstrap.Admin/wwwroot/js/common-scripts.js
@@ -165,7 +165,7 @@ $(function () {
             scrollTop: 0
         }, 200);
     });
-    $('[role="tooltip"]').tooltip();
+    $('[data-toggle="tooltip"]').tooltip();
 
     // breadcrumb
     var arch = $('#nav-accordion').find('a.active').last();
diff --git a/Bootstrap.Admin/wwwroot/js/noti.js b/Bootstrap.Admin/wwwroot/js/noti.js
index 91114b63..40f1d2ed 100644
--- a/Bootstrap.Admin/wwwroot/js/noti.js
+++ b/Bootstrap.Admin/wwwroot/js/noti.js
@@ -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');
             }