Simplify layout

SeriaWei · Oct 19, 2024 · 276058f · 276058f
1 parent bf49e7c
commit 276058f
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 53 deletions.
diff --git a/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml b/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Account.ForgottenViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Login.cshtml b/src/ZKEACMS.WebHost/Views/Account/Login.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Common.ViewModels.AdminSignViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Login").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml b/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Account.ResetViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml b/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml
@@ -1,6 +1,7 @@
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     string link = "~/";

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml
@@ -1,7 +1,8 @@
 @model ZKEACMS.Common.ViewModels.CustomerSignInViewModel
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     var returnUrl = ViewBag.ReturnUrl ?? ViewContext.HttpContext.Request.Query["ReturnUrl"];

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml
@@ -1,7 +1,8 @@
 @model Easy.Modules.User.Models.UserEntity
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
     var returnUrl = ViewBag.ReturnUrl ?? ViewContext.HttpContext.Request.Query["ReturnUrl"];

diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml
@@ -1,6 +1,7 @@
 @{
     this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
-    Layout = Layouts.NormalDefault;
+    Layout = Layouts.EmptyLayout;
+    Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.Forbidden.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Error/Index.cshtml b/src/ZKEACMS.WebHost/Views/Error/Index.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = ViewContext.HttpContext.Response.StatusCode.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
@@ -1,6 +1,6 @@
 @{
     this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
-    Layout = Layouts.Generic;
+    Layout = Layouts.EmptyLayout;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
     <img src="~/images/error.png" />

diff --git a/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml
@@ -6,9 +6,9 @@
     @await Html.PartialAsync("Partial.PageHeader")
 </head>
 <body>
-    <div>
+    <main>
         @RenderBody()
-    </div>
+    </main>
     @await Html.PartialAsync("Partial.PageFooter")
 </body>
 </html>
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml
diff --git a/src/ZKEACMS/Constant.cs b/src/ZKEACMS/Constant.cs
@@ -33,14 +33,6 @@ public class Layouts
         /// </summary>
         public const string Default = "_Layout";
         /// <summary>
-        /// Layout with current theme and body with container.
-        /// </summary>
-        public const string NormalDefault = "_LayoutNormal";
-        /// <summary>
-        /// Layout with current theme
-        /// </summary>
-        public const string Generic = "_LayoutGeneric";
-        /// <summary>
         /// Layout for admin pop up modal
         /// </summary>
         public const string PopUp = "_PopUpLayout";