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

修改BUG：更改panel使用card

This commit is contained in:
Argo-MacBookPro 2018-08-02 17:59:49 +08:00
parent 40c4687fa8
commit 0dabff04dc
17 changed files with 127 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bootstrap.Admin/Views/Account/Register.cshtml
View File

@ -87,7 +87,7 @@
<label>申请理由：</label><span id="loginDesc" class="form-control-static"></span>
</div>
<div class="form-group">
<button id="btnPrev" class="btn btn-default" type="button">上一步</button>
<button id="btnPrev" class="btn btn-secondary" type="button">上一步</button>
<button id="btnSubmit" class="btn btn-primary pull-right" type="submit">确认并提交</button>
</div>
</div>

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

@ -8,8 +8,8 @@
<script src="~/js/Dicts.js"></script>
}
@section query {
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-sm-6 col-md-5">
<label class="control-label" for="txt_dict_cate">字典标签</label>
<input type="text" class="form-control" id="txt_dict_cate" data-provide="typeahead" />
@ -53,7 +53,7 @@
<h4 class="modal-title" id="myModalLabel">字典编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" role="form">
<form class="form-horizontal">
<input type="text" class="form-control hidden" id="dictID" data-default-val="0" />
<div class="form-group">
<label class="control-label col-sm-2" for="dictCate">字典标签</label>

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

@ -16,11 +16,11 @@
<script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="~/js/Exceptions.js"></script>
}
<div class="panel panel-default">
<div class="panel-heading">查询条件</div>
<div class="panel-body">
<form class="form-inline" role="form">
<div class="row">
<div class="card">
<div class="card-header">查询条件</div>
<div class="card-body">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-lg-5">
<label class="control-label" for="txt_operate_start">起始时间</label>
<div class="input-group date form_date">
@ -56,8 +56,8 @@
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="card">
<div class="card-header">
查询结果
</div>
<div class="panel-body barTable">
@ -73,10 +73,10 @@
<h4 class="modal-title" id="myModalLabel">程序异常日志窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" id="dataForm" name="dataForm" role="form"><div class="row"></div></form>
<form class="form-inline" id="dataForm" name="dataForm"><div class="form-row"></div></form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
关闭
</button>
</div>
@ -98,7 +98,7 @@
<i id="fa-bottom" class="fa-target"></i>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default">
<button type="button" class="btn btn-secondary">
关闭
</button>
</div>

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

@ -7,8 +7,8 @@
<script src="~/js/Groups.js"></script>
}
@section query {
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-md-5">
<label class="control-label" for="txt_search_name">部门名称</label>
<input type="text" class="form-control" id="txt_search_name" />
@ -45,8 +45,8 @@
<h4 class="modal-title" id="myModalLabel">部门编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-sm-6">
<label class="control-label" for="groupName">部门名称</label>
<input type="text" class="form-control" id="groupName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />

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

@ -15,17 +15,17 @@
<script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="~/js/Logs.js"></script>
}
<div class="panel panel-default">
<div class="panel-heading">查询条件</div>
<div class="panel-body">
<form class="form-inline" role="form">
<div class="row">
<div class="card">
<div class="card-header">查询条件</div>
<div class="card-body">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-xs-12">
<label class="control-label" for="txt_operate_type">操作类型</label>
<input type="text" class="form-control" id="txt_operate_type" />
</div>
</div>
<div class="row">
<div class="form-row">
<div class="form-group col-sm-6 col-lg-5">
<label class="control-label" for="txt_operate_start">起始时间</label>
<div class="input-group date form_date">
@ -50,8 +50,8 @@
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="card">
<div class="card-header">
查询结果
</div>
<div class="panel-body barTable">

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

@ -12,8 +12,8 @@
<script src="~/js/Menus.js"></script>
}
@section query {
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-sm-12 col-md-6 col-lg-5">
<label class="control-label" for="txt_menus_name">菜单名称</label>
<input type="text" class="form-control" id="txt_menus_name" />
@ -76,16 +76,16 @@
<h4 class="modal-title" id="myModalLabel">菜单编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" id="dataForm" role="form">
<div class="row">
<form class="form-inline" id="dataForm">
<div class="form-row">
<div class="form-group col-sm-6">
<input type="text" class="form-control hidden" id="menuID" name="menuID" data-default-val="0" />
<label class="control-label" for="name">菜单名称</label>
<div class="input-group">
<input type="text" class="form-control" id="name" name="name" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button data-method="sel" class="btn btn-default" type="button"><i class="fa fa-edit"></i>全选</button>
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button data-method="sel" class="btn btn-secondary" type="button"><i class="fa fa-edit"></i>全选</button>
</span>
</div>
</div>
@ -95,8 +95,8 @@
<div class="input-group">
<input type="text" class="form-control" readonly id="parentName" name="parentName" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuParent" class="btn btn-default" type="button"><i class="fa fa-hand-o-up"></i>选择</button>
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuParent" class="btn btn-secondary" type="button"><i class="fa fa-hand-o-up"></i>选择</button>
</span>
</div>
</div>
@ -105,8 +105,8 @@
<div class="input-group">
<input type="text" class="form-control digits" id="order" name="order" data-default-val="10" placeholder="默认为10" maxlength="8" data-valid="true" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuOrder" class="btn btn-default" type="button"><i class="fa fa-list-ol"></i>调整</button>
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnMenuOrder" class="btn btn-secondary" type="button"><i class="fa fa-list-ol"></i>调整</button>
</span>
</div>
</div>
@ -115,8 +115,8 @@
<div class="input-group">
<input type="text" class="form-control" readonly id="icon" data-default-val="fa fa-fa" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
<span class="input-group-btn">
<button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
<button id="btnIcon" class="btn btn-default" type="button"><i class="fa fa-dashboard"></i>选择</button>
<button data-method="clear" class="btn btn-secondary" type="button"><i class="fa fa-remove"></i></button>
<button id="btnIcon" class="btn btn-secondary" type="button"><i class="fa fa-dashboard"></i>选择</button>
</span>
</div>
</div>
@ -196,7 +196,7 @@
</div>
<div class="modal-footer">
<span>被选择的图标</span><i id="pickIcon"></i>
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btnSubmitIcon">保存</button>
</div>
</div>

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

@ -9,9 +9,9 @@
@section css {
<link href="~/css/tasks.css" rel="stylesheet" />
}
<div class="panel panel-default">
<div class="panel-heading">用户注册<span class="pull-right"><a id="refreshUsers" href="javascript:;" class="fa fa-refresh" title="点击刷新" role="tooltip" data-placement="left"></a></span></div>
<div class="panel-body">
<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-body">
<div class="tasks-widget">
<ul id="tasks-users" class="task-list ui-sortable">
</ul>

66
Bootstrap.Admin/Views/Admin/Profiles.cshtml
View File

@ -4,24 +4,36 @@
Layout = "~/Views/Shared/_Admin.cshtml";
}
@section Javascript {
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/fileinput.js"></script>
<environment include="Development">
<script src="~/js/fileinput.js"></script>
<script src="~/js/jquery.validate.js"></script>
<script src="~/js/messages_zh.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/fileinput.min.js"></script>
<script src="~/js/jquery.validate.min.js"></script>
<script src="~/js/messages_zh.min.js"></script>
</environment>
<script src="~/js/fileinput.zh.js"></script>
<script src="~/js/jquery.validate.js"></script>
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/longbow.validate.js"></script>
<script src="~/js/messages_zh.js"></script>
<script src="~/js/Profiles.js"></script>
<script src="~/js/theme.js"></script>
}
@section css {
<environment include="Development">
<link href="~/css/fileinput.css" rel="stylesheet" />
</environment>
<environment exclude="Development">
<link href="~/css/fileinput.min.css" rel="stylesheet" />
</environment>
<link href="~/css/tasks.css" rel="stylesheet" />
<link href="~/css/fileinput.css" rel="stylesheet" />
}
<div class="panel panel-default">
<div class="panel-heading">基本资料</div>
<div class="panel-body" data-toggle="LgbValidate" data-valid-button="#btnSaveDisplayName">
<form class="form-inline" role="form">
<div class="row">
<div class="card">
<div class="card-header">基本资料</div>
<div class="card-body" data-toggle="LgbValidate" data-valid-button="#btnSaveDisplayName">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-xs-12 col-sm-6">
<label class="control-label" for="userName">登陆名称</label>
<input type="text" class="form-control ignore" id="userName" name="userName" value="@Model.UserName" readonly />
@ -33,21 +45,21 @@
</div>
</form>
<div class="modal-footer">
<button id="btnSaveDisplayName" data-method="user" class="btn btn-default" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
<button id="btnSaveDisplayName" data-method="user" class="btn btn-secondary" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">修改密码</div>
<div class="panel-body" data-toggle="LgbValidate" data-valid-button="#btnSavePassword">
<form class="form-inline" role="form">
<div class="row">
<div class="card">
<div class="card-header">修改密码</div>
<div class="card-body" data-toggle="LgbValidate" data-valid-button="#btnSavePassword">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-xs-12">
<label class="control-label" for="currentPassword">原密码: </label>
<input type="password" class="form-control" id="currentPassword" placeholder="原密码，50字以内" maxlength="50" data-valid="true" />
</div>
</div>
<div class="row">
<div class="form-row">
<div class="form-group col-sm-6 col-xs-12">
<label class="control-label" for="newPassword">新密码: </label>
<input type="password" class="form-control" id="newPassword" placeholder="新密码，50字以内" maxlength="50" data-valid="true" />
@ -59,15 +71,15 @@
</div>
</form>
<div class="modal-footer">
<button id="btnSavePassword" data-method="password" class="btn btn-default" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
<button id="btnSavePassword" data-method="password" class="btn btn-secondary" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">网站皮肤</div>
<div class="panel-body">
<form class="form-inline" role="form">
<div class="row">
<div class="card">
<div class="card-header">网站皮肤</div>
<div class="card-body">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-xs-12">
<label class="control-label" for="userName">样式</label>
<select id="css" class="select form-control">
@ -88,13 +100,13 @@
</div>
</form>
<div class="modal-footer">
<button id="btnSaveCss" data-method="css" class="btn btn-default" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
<button id="btnSaveCss" data-method="css" class="btn btn-secondary" type="button" disabled data-admin="@User.IsInRole("Administrators")"><i class="fa fa-save"></i><span>保存</span></button>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">修改头像</div>
<div class="panel-body">
<div class="card">
<div class="card-header">修改头像</div>
<div class="card-body">
<form enctype="multipart/form-data">
<div class="form-group">
<input id="fileIcon" class="file" type="file" data-init="@Model.Size">

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

@ -13,8 +13,8 @@
}
@section query {
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-md-5">
<label class="control-label" for="txt_search_name">角色名称</label>
<input type="text" class="form-control" id="txt_search_name" />
@ -55,8 +55,8 @@
<h4 class="modal-title" id="myModalLabel">角色编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-sm-6">
<label class="control-label" for="roleName">角色名称</label>
<input type="text" class="form-control" id="roleName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />

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

@ -4,46 +4,51 @@
Layout = "~/Views/Shared/_Admin.cshtml";
}
@section Javascript {
<environment include="Development">
<script src="~/js/jquery.validate.js"></script>
<script src="~/js/messages_zh.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/jquery.validate.min.js"></script>
<script src="~/js/messages_zh.min.js"></script>
</environment>
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/jquery.validate.js"></script>
<script src="~/js/longbow.validate.js"></script>
<script src="~/js/messages_zh.js"></script>
<script src="~/js/Settings.js"></script>
}
@section css {
<link href="~/css/tasks.css" rel="stylesheet" />
}
<div class="panel panel-default">
<div class="panel-heading">系统名称设置</div>
<div class="panel-body" data-toggle="LgbValidate" data-valid-button="#sysSave">
<div class="card">
<div class="card-header">系统名称设置</div>
<div class="card-body" data-toggle="LgbValidate" data-valid-button="#sysSave">
<div class="input-group form-group col-xs-12">
<input type="text" class="form-control" id="sysName" placeholder="请输入网站标题，50字以内" value="@Model.Title" maxlength="50" data-valid="true" />
<span class="input-group-btn">
<button class="btn btn-default" type="button" data-method="title">保存</button>
</span>
<div class="input-group-append">
<button class="btn btn-secondary" type="button" data-method="title">保存</button>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">页脚设置</div>
<div class="panel-body" data-toggle="LgbValidate" data-valid-button="#footSave">
<div class="card">
<div class="card-header">页脚设置</div>
<div class="card-body" data-toggle="LgbValidate" data-valid-button="#footSave">
<div class="input-group form-group col-xs-12">
<input type="text" class="form-control" id="sysFoot" placeholder="请输入网站页脚，50字以内" value="@Model.Footer" maxlength="50" data-valid="true" />
<span class="input-group-btn">
<button class="btn btn-default" type="button" data-method="footer">保存</button>
</span>
<div class="input-group-append">
<button class="btn btn-secondary" type="button" data-method="footer">保存</button>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">网站样式</div>
<div class="panel-body">
<div class="card">
<div class="card-header">网站样式</div>
<div class="card-body">
<form id="CssDataForm" class="form-inline">
<div class="row">
<div class="form-row">
<div class="form-group col-xs-12">
<label class="control-label">网站样式</label>
<div class="dropdown lgbDropdown">
<a id="dictCssDefine" class="btn btn-success" data-toggle="dropdown" data-default-val="">
<a id="dictCssDefine" class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-default-val="">
<span>默认样式</span>
<span class="caret"></span>
</a>
@ -51,15 +56,15 @@
<li><a href="#" data-val="">默认样式</a></li>
</ul>
</div>
<button class="btn btn-default pull-right" type="button" data-method="css">保存</button>
<button class="btn btn-secondary" type="button" data-method="css">保存</button>
</div>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">网站缓存<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="panel-body">
<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-body">
<div class="tasks-widget">
<ul id="sortable" class="task-list ui-sortable"></ul>
</div>

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

@ -9,9 +9,9 @@
@section css {
<link href="~/css/tasks.css" rel="stylesheet" />
}
<div class="panel panel-default">
<div class="panel-heading">任务消息<span class="pull-right"><a id="refreshTask" href="javascript:;" class="fa fa-refresh"></a></span></div>
<div class="panel-body">
<div class="card">
<div class="card-header">任务消息<span class="pull-right"><a id="refreshTask" href="javascript:;" class="fa fa-refresh"></a></span></div>
<div class="card-body">
<div class="tasks-widget">
<ul id="list-task" class="task-list ui-sortable">
</ul>

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

@ -51,8 +51,8 @@
<h4 class="modal-title" id="myModalLabel">用户编辑窗口</h4>
</div>
<div class="modal-body">
<form class="form-inline" role="form">
<div class="row">
<form class="form-inline">
<div class="form-row">
<div class="form-group col-sm-6">
<label class="control-label" for="userName">登陆名称</label>
<input type="text" class="form-control" id="userName" placeholder="不可为空，50字以内" minlength="4" maxlength="50" remote="api/New/" data-remote-msg="此用户已存在" data-valid="true" />

4
Bootstrap.Admin/Views/Shared/GroupConfig.cshtml
View File

@ -6,10 +6,10 @@
<h4 class="modal-title" id="myGroupModalLabel">部门授权窗口</h4>
</div>
<div class="modal-body">
<form id="groupForm" class="form-inline" role="form"></form>
<form id="groupForm" class="form-inline"></form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btnSubmitGroup">保存</button>
</div>
</div>

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

@ -11,7 +11,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="btnSubmitMenu">保存</button>
</div>
</div>

4
Bootstrap.Admin/Views/Shared/RoleConfig.cshtml
View File

@ -6,11 +6,11 @@
<h4 class="modal-title" id="myRoleModalLabel">角色授权窗口</h4>
</div>
<div class="modal-body">
<form id="roleForm" class="form-inline" role="form">
<form id="roleForm" class="form-inline">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btnSubmitRole">保存</button>
</div>
</div>

4
Bootstrap.Admin/Views/Shared/UserConfig.cshtml
View File

@ -6,10 +6,10 @@
<h4 class="modal-title" id="myUserModalLabel">用户授权窗口</h4>
</div>
<div class="modal-body">
<form id="userForm" class="form-inline" role="form"></form>
<form id="userForm" class="form-inline"></form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="btnSubmitUser">保存</button>
</div>
</div>

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

@ -33,7 +33,7 @@
<div class="modal-content" data-toggle="LgbValidate" data-valid-button="#btnSubmit">
@RenderSection("modal", false)
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
关闭
</button>
<button type="button" class="btn btn-primary" id="btnSubmit">