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 7a58acc389fa34ad5112e337bb1fa2e02dc92c84..0000000000000000000000000000000000000000 --- 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 7c943e1d4221cfc9f7ed7a79faf0c2532b5bd94e..0000000000000000000000000000000000000000 --- 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 7e7d5f8abb23beb8ea1964a74cd4285e99bc362e..31f4ea34cb5a111bc7ed8b381b285ba208e39c23 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 b30050abb590f5c99ca646aff45e31c1a360a5f8..0000000000000000000000000000000000000000 --- 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 6f146d8f330a83e66a1e37433903f00dd16cf1a7..0000000000000000000000000000000000000000 --- 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 6ba4d0ba3fb577f610a83e93fc147c92fff01182..a8801f1543376322f33df199cfc3c9d7c4983f1a 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 7da678f57b4a489dc9b85c2c48c17ee0d8f7c344..0000000000000000000000000000000000000000 --- 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 0e60f32031d17ef39c293f12d2c2d9c1fc57fb82..0000000000000000000000000000000000000000 --- 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 261ee5e3c81147adb0470f3a4f93fe64608cccd8..722092144f7082a18c3df7f1656cb034a12bb71a 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 ac5be495ec759c5ca4e81e3054c58e3853ba2fcf..0000000000000000000000000000000000000000 --- 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 f03f95755d4103d0d281d80aaf95a74202cee94b..b3637c78cb0c2d73a571831a30a4ea18fab97475 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 90ef4781f7841eaee0062809a3aa8d6b0dbd58e7..0000000000000000000000000000000000000000 --- 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 b30050abb590f5c99ca646aff45e31c1a360a5f8..0000000000000000000000000000000000000000 --- 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 15c2080f533ba1f152c049286316fc8fb155d6a1..0000000000000000000000000000000000000000 --- 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 6a61ca901c2f7cfb21f5cd6ae84c290e0e88d902..0000000000000000000000000000000000000000 --- 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 70e1168f1c2141954c13274c7a40c198bb9e95f9..0000000000000000000000000000000000000000 --- 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 -