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

更新图标使用FA的

This commit is contained in:
Argo-Lenovo 2017-01-01 19:49:31 +08:00
parent cfba9de6b2
commit 5fa1f51aa3
13 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bootstrap.Admin/Bootstrap.Admin.csproj
View File

@ -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>

12
Bootstrap.Admin/Content/css/admin.css
View File

@ -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;

3
Bootstrap.Admin/Content/js/Longbow.Common.js
View File

@ -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);

6
Bootstrap.Admin/Views/Admin/Dicts.cshtml
View File

@ -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>

4
Bootstrap.Admin/Views/Admin/Exceptions.cshtml
View File

@ -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">

6
Bootstrap.Admin/Views/Admin/Groups.cshtml
View File

@ -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>

4
Bootstrap.Admin/Views/Admin/Infos.cshtml
View File

@ -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>

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

@ -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>

6
Bootstrap.Admin/Views/Admin/Menus.cshtml
View File

@ -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>

6
Bootstrap.Admin/Views/Admin/Roles.cshtml
View File

@ -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>

6
Bootstrap.Admin/Views/Admin/Users.cshtml
View File

@ -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>

4
Bootstrap.Admin/Views/Shared/_ButtonBarGroup.cshtml Normal file
View File

@ -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>

14
Bootstrap.Admin/Views/Shared/_Default.cshtml
View File

@ -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">