From fafde6f7e92f5965b382a596742098735757df76 Mon Sep 17 00:00:00 2001 From: sassassin <530521314@qq.com> Date: Tue, 20 Jul 2021 22:30:44 +0800 Subject: [PATCH 1/2] Modify layout html --- .../Views/Account/Register.cshtml | 85 ------------------- .../Views/Account/RegisterResult.cshtml | 30 ------- .../Views/Account/_Layout.cshtml | 2 +- .../Views/Account/_Scripts.cshtml | 4 - .../Views/Account/_Styles.cshtml | 5 -- .../Views/Chat/_Layout.cshtml | 6 +- .../Views/Chat/_Scripts.cshtml | 5 -- .../Views/Chat/_Styles.cshtml | 7 -- .../Views/Home/Index.cshtml | 4 +- .../Views/Home/_Layout.cshtml | 2 +- .../Views/Home/_Scripts.cshtml | 5 -- .../Views/Home/_Styles.cshtml | 6 -- .../Views/Shared/Error.cshtml | 4 +- .../Views/Shared/Layout/_Layout.cshtml | 29 ------- .../Views/Shared/Layout/_Scripts.cshtml | 4 - .../Views/Shared/Layout/_Styles.cshtml | 6 -- .../_ModalFooterWithSaveAndCancel.cshtml | 4 - .../Views/Shared/Modals/_ModalHeader.cshtml | 8 -- 18 files changed, 11 insertions(+), 205 deletions(-) delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Account/Register.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Account/RegisterResult.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Account/_Scripts.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Account/_Styles.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Scripts.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Styles.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Home/_Scripts.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Home/_Styles.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Layout.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Scripts.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Styles.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml delete mode 100644 src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalHeader.cshtml diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Account/Register.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Account/Register.cshtml deleted file mode 100644 index 7a58acc..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Account/Register.cshtml +++ /dev/null @@ -1,85 +0,0 @@ -@using Abp.Authorization.Users -@model PearAdmin.AbpTemplate.Admin.Models.Account.RegisterViewModel -@{ - ViewBag.Title = L("Register"); -} -@section scripts -{ - - - - - - - -} -

@L("Register")

-
- @if (ViewBag.ErrorMessage != null) - { -
- @ViewBag.ErrorMessage -
- } - - -
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
- -
-
-
-@**@ diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Account/RegisterResult.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Account/RegisterResult.cshtml deleted file mode 100644 index 7c943e1..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Account/RegisterResult.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@model PearAdmin.AbpTemplate.Admin.Models.Account.RegisterResultViewModel -@{ - ViewBag.Title = L("SuccessfullyRegistered"); -} -
-
-

@L("SuccessfullyRegistered")

- -
- @if (!Model.IsActive) - { - - } - - @if (Model.IsEmailConfirmationRequiredForLogin && !Model.IsEmailConfirmed) - { - - } -
-
-
diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Layout.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Layout.cshtml index 7e7d5f8..31f4ea3 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Layout.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Layout.cshtml @@ -18,7 +18,7 @@ @pageTitle - + @RenderSection("styles", required: false) diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Scripts.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Scripts.cshtml deleted file mode 100644 index b30050a..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Scripts.cshtml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Styles.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Styles.cshtml deleted file mode 100644 index 6f146d8..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Account/_Styles.cshtml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml index 6ba4d0b..a8801f1 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml @@ -21,14 +21,16 @@ @pageTitle - @await Html.PartialAsync("_Styles.cshtml") + + @RenderSection("styles", required: false) @RenderBody() - @await Html.PartialAsync("_Scripts.cshtml") + + @RenderSection("scripts", required: false) @WebResourceManager.RenderScripts() diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Scripts.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Scripts.cshtml deleted file mode 100644 index 7da678f..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Scripts.cshtml +++ /dev/null @@ -1,5 +0,0 @@ - - @*pear admin*@ - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Styles.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Styles.cshtml deleted file mode 100644 index 0e60f32..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Styles.cshtml +++ /dev/null @@ -1,7 +0,0 @@ - - - - @*pear admin*@ - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml index 261ee5e..8c06465 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml @@ -64,7 +64,7 @@ @section scripts{ - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Home/_Styles.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Home/_Styles.cshtml deleted file mode 100644 index ac5be49..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Home/_Styles.cshtml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Error.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Error.cshtml index f03f957..b3637c7 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Error.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Error.cshtml @@ -1,5 +1,7 @@ @using Abp.Collections.Extensions @model Abp.Web.Mvc.Models.ErrorViewModel + +@*todo*@
@@ -12,7 +14,7 @@

@(!string.IsNullOrEmpty(Model.ErrorInfo.Details) ? Model.ErrorInfo.Details : Model.ErrorInfo.Message)

- @* Show validation errors *@ + @if (!Model.ErrorInfo.ValidationErrors.IsNullOrEmpty()) {
    diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Layout.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Layout.cshtml deleted file mode 100644 index 90ef478..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Layout.cshtml +++ /dev/null @@ -1,29 +0,0 @@ -@using Abp.Configuration.Startup -@using Abp.Web.Mvc.Alerts -@using Abp.Web.Security.AntiForgery -@inject IAbpAntiForgeryManager AbpAntiForgeryManager -@inject IMultiTenancyConfig MultiTenancyConfig -@inject IAlertManager AlertManager -@inject ILanguageManager LanguageManager -@{ - AbpAntiForgeryManager.SetCookie(Context); -} - - - - - - - - @await Html.PartialAsync("_Styles.cshtml") - @RenderSection("styles", required: false) - - - - @RenderBody() - - @await Html.PartialAsync("_Scripts.cshtml") - @RenderSection("scripts", required: false) - - - diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Scripts.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Scripts.cshtml deleted file mode 100644 index b30050a..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Scripts.cshtml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Styles.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Styles.cshtml deleted file mode 100644 index 15c2080..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Layout/_Styles.cshtml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml deleted file mode 100644 index 6a61ca9..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalHeader.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalHeader.cshtml deleted file mode 100644 index 70e1168..0000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Modals/_ModalHeader.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@using PearAdmin.AbpTemplate.Admin.Models.Common.Modals -@model ModalHeaderViewModel - -- Gitee From 09a3f4957f397e85349fb2436a11c9ecd4b6fc34 Mon Sep 17 00:00:00 2001 From: sassassin <530521314@qq.com> Date: Wed, 21 Jul 2021 21:58:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E9=A1=B5=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=96=E5=B1=82parent=E4=B8=AD=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/Index.cshtml | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml index 8c06465..7220921 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml @@ -75,29 +75,29 @@ var config = { logo: { - title: "PearAdmin AbpTemplate", // 网站标题 - image: "/images/logo.png" // 网站Logo + title: "PearAdmin AbpTemplate", + image: "/images/logo.png" }, menu: { - control: false, // 是 否 开 启 多 系 统 菜 单 true 开启 false 关闭 + control: false, accordion: true, async: false, - select: hash.md5("@Url.Action(!AbpSession.TenantId.HasValue ? "HostConsole": "TenantConsole", "WorkSpace")").toUpperCase(), // 默 认 选 中 菜 单 项 + select: hash.md5("@Url.Action(AbpSession.TenantId.HasValue ? "TenantConsole" : "HostConsole", "WorkSpace")").toUpperCase(), }, tab: { - muiltTab: true, // 是 否 开 启 多 标 签 页 true 开启 false 关闭 + muiltTab: true, keepState: true, tabMax: 20, index: { - id: hash.md5("@Url.Action(!AbpSession.TenantId.HasValue ? "HostConsole": "TenantConsole","WorkSpace")").toUpperCase(), - href: '@Url.Action("TenantConsole","WorkSpace")', // 默 认 加 载 主 页 - title: "@Html.Raw(L(!AbpSession.TenantId.HasValue ? "HostConsole": "TenantConsole"))" + id: hash.md5("@Url.Action(AbpSession.TenantId.HasValue ? "TenantConsole": "HostConsole", "WorkSpace")").toUpperCase(), + href: '@Url.Action(AbpSession.TenantId.HasValue ? "TenantConsole" : "HostConsole", "WorkSpace")', + title: "@Html.Raw(L(AbpSession.TenantId.HasValue ? "TenantConsole": "HostConsole"))" } }, theme: { defaultMenu: "dark-theme", // 默 认 主 题 样 式 dark-theme 默认主题 light-theme 亮主题 - allowCustom: true, - defaultColor:3 + allowCustom: false, + defaultColor: "3" }, colors: [ { @@ -143,7 +143,10 @@ } ], other: { - keepLoad: false, // 主 页 加 载 过 度 时 长 可 为 false + keepLoad: false, + }, + header: { + message: false } }; admin.render(config); -- Gitee