From 5fa1f51aa324e504c3c3886401046c0dfdb97a8a Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Sun, 1 Jan 2017 19:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E6=A0=87=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8FA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Bootstrap.Admin.csproj             |  1 +
 Bootstrap.Admin/Content/css/admin.css              | 12 ++++--------
 Bootstrap.Admin/Content/js/Longbow.Common.js       |  3 ++-
 Bootstrap.Admin/Views/Admin/Dicts.cshtml           |  6 ++----
 Bootstrap.Admin/Views/Admin/Exceptions.cshtml      |  4 ++--
 Bootstrap.Admin/Views/Admin/Groups.cshtml          |  6 ++----
 Bootstrap.Admin/Views/Admin/Infos.cshtml           |  4 ++--
 Bootstrap.Admin/Views/Admin/Logs.cshtml            |  2 +-
 Bootstrap.Admin/Views/Admin/Menus.cshtml           |  6 ++----
 Bootstrap.Admin/Views/Admin/Roles.cshtml           |  6 ++----
 Bootstrap.Admin/Views/Admin/Users.cshtml           |  6 ++----
 .../Views/Shared/_ButtonBarGroup.cshtml            |  4 ++++
 Bootstrap.Admin/Views/Shared/_Default.cshtml       | 14 ++++----------
 13 files changed, 30 insertions(+), 44 deletions(-)
 create mode 100644 Bootstrap.Admin/Views/Shared/_ButtonBarGroup.cshtml

diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj
index d8afaf75..7c65c081 100644
--- a/Bootstrap.Admin/Bootstrap.Admin.csproj
+++ b/Bootstrap.Admin/Bootstrap.Admin.csproj
@@ -326,6 +326,7 @@
     <Content Include="Views\Home\Mobile.cshtml" />
     <Content Include="Views\Shared\SubMenu.cshtml" />
     <Content Include="Views\Admin\Api.cshtml" />
+    <Content Include="Views\Shared\_ButtonBarGroup.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
diff --git a/Bootstrap.Admin/Content/css/admin.css b/Bootstrap.Admin/Content/css/admin.css
index 76718f43..247dbd60 100644
--- a/Bootstrap.Admin/Content/css/admin.css
+++ b/Bootstrap.Admin/Content/css/admin.css
@@ -32,14 +32,6 @@
     text-align: center;
 }
 
-.hidden-tb {
-    margin-left: 6px;
-}
-
-.glyphicon-search {
-    padding-right: 6px;
-}
-
 .clearcache {
     position: absolute;
     right: 60px;
@@ -88,6 +80,10 @@
     outline: none !important;
 }
 
+    .btn span {
+        margin-left: 4px;
+    }
+
 .modal-header {
     background-color: #f5f5f5;
     border-top-left-radius: 6px;
diff --git a/Bootstrap.Admin/Content/js/Longbow.Common.js b/Bootstrap.Admin/Content/js/Longbow.Common.js
index 14d26e09..b9bf72b4 100644
--- a/Bootstrap.Admin/Content/js/Longbow.Common.js
+++ b/Bootstrap.Admin/Content/js/Longbow.Common.js
@@ -310,10 +310,11 @@
             }, options);
             $(this).bootstrapTable(settings);
             var $toolbar = $('div.toolbar');
-            $('div.toolbar').on('click', 'a', function () {
+            $toolbar.on('click', 'a', function () {
                 var ctl = $('#' + $(this).attr('id').replace('tb_', 'btn_'));
                 ctl.trigger("click");
             }).insertBefore($('div.bootstrap-table > div.fixed-table-toolbar > div.bs-bars'));
+            $(settings.toolbar).removeClass('hidden');
         },
         select: function () {
             var $this = $(this);
diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index 189702da..6b4db8d2 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -41,14 +41,12 @@
                 </div>
             </div>
             <div class="form-group col-lg-2">
-                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="fa fa-search" aria-hidden="true"></span>查询</button>
             </div>
             <div class="toolbar btn-group dropdown">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
                 <div class="dropdown-menu">
-                    <a id="tb_add" href="#" title="新增"><i class="glyphicon glyphicon-plus"></i></a>
-                    <a id="tb_delete" href="#" title="删除"><i class="glyphicon glyphicon-remove"></i></a>
-                    <a id="tb_edit" href="#" title="编辑"><i class="glyphicon glyphicon-pencil"></i></a>
+                    @Html.Partial("_ButtonBarGroup")
                 </div>
             </div>
         </div>
diff --git a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
index 186566fd..10a83b79 100644
--- a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Exceptions.cshtml
@@ -45,7 +45,7 @@
                 </div>
                 <div class="form-group col-xs-12 col-sm-12 col-md-2 col-lg-2">
                     <label class="sr-only"></label>
-                    <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                    <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
                 </div>
                 <div class="toolbar btn-group dropdown">
                     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
@@ -59,7 +59,7 @@
 </div>
 <div id="toolbar" class="btn-group">
     <button id="btn_view" type="button" class="btn btn-danger">
-        <span class="fa fa-file-text-o" aria-hidden="true"></span><span class="hidden-tb">服务器日志</span>
+        <i class="fa fa-file-text-o" aria-hidden="true"></i><span class="hidden-tb">服务器日志</span>
     </button>
 </div>
 <div class="panel panel-default">
diff --git a/Bootstrap.Admin/Views/Admin/Groups.cshtml b/Bootstrap.Admin/Views/Admin/Groups.cshtml
index 22b78c89..0a5c7939 100644
--- a/Bootstrap.Admin/Views/Admin/Groups.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Groups.cshtml
@@ -24,14 +24,12 @@
                 <input type="text" class="form-control" id="txt_group_desc" />
             </div>
             <div class="form-group col-lg-2">
-                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
             <div class="toolbar btn-group dropdown">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
                 <div class="dropdown-menu">
-                    <a id="tb_add" href="#" title="新增"><i class="glyphicon glyphicon-plus"></i></a>
-                    <a id="tb_delete" href="#" title="删除"><i class="glyphicon glyphicon-remove"></i></a>
-                    <a id="tb_edit" href="#" title="编辑"><i class="glyphicon glyphicon-pencil"></i></a>
+                    @Html.Partial("_ButtonBarGroup")
                     <a id="tb_assignRole" href="#" title="指派角色"><i class="fa fa-sitemap"></i></a>
                     <a id="tb_assignUser" href="#" title="指派用户"><i class="fa fa-user"></i></a>
                 </div>
diff --git a/Bootstrap.Admin/Views/Admin/Infos.cshtml b/Bootstrap.Admin/Views/Admin/Infos.cshtml
index 32e2d1fd..d67622f6 100644
--- a/Bootstrap.Admin/Views/Admin/Infos.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Infos.cshtml
@@ -39,7 +39,7 @@
             </div>
         </form>
         <div class="modal-footer">
-            <button id="btnSaveDisplayName" class="btn btn-default" type="button" data-admin="@LgbPrincipal.IsAdmin(Model.UserName)">保存</button>
+            <button id="btnSaveDisplayName" class="btn btn-default" type="button" data-admin="@LgbPrincipal.IsAdmin(Model.UserName)"><i class="fa fa-save"></i><span>保存</span></button>
         </div>
     </div>
 </div>
@@ -63,7 +63,7 @@
             </div>
         </form>
         <div class="modal-footer">
-            <button id="btnSavePassword" class="btn btn-default" type="button" data-admin="@LgbPrincipal.IsAdmin(Model.UserName)">保存</button>
+            <button id="btnSavePassword" class="btn btn-default" type="button" data-admin="@LgbPrincipal.IsAdmin(Model.UserName)"><i class="fa fa-save"></i><span>保存</span></button>
         </div>
     </div>
 </div>
diff --git a/Bootstrap.Admin/Views/Admin/Logs.cshtml b/Bootstrap.Admin/Views/Admin/Logs.cshtml
index 8d0af14c..f3c4d5ce 100644
--- a/Bootstrap.Admin/Views/Admin/Logs.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Logs.cshtml
@@ -50,7 +50,7 @@
                 </div>
                 <div class="form-group col-xs-12 col-sm-12 col-md-2 col-lg-2">
                     <label class="sr-only"></label>
-                    <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                    <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
                 </div>
             </div>
         </form>
diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index b5159aa0..daf57b90 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -46,14 +46,12 @@
                 </div>
             </div>
             <div class="form-group col-xs-12 col-sm-6 col-md-2 col-lg-2">
-                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
             <div class="toolbar btn-group dropdown">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
                 <div class="dropdown-menu">
-                    <a id="tb_add" href="#" title="新增"><i class="glyphicon glyphicon-plus"></i></a>
-                    <a id="tb_delete" href="#" title="删除"><i class="glyphicon glyphicon-remove"></i></a>
-                    <a id="tb_edit" href="#" title="编辑"><i class="glyphicon glyphicon-pencil"></i></a>
+                    @Html.Partial("_ButtonBarGroup")
                     <a id="tb_assignRole" href="#" title="指派角色"><i class="fa fa-sitemap"></i></a>
                 </div>
             </div>
diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/Bootstrap.Admin/Views/Admin/Roles.cshtml
index d9e6e9b4..a9c700d9 100644
--- a/Bootstrap.Admin/Views/Admin/Roles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Roles.cshtml
@@ -30,14 +30,12 @@
                 <input type="text" class="form-control" id="txt_role_desc" />
             </div>
             <div class="form-group col-lg-2">
-                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
             <div class="toolbar btn-group dropdown">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
                 <div class="dropdown-menu">
-                    <a id="tb_add" href="#" title="新增"><i class="glyphicon glyphicon-plus"></i></a>
-                    <a id="tb_delete" href="#" title="删除"><i class="glyphicon glyphicon-remove"></i></a>
-                    <a id="tb_edit" href="#" title="编辑"><i class="glyphicon glyphicon-pencil"></i></a>
+                    @Html.Partial("_ButtonBarGroup")
                     <a id="tb_assignUser" href="#" title="指派用户"><i class="fa fa-user"></i></a>
                     <a id="tb_assignGroup" href="#" title="指派部门"><i class="fa fa-bank"></i></a>
                     <a id="tb_assignMenu" href="#" title="指派菜单"><i class="fa fa-dashboard"></i></a>
diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/Bootstrap.Admin/Views/Admin/Users.cshtml
index df9f7c84..25707ca6 100644
--- a/Bootstrap.Admin/Views/Admin/Users.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Users.cshtml
@@ -24,14 +24,12 @@
                 <input type="text" class="form-control" id="txt_display_name" />
             </div>
             <div class="form-group col-lg-2">
-                <button type="button" id="btn_query" class="btn btn-primary form-control"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>查询</button>
+                <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
             </div>
             <div class="toolbar btn-group dropdown">
                 <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><i class="fa fa-gear"></i></button>
                 <div class="dropdown-menu">
-                    <a id="tb_add" href="#" title="新增"><i class="glyphicon glyphicon-plus"></i></a>
-                    <a id="tb_delete" href="#" title="删除"><i class="glyphicon glyphicon-remove"></i></a>
-                    <a id="tb_edit" href="#" title="编辑"><i class="glyphicon glyphicon-pencil"></i></a>
+                    @Html.Partial("_ButtonBarGroup")
                     <a id="tb_assignRole" href="#" title="指派角色"><i class="fa fa-sitemap"></i></a>
                     <a id="tb_assignGroup" href="#" title="指派部门"><i class="fa fa-bank"></i></a>
                 </div>
diff --git a/Bootstrap.Admin/Views/Shared/_ButtonBarGroup.cshtml b/Bootstrap.Admin/Views/Shared/_ButtonBarGroup.cshtml
new file mode 100644
index 00000000..0de5f2a3
--- /dev/null
+++ b/Bootstrap.Admin/Views/Shared/_ButtonBarGroup.cshtml
@@ -0,0 +1,4 @@
+<a id="tb_add" href="#" title="新增"><i class="fa fa-plus"></i></a>
+<a id="tb_delete" href="#" title="删除"><i class="fa fa-remove"></i></a>
+<a id="tb_edit" href="#" title="编辑"><i class="fa fa-pencil"></i></a>
+
diff --git a/Bootstrap.Admin/Views/Shared/_Default.cshtml b/Bootstrap.Admin/Views/Shared/_Default.cshtml
index e86bd9ea..b5d8c5a1 100644
--- a/Bootstrap.Admin/Views/Shared/_Default.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Default.cshtml
@@ -45,16 +45,10 @@
         @RenderSection("query", false)
     </div>
 </div>
-<div id="toolbar" class="btn-group">
-    <button id="btn_add" type="button" class="btn btn-success">
-        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span><span class="hidden-tb">新增</span>
-</button>
-    <button id="btn_delete" type="button" class="btn btn-danger">
-        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span><span class="hidden-tb">删除</span>
-</button>
-    <button id="btn_edit" type="button" class="btn btn-primary">
-        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span><span class="hidden-tb">编辑</span>
-</button>
+<div id="toolbar" class="btn-group hidden">
+    <button id="btn_add" type="button" class="btn btn-success"><i class="fa fa-plus" aria-hidden="true"></i><span class="hidden-tb">新增</span></button>
+    <button id="btn_delete" type="button" class="btn btn-danger"><i class="fa fa-remove" aria-hidden="true"></i><span class="hidden-tb">删除</span></button>
+    <button id="btn_edit" type="button" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i><span class="hidden-tb">编辑</span></button>
     @RenderSection("toolbar", false)
 </div>
 <div id="panelResult" class="panel panel-default">