From fa97c4c204be51e75809fae8c74180975832616f Mon Sep 17 00:00:00 2001
From: wayne <seriawei@outlook.com>
Date: Sun, 13 Oct 2024 17:40:26 +0800
Subject: [PATCH] Remove ViewBag.Title

---
 src/ZKEACMS.Article/Views/ArticleType/Select.cshtml         | 2 +-
 src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml     | 2 +-
 .../Views/SectionContentVideo/Play.cshtml                   | 2 +-
 src/ZKEACMS.Shop/Views/CustomOrder/Detail.cshtml            | 2 +-
 src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml            | 2 +-
 src/ZKEACMS.Shop/Views/CustomOrder/Index.cshtml             | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Edit.cshtml               | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml          | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Index.cshtml              | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Login.cshtml              | 2 +-
 src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml           | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Reset.cshtml              | 2 +-
 src/ZKEACMS.WebHost/Views/Account/Sended.cshtml             | 2 +-
 src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml             | 2 +-
 src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml             | 2 +-
 src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml      | 2 +-
 src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml            | 2 +-
 src/ZKEACMS.WebHost/Views/Error/Index.cshtml                | 2 +-
 src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml             | 2 +-
 src/ZKEACMS.WebHost/Views/Media/Index.cshtml                | 2 +-
 src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml          | 2 +-
 src/ZKEACMS.WebHost/Views/Page/Select.cshtml                | 2 +-
 src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml            | 2 +-
 src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml  | 2 +-
 .../Views/Shared/_CustomerCenterLayout.cshtml               | 6 +-----
 src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml        | 6 ------
 src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml      | 6 ------
 src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml       | 6 ------
 src/ZKEACMS.WebHost/Views/Shared/_PopUpClientLayout.cshtml  | 6 ------
 src/ZKEACMS.WebHost/Views/Shared/_PopUpLayout.cshtml        | 5 -----
 src/ZKEACMS.WebHost/Views/User/PassWord.cshtml              | 2 +-
 31 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml b/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml
index 2a6b4c709..5669798d5 100644
--- a/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml
+++ b/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml
@@ -1,7 +1,7 @@
 @using Easy.ViewPort.jsTree
 @using ZKEACMS.Article.Models
 @{
-    ViewBag.Title = L("Article Category");
+    this.WorkContext().CurrentPage.Title = L("Article Category");
     Layout = Layouts.PopUp;
     Style.Reqiured("jsTree").AtHead();
     Script.Reqiured("jsTree").AtFoot();
diff --git a/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml b/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml
index 78b4484dd..9a2014db3 100644
--- a/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml
+++ b/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml
@@ -1,7 +1,7 @@
 @using Easy.ViewPort.jsTree
 @using ZKEACMS.Article.Models
 @{
-    ViewBag.Title = L("Product Category");
+    this.WorkContext().CurrentPage.Title = L("Product Category");
     Layout = Layouts.PopUp;
     Style.Reqiured("jsTree").AtHead();
     Script.Reqiured("jsTree").AtFoot();
diff --git a/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml b/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml
index cc8b7c3eb..e298a4685 100644
--- a/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml
+++ b/src/ZKEACMS.SectionWidget/Views/SectionContentVideo/Play.cshtml
@@ -8,7 +8,7 @@
     {
         return;
     }
-    ViewBag.Title = video.VideoTitle;
+    this.WorkContext().CurrentPage.Title = video.VideoTitle;
     Style.Reqiured("Section").AtFoot();
 }
 
diff --git a/src/ZKEACMS.Shop/Views/CustomOrder/Detail.cshtml b/src/ZKEACMS.Shop/Views/CustomOrder/Detail.cshtml
index 1b06cf70b..cbf1bbd2e 100644
--- a/src/ZKEACMS.Shop/Views/CustomOrder/Detail.cshtml
+++ b/src/ZKEACMS.Shop/Views/CustomOrder/Detail.cshtml
@@ -2,7 +2,7 @@
 @model OrderDetailViewModel
 @{
     Layout = Layouts.CustomerCenter;
-    ViewBag.Title = L("Order Detail").Text;
+    this.WorkContext().CurrentPage.Title = L("Order Detail").Text;
     if (Model.Order == null)
     {
         return;
diff --git a/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml b/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml
index c0260bb15..4d15e5378 100644
--- a/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml
+++ b/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml
@@ -1,6 +1,6 @@
 @{
     Layout = Layouts.CustomerCenter;
-    ViewBag.Title = L("Order failed to pay");
+    this.WorkContext().CurrentPage.Title = L("Order failed to pay");
 }
 <div class="text-center">
     <div class="page-header">
diff --git a/src/ZKEACMS.Shop/Views/CustomOrder/Index.cshtml b/src/ZKEACMS.Shop/Views/CustomOrder/Index.cshtml
index dadf76782..2e0031902 100644
--- a/src/ZKEACMS.Shop/Views/CustomOrder/Index.cshtml
+++ b/src/ZKEACMS.Shop/Views/CustomOrder/Index.cshtml
@@ -2,7 +2,7 @@
 @model OrderListViewModel
 @{
     Layout = Layouts.CustomerCenter;
-    ViewBag.Title = L("My Order").Text;
+    this.WorkContext().CurrentPage.Title = L("My Order").Text;
 }
 <div class="panel panel-default">
     <div class="panel-heading">
diff --git a/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml b/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml
index 470f3091c..b7a20c4ac 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml
@@ -1,6 +1,6 @@
 @model Easy.Modules.User.Models.UserEntity
 @{
-    ViewBag.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center");
     Layout = Layouts.CustomerCenter;
     Script.Reqiured("validate").AtFoot();
 }
diff --git a/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml b/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml
index 58272b647..dcbd41e1d 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Forgotten.cshtml
@@ -1,6 +1,6 @@
 @model ZKEACMS.Account.ForgottenViewModel
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Account/Index.cshtml b/src/ZKEACMS.WebHost/Views/Account/Index.cshtml
index 89f73eede..7579a233e 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Index.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Index.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center");
     Layout = Layouts.CustomerCenter;
 }
 <div class="panel panel-default user-info">
diff --git a/src/ZKEACMS.WebHost/Views/Account/Login.cshtml b/src/ZKEACMS.WebHost/Views/Account/Login.cshtml
index 0df5c885f..36c6f8458 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Login.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Login.cshtml
@@ -1,6 +1,6 @@
 @model ZKEACMS.Common.ViewModels.AdminSignViewModel
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     Style.Reqiured("Login").AtHead();
     Script.Reqiured("validate").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml b/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml
index 7cd0a17e5..7cd55497d 100644
--- a/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center");
     Layout = Layouts.CustomerCenter;
     Script.Reqiured("validate").AtFoot();
 }
diff --git a/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml b/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml
index 5a0e84440..f2356bb08 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Reset.cshtml
@@ -1,6 +1,6 @@
 @model ZKEACMS.Account.ResetViewModel
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     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
index 4757064e3..231490fa0 100644
--- a/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/Sended.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml
index e5e9cd621..859dc2fcd 100644
--- a/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/SignIn.cshtml
@@ -1,6 +1,6 @@
 @model ZKEACMS.Common.ViewModels.CustomerSignInViewModel
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml
index ca2d61132..dee34f30d 100644
--- a/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/SignUp.cshtml
@@ -1,6 +1,6 @@
 @model Easy.Modules.User.Models.UserEntity
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     Style.Reqiured("Customer").AtHead();
     Script.Reqiured("validate").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml b/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml
index bb0ceabba..5d3905005 100644
--- a/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Account/SignUpSuccess.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
+    this.WorkContext().CurrentPage.Title = ZKEACMS.Version.CurrentVersion + " " + ZKEACMS.Version.Rank;
     Layout = Layouts.NormalDefault;
     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
index 726239261..be86f5056 100644
--- a/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Error/Forbidden.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ViewContext.HttpContext.Response.StatusCode;
+    this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.Forbidden.ToString();
     Layout = Layouts.Generic;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
diff --git a/src/ZKEACMS.WebHost/Views/Error/Index.cshtml b/src/ZKEACMS.WebHost/Views/Error/Index.cshtml
index 726239261..107b92074 100644
--- a/src/ZKEACMS.WebHost/Views/Error/Index.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Error/Index.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ViewContext.HttpContext.Response.StatusCode;
+    this.WorkContext().CurrentPage.Title = ViewContext.HttpContext.Response.StatusCode.ToString();
     Layout = Layouts.Generic;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
diff --git a/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml
index 726239261..1a5dc1717 100644
--- a/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Error/NotFound.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ViewContext.HttpContext.Response.StatusCode;
+    this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
     Layout = Layouts.Generic;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
diff --git a/src/ZKEACMS.WebHost/Views/Media/Index.cshtml b/src/ZKEACMS.WebHost/Views/Media/Index.cshtml
index 6c5b55f1a..67fe53d45 100644
--- a/src/ZKEACMS.WebHost/Views/Media/Index.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Media/Index.cshtml
@@ -1,7 +1,7 @@
 @using ZKEACMS.Common.ViewModels
 @model MediaViewModel
 @{
-    ViewBag.Title = L("Media");
+    this.WorkContext().CurrentPage.Title = L("Media");
     var action = Html.ViewContext.RouteData.Values["action"].ToString();
 
     Script.Reqiured("image-viewer").AtFoot();
diff --git a/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml b/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml
index 778786920..f3b1b8fd4 100644
--- a/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml
@@ -3,7 +3,7 @@
 @using Easy.ViewPort.jsTree
 
 @{
-    ViewBag.Title = L("Navigation");
+    this.WorkContext().CurrentPage.Title = L("Navigation");
     Layout = Layouts.PopUp;
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();
diff --git a/src/ZKEACMS.WebHost/Views/Page/Select.cshtml b/src/ZKEACMS.WebHost/Views/Page/Select.cshtml
index 48641d54c..c6fe6bbfd 100644
--- a/src/ZKEACMS.WebHost/Views/Page/Select.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Page/Select.cshtml
@@ -1,6 +1,6 @@
 @using Easy.ViewPort.jsTree;
 @{
-    ViewBag.Title = L("Page");
+    this.WorkContext().CurrentPage.Title = L("Page");
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();
     Layout = Layouts.PopUp;
diff --git a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
index 726239261..1a5dc1717 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/NotFound.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = ViewContext.HttpContext.Response.StatusCode;
+    this.WorkContext().CurrentPage.Title = System.Net.HttpStatusCode.NotFound.ToString();
     Layout = Layouts.Generic;
 }
 <div style="text-align: center; height: 100vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
diff --git a/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml b/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml
index 2de2fa297..993dcd0b1 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml
@@ -11,7 +11,7 @@
     }
     var favicon = applicationSettingService.Get(SettingKeys.Favicon, "~/favicon.ico");
 }
-<title>@currentPage.Title</title>
+<title>@(currentPage.Title)</title>
 @if (currentPage.MetaKeyWords.IsNotNullAndWhiteSpace())
 {
     <meta name="keywords" content="@currentPage.MetaKeyWords" />
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_CustomerCenterLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_CustomerCenterLayout.cshtml
index 5ff8efae4..ae2d6bb7d 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_CustomerCenterLayout.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_CustomerCenterLayout.cshtml
@@ -5,11 +5,7 @@
     Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("Customer").AtHead();
     Style.Reqiured("Easy").AtHead();
-    IEnumerable<AdminMenu> menu = userCenterLinkService.GetLinks();
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }    
+    IEnumerable<AdminMenu> menu = userCenterLinkService.GetLinks();  
 }
 @inject IUserCenterLinkService userCenterLinkService
 @inject IOptions<CultureOption> cultureOption
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml
index 22b0fa8e5..eccac4ade 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_EmptyLayout.cshtml
@@ -1,11 +1,5 @@
 @using Microsoft.AspNetCore.Hosting
 @using Microsoft.Extensions.Hosting
-@{
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }
-}
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml
index 84e045f00..91254cf7d 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_LayoutGeneric.cshtml
@@ -2,12 +2,6 @@
 @using Microsoft.Extensions.Hosting
 @using Microsoft.Extensions.Options
 @using Easy.Options
-@{
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }
-}
 @inject IOptions<CultureOption> cultureOption
 <!DOCTYPE html>
 <html lang="@cultureOption.Value.Code">
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml
index a9081ca58..0b05f0191 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_LayoutNormal.cshtml
@@ -2,12 +2,6 @@
 @using Microsoft.Extensions.Hosting
 @using Microsoft.Extensions.Options
 @using Easy.Options
-@{
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }
-}
 @inject IOptions<CultureOption> cultureOption
 <!DOCTYPE html>
 <html lang="@cultureOption.Value.Code">
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_PopUpClientLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_PopUpClientLayout.cshtml
index a07deb412..1b6427052 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_PopUpClientLayout.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_PopUpClientLayout.cshtml
@@ -1,11 +1,5 @@
 @using Microsoft.AspNetCore.Hosting
 @using Microsoft.Extensions.Hosting
-@{
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }
-}
 <!DOCTYPE html>
 <html style="height:100%">
 <head>
diff --git a/src/ZKEACMS.WebHost/Views/Shared/_PopUpLayout.cshtml b/src/ZKEACMS.WebHost/Views/Shared/_PopUpLayout.cshtml
index 1c6b50e59..255e14446 100644
--- a/src/ZKEACMS.WebHost/Views/Shared/_PopUpLayout.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Shared/_PopUpLayout.cshtml
@@ -3,12 +3,7 @@
     Script.Reqiured("admin").AtHead();
     Style.Reqiured("bootStrap").AtHead();
     Style.Reqiured("admin").AtHead();
-    if (ViewBag.Title != null)
-    {
-        this.WorkContext().CurrentPage.Title = ViewBag.Title;
-    }
 }
-
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml b/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml
index c7451c374..0657e44ec 100644
--- a/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml
+++ b/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = L("Change Password");
+    this.WorkContext().CurrentPage.Title = L("Change Password");
     Script.Reqiured("validate").AtFoot();
 }
 @using (Html.BeginForm())