懒得勤快 пре 3 година
родитељ
комит
e669b918a5

+ 9 - 4
src/Masuit.MyBlogs.Core/Views/Home/Category.cshtml

@@ -43,8 +43,8 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(cat.Parent!=null) {
-		    <li><a asp-controller="Home" asp-action="Category" asp-route-id="@cat.ParentId">@cat.Parent.Name</a></li>
+		@if(cat.ParentId>0) {
+			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@cat.ParentId">@cat.Parent.Name</a></li>
 		}
 		}
 		<li class="current"><em>@cat.Name</em></li>
 		<li class="current"><em>@cat.Name</em></li>
 	</ol>
 	</ol>
@@ -52,6 +52,9 @@
 <div class="bg-title">
 <div class="bg-title">
 	<div class="header-content text-center">
 	<div class="header-content text-center">
 		<h1 class="size48">
 		<h1 class="size48">
+			@if(cat.ParentId>0) {
+			    @(cat.Parent.Name+" / ")
+			}
 			@cat.Name
 			@cat.Name
 			@if(CommonHelper.SystemSettings.GetOrAdd("EnableRss", "true") == "true"){
 			@if(CommonHelper.SystemSettings.GetOrAdd("EnableRss", "true") == "true"){
 				<a class="btn btn-lg btn-success" asp-controller="Subscribe" asp-action="CategoryRss" asp-route-id="@cat.Id" target="_blank">
 				<a class="btn btn-lg btn-success" asp-controller="Subscribe" asp-action="CategoryRss" asp-route-id="@cat.Id" target="_blank">
@@ -74,25 +77,27 @@
 		@foreach (var category in alllist)
 		@foreach (var category in alllist)
 		{
 		{
 			if (cat.Id==category.Id||cat.ParentId==category.Id) {
 			if (cat.Id==category.Id||cat.ParentId==category.Id) {
-				<a class="text-red">@category.Name</a><text> | </text>
+				<a class="text-red" asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 			} else {
 			} else {
 				<a asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 				<a asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 			}
 			}
 		}
 		}
 	</p>
 	</p>
 	@if(children.Count>0) {
 	@if(children.Count>0) {
+		<hr />
 		<p>
 		<p>
 			<text>二级分类:</text>
 			<text>二级分类:</text>
 			@foreach (var category in children)
 			@foreach (var category in children)
 			{
 			{
 				if (cat.Id==category.Id) {
 				if (cat.Id==category.Id) {
-					<a class="text-red">@category.Name</a><text> | </text>
+					<a class="text-red" asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 				} else {
 				} else {
 					<a asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 					<a asp-controller="Home" asp-action="Category" asp-route-id="@category.Id">@category.Name</a><text> | </text>
 				}
 				}
 			}
 			}
 		</p>
 		</p>
 	}
 	}
+	<hr />
 </div>
 </div>
 @{
 @{
 	var user = Context.Session.Get<UserInfoDto>(SessionKey.UserInfo) ?? new UserInfoDto();
 	var user = Context.Session.Get<UserInfoDto>(SessionKey.UserInfo) ?? new UserInfoDto();

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/CategoryPath.cshtml

@@ -1,5 +1,5 @@
 @model Masuit.MyBlogs.Core.Models.Entity.Category
 @model Masuit.MyBlogs.Core.Models.Entity.Category
-@if(Model.Parent!=null) {
+@if(Model.ParentId>0) {
     await Html.RenderPartialAsync("CategoryPath", Model.Parent);
     await Html.RenderPartialAsync("CategoryPath", Model.Parent);
     <text> / </text>
     <text> / </text>
 }
 }

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/CompareVersion.cshtml

@@ -27,7 +27,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model[0].Category.Parent!=null) {
+		@if(Model[0].Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model[0].Category.ParentId">@Model[0].Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model[0].Category.ParentId">@Model[0].Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model[0].CategoryId">@Model[0].Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model[0].CategoryId">@Model[0].Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/Details.cshtml

@@ -33,7 +33,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Category.Parent!=null) {
+		@if(Model.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/Details_Admin.cshtml

@@ -33,7 +33,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Category.Parent!=null) {
+		@if(Model.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/History.cshtml

@@ -11,7 +11,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(post.Category.Parent!=null) {
+		@if(post.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@post.Category.ParentId">@post.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@post.Category.ParentId">@post.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@post.CategoryId">@post.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@post.CategoryId">@post.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/HistoryVersion.cshtml

@@ -28,7 +28,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Category.Parent!=null) {
+		@if(Model.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/HistoryVersion_Admin.cshtml

@@ -25,7 +25,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Category.Parent!=null) {
+		@if(Model.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/PushMerge.cshtml

@@ -9,7 +9,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Category.Parent!=null) {
+		@if(Model.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Category.ParentId">@Model.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.CategoryId">@Model.Category.Name</a></li>

+ 1 - 1
src/Masuit.MyBlogs.Core/Views/Post/RepushMerge.cshtml

@@ -9,7 +9,7 @@
 	<ol class="cd-breadcrumb triangle">
 	<ol class="cd-breadcrumb triangle">
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Index">首页</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
 		<li><a asp-controller="Home" asp-action="Post">文章列表</a></li>
-		@if(Model.Post.Category.Parent!=null) {
+		@if(Model.Post.Category.ParentId>0) {
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Post.Category.ParentId">@Model.Post.Category.Parent.Name</a></li>
 			<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Post.Category.ParentId">@Model.Post.Category.Parent.Name</a></li>
 		}
 		}
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Post.CategoryId">@Model.Post.Category.Name</a></li>
 		<li><a asp-controller="Home" asp-action="Category" asp-route-id="@Model.Post.CategoryId">@Model.Post.Category.Name</a></li>