重构代码:重写梳理架构视图继承关系,Layout > Bootstrap > Admin > Default

This commit is contained in:
Argo-MacBookPro 2018-09-15 15:50:17 +08:00
parent ae89ac31e3
commit 32dbd6eb23
36 changed files with 1217 additions and 1294 deletions

View File

@ -1,6 +1,5 @@
@{
ViewBag.Title = "未授权请求";
Layout = "~/Views/Shared/_Root.cshtml";
}
@section css {
<link href="~/css/error.css" rel="stylesheet" />
@ -14,4 +13,4 @@
<h3>您无权访问本页面请联系网站管理员授权后再查看</h3>
<br />
<a href="~/Home/Index" target="_top">返回首页</a>
</section>
</section>

View File

@ -1,7 +1,6 @@
@model ModelBase
@{
ViewBag.Title = Model.Title;
Layout = "~/Views/Shared/_Root.cshtml";
}
@section css {
<environment include="Development">

View File

@ -1,6 +1,5 @@
@{
ViewBag.Title = "客户端测试";
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section css {
<style type="text/css">

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "Api 文档";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "字典表维护";
Layout = "~/Views/Shared/_Default.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "程序异常";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "图标集";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "部门管理";
Layout = "~/Views/Shared/_Default.cshtml";

View File

@ -1,29 +1,29 @@
<div data-spy="scroll" data-target=".fa-nav" class="iconview">
@await Html.PartialAsync("AwesomeIcon")
<div class="fa-nav">
<h2>图标分类</h2>
<nav class="nav">
<a class="nav-link" href="#fa-top">返回顶部</a>
<a class="nav-link" href="#fa-bottom">返回底部</a>
<a class="nav-link" href="#new">新图标</a>
<a class="nav-link" href="#web-application">Web 图标</a>
<a class="nav-link" href="#accessibility">辅助图标</a>
<a class="nav-link" href="#hand">手形图标</a>
<a class="nav-link" href="#transportation">交通运输图标</a>
<a class="nav-link" href="#gender">性别图标</a>
<a class="nav-link" href="#file-type">文件类型图标</a>
<a class="nav-link" href="#spinner">微调控制项图标</a>
<a class="nav-link" href="#form-control">格式控制图标</a>
<a class="nav-link" href="#payment">支付图标</a>
<a class="nav-link" href="#chart">图表图标</a>
<a class="nav-link" href="#currency">货币图标</a>
<a class="nav-link" href="#text-editor">文本编辑图标</a>
<a class="nav-link" href="#directional">方向图标</a>
<a class="nav-link" href="#video-player">影像播放器图标</a>
<a class="nav-link" href="#brand">品牌图标</a>
<a class="nav-link" href="#medical">医疗图标</a>
<a class="nav-link" href="#fa-top">返回顶部</a>
<a class="nav-link" href="#fa-bottom">返回底部</a>
</nav>
</div>
<div data-spy="scroll" data-target=".fa-nav" class="iconview">
@await Html.PartialAsync("AwesomeIcon")
<div class="fa-nav">
<h2>图标分类</h2>
<nav class="nav">
<a class="nav-link" href="#fa-top">返回顶部</a>
<a class="nav-link" href="#fa-bottom">返回底部</a>
<a class="nav-link" href="#new">新图标</a>
<a class="nav-link" href="#web-application">Web 图标</a>
<a class="nav-link" href="#accessibility">辅助图标</a>
<a class="nav-link" href="#hand">手形图标</a>
<a class="nav-link" href="#transportation">交通运输图标</a>
<a class="nav-link" href="#gender">性别图标</a>
<a class="nav-link" href="#file-type">文件类型图标</a>
<a class="nav-link" href="#spinner">微调控制项图标</a>
<a class="nav-link" href="#form-control">格式控制图标</a>
<a class="nav-link" href="#payment">支付图标</a>
<a class="nav-link" href="#chart">图表图标</a>
<a class="nav-link" href="#currency">货币图标</a>
<a class="nav-link" href="#text-editor">文本编辑图标</a>
<a class="nav-link" href="#directional">方向图标</a>
<a class="nav-link" href="#video-player">影像播放器图标</a>
<a class="nav-link" href="#brand">品牌图标</a>
<a class="nav-link" href="#medical">医疗图标</a>
<a class="nav-link" href="#fa-top">返回顶部</a>
<a class="nav-link" href="#fa-bottom">返回底部</a>
</nav>
</div>
</div>

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.ModelBase
@model ModelBase
@{
ViewBag.Title = "后台管理";
Layout = "~/Views/Shared/_Admin.cshtml";
@ -22,4 +22,4 @@
});
</script>
}
<h4>欢迎使用后台管理</h4>
<h4>欢迎使用后台管理</h4>

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "系统日志";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "菜单管理";
Layout = "~/Views/Shared/_Default.cshtml";
@ -191,4 +191,4 @@
</div>
</div>
@await Html.PartialAsync("NavigatorConfig")
}
}

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "站内消息";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,5 +1,4 @@
@model Bootstrap.Admin.Models.ModelBase
NavigatorBarModel
@model ModelBase
@{
ViewBag.Title = "客户端测试";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -27,4 +27,4 @@
<div class="card-body" style="padding-top: 25px;">
<table></table>
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.ProfilesModel
@model ProfilesModel
@{
ViewBag.Title = "个人中心";
Layout = "~/Views/Shared/_Admin.cshtml";
@ -105,4 +105,4 @@
</form>
<img class="card-img d-none" src="@Url.Content(Model.Icon)" />
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "角色管理";
Layout = "~/Views/Shared/_Default.cshtml";
@ -74,4 +74,4 @@
@await Html.PartialAsync("UserConfig")
@await Html.PartialAsync("GroupConfig")
@await Html.PartialAsync("NavigatorConfig")
}
}

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.ThemeModel
@model ThemeModel
@{
ViewBag.Title = "网站设置";
Layout = "~/Views/Shared/_Admin.cshtml";

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "任务管理";
Layout = "~/Views/Shared/_Admin.cshtml";
@ -13,8 +13,7 @@
<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>
<ul id="list-task" class="task-list ui-sortable"></ul>
</div>
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
@{
ViewBag.Title = "用户管理";
Layout = "~/Views/Shared/_Default.cshtml";
@ -71,4 +71,4 @@
@section customModal {
@await Html.PartialAsync("RoleConfig")
@await Html.PartialAsync("GroupConfig")
}
}

View File

@ -1,4 +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>
<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>

View File

@ -1,6 +1,5 @@
@{
ViewBag.Title = "服务器内部错误";
Layout = "~/Views/Shared/_Root.cshtml";
}
@section css {
<link href="~/css/error.css" rel="stylesheet" />
@ -14,4 +13,4 @@
<h3>相关错误信息已经记录到日志中,请登录服务器查看</h3>
<br />
<a href="~/Home/Index" target="_top">返回首页</a>
</section>
</section>

View File

@ -1,7 +1,7 @@
@model Bootstrap.Admin.Models.HeaderBarModel
@model HeaderBarModel
@{
ViewBag.Title = "首页";
Layout = "~/Views/Shared/_Normal.cshtml";
Layout = "~/Views/Shared/_Bootstrap.cshtml";
}
@section css {
<style>
@ -10,8 +10,7 @@
}
</style>
}
@section javascript {
<script src="~/js/content.js"></script>
}
<div id="content" class="content-body welcome-bg">
</div>
<section id="main-content">
<div id="content" class="content-body welcome-bg">
</div>
</section>

View File

@ -1,6 +1,5 @@
@{
ViewBag.Title = "资源未找到";
Layout = "~/Views/Shared/_Root.cshtml";
}
@section css {
<link href="~/css/error.css" rel="stylesheet" />
@ -14,4 +13,4 @@
<h3>相关错误信息已经记录到日志中,请登录服务器查看</h3>
<br />
<a href="~/Home/Index" target="_top">返回首页</a>
</section>
</section>

View File

@ -109,4 +109,4 @@
<li class="breadcrumb-item d-none" id="breadNav"></li>
</ol>
</nav>
</header>
</header>

View File

@ -1,6 +1,6 @@
@model Bootstrap.Admin.Models.NavigatorBarModel
@model NavigatorBarModel
<aside>
<div id="sidebar" class="nav-collapse sidebar">
<div id="sidebar" class="sidebar">
<!-- sidebar menu start-->
<ul class="sidebar-menu" id="nav-accordion">
@foreach (var menu in Model.Navigations)

View File

@ -1,11 +0,0 @@
_Layout.cshtml
/Home/Login
-------> _Admin.cshtml
/Admin/Index
--------------> _Default.cshtml
/Admin/Users
-------> _Normal.cshtml

View File

@ -1,43 +0,0 @@
@{
ViewBag.Title = "无权访问页面";
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section css {
<style>
body {
background: #8075c6;
color: #fff;
}
.error-wrapper {
text-align: center;
margin-top: 10%;
}
.error-wrapper .icon-500 {
background: url(/images/error_icon.png) no-repeat;
width: 289px;
height: 274px;
display: inline-block;
margin-left: 55px;
}
.error-wrapper p {
padding-top: 15px;
}
a, a:hover, a:focus {
text-decoration: none;
outline: none;
font-size: 14px;
font-weight: 300;
color: #ffffff;
}
</style>
}
<section class="error-wrapper">
<i class="icon-500"></i>
<h1>访问网页被拒绝</h1>
<h2>您无权访问本页面,请联系网站管理员授权后在查看</h2>
<p class="page-500"><a href="~/Home/Logout" target="_top">返回登陆页</a></p>
</section>

View File

@ -22,4 +22,4 @@
</div>
</div>
</div>
</div>
</div>

View File

@ -1,7 +1,8 @@
@{
Layout = "~/Views/Shared/_Layout.cshtml";
Layout = "~/Views/Shared/_Bootstrap.cshtml";
}
@section css {
<link href="~/css/nprogress.css" rel="stylesheet" />
<link href="~/css/sweetalert.css" rel="stylesheet" />
<environment include="Development">
<link href="~/css/toastr.css" rel="stylesheet" />

View File

@ -0,0 +1,38 @@
@model ModelBase
@{
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section css {
<environment include="Development">
<link href="~/css/bootstrap.css" rel="stylesheet">
<link href="~/css/font-awesome.css" rel="stylesheet" />
</environment>
<environment exclude="Development">
<link href="~/css/bootstrap.min.css" rel="stylesheet">
<link href="~/css/font-awesome.min.css" rel="stylesheet" />
</environment>
@RenderSection("css", false)
<link href="~/css/theme.css" rel="stylesheet" />
<link href="~/css/theme-responsive.css" rel="stylesheet" />
<link href="~/css/site.css" rel="stylesheet" />
<link href="~/css/site-responsive.css" rel="stylesheet" />
@if (!string.IsNullOrEmpty(Model.Theme))
{
<link href="~/css/@Model.Theme" rel="stylesheet" />
}
}
@section javascript {
<environment include="Development">
<script src="~/js/bootstrap.bundle.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/bootstrap.bundle.min.js"></script>
</environment>
<script src="~/js/nprogress.js"></script>
<script src="~/js/longbow.common.js"></script>
@RenderSection("Javascript", false)
}
@await Html.PartialAsync("Header")
@RenderBody()
@await Html.PartialAsync("Footer")
@RenderSection("modal", false)

View File

@ -1,39 +1,31 @@
@model ModelBase
@{
Layout = "~/Views/Shared/_Root.cshtml";
}
@section css {
<environment include="Development">
<link href="~/css/bootstrap.css" rel="stylesheet">
<link href="~/css/font-awesome.css" rel="stylesheet" />
</environment>
<environment exclude="Development">
<link href="~/css/bootstrap.min.css" rel="stylesheet">
<link href="~/css/font-awesome.min.css" rel="stylesheet" />
</environment>
<link href="~/css/nprogress.css" rel="stylesheet" />
<!DOCTYPE html>
<html lang="zh-cn">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>@ViewBag.Title</title>
@RenderSection("css", false)
<link href="~/css/theme.css" rel="stylesheet" />
<link href="~/css/theme-responsive.css" rel="stylesheet" />
<link href="~/css/site.css" rel="stylesheet" />
<link href="~/css/site-responsive.css" rel="stylesheet" />
@if (!string.IsNullOrEmpty(Model.Theme))
{
<link href="~/css/@Model.Theme" rel="stylesheet" />
}
}
@section javascript {
<!--[if lt IE 10 ]>
<link href="../css/IE8.css" rel="stylesheet" />
<![endif]-->
</head>
<body>
<!--[if lt IE 10 ]>
<div id="ieAlert" class="alert alert-danger alert-dismissible">
<div>你的浏览器版本太低不能完美的支持本系统请升级到至少IE10 <a href="../IE/IE10.exe" target="_blank">本地下载</a> <a href="https://support.microsoft.com/zh-cn/help/17621/internet-explorer-downloads" target="_blank">微软下载</a>或者使用Chrome浏览器 <a href="../Software/ChromeSetup.exe" target="_blank">本地下载</a></div>
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span></button>
</div>
<![endif]-->
@RenderBody()
<a id="pathBase" href="~/" hidden></a>
<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
<environment include="Development">
<script src="~/js/bootstrap.bundle.js"></script>
<script src="~/js/jquery-3.3.1.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/bootstrap.bundle.min.js"></script>
<script src="~/js/jquery-3.3.1.min.js"></script>
</environment>
<script src="~/js/nprogress.js"></script>
<script src="~/js/longbow.common.js"></script>
@RenderSection("Javascript", false)
}
@await Html.PartialAsync("Header")
@RenderBody()
@await Html.PartialAsync("Footer")
@RenderSection("modal", false)
</body>
</html>

View File

@ -1,12 +0,0 @@
@{
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section css {
@RenderSection("css", false)
}
@section javascript {
@RenderSection("Javascript", false)
}
<section id="main-content">
@RenderBody()
</section>

View File

@ -1,31 +0,0 @@
<!DOCTYPE html>
<html lang="zh-cn">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>@ViewBag.Title</title>
@RenderSection("css", false)
<!--[if lt IE 10 ]>
<link href="../css/IE8.css" rel="stylesheet" />
<![endif]-->
</head>
<body>
<!--[if lt IE 10 ]>
<div id="ieAlert" class="alert alert-danger alert-dismissible">
<div>你的浏览器版本太低不能完美的支持本系统请升级到至少IE10 <a href="../IE/IE10.exe" target="_blank">本地下载</a> <a href="https://support.microsoft.com/zh-cn/help/17621/internet-explorer-downloads" target="_blank">微软下载</a>或者使用Chrome浏览器 <a href="../Software/ChromeSetup.exe" target="_blank">本地下载</a></div>
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span></button>
</div>
<![endif]-->
@RenderBody()
<a id="pathBase" href="~/" hidden></a>
<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
<environment include="Development">
<script src="~/js/jquery-3.3.1.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/jquery-3.3.1.min.js"></script>
</environment>
@RenderSection("Javascript", false)
</body>
</html>

View File

@ -1,3 +0,0 @@
$(function () {
$('#breadNav').hide();
});