From 815681fab2d35c0dca6d9b14decdfe24658cd422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 8 Dec 2017 10:23:15 +0300 Subject: [PATCH] Refactored. --- .../AbpAspNetCoreMvcUiBootstrapModule.cs | 7 +++++++ .../Resource/AbpBootstrapResource.cs | 6 ++++++ .../Localization/Resource/en.json | 7 +++++++ .../Localization/Resource/tr.json | 7 +++++++ .../TagHelpers/AbpModalBodyTagHelper.cs | 2 +- .../TagHelpers/AbpModalFooterTagHelper.cs | 15 ++++++++++++--- .../TagHelpers/AbpModalHeaderTagHelper.cs | 6 ++++-- .../TagHelpers/AbpModalTagHelper.cs | 2 +- ...Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj | 15 +++++++++++++++ .../Identity/Localization/Resource/en.json | 4 ++-- .../Identity/Localization/Resource/tr.json | 2 +- .../Pages/Identity/Users/EditModal.cshtml | 18 ++++++++---------- .../Pages/Identity/_ViewImports.cshtml | 2 +- .../modules/identity/views/users/index.js | 3 +-- 14 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json rename src/{Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc => Volo.Abp.AspNetCore.Mvc.UI.Bootstrap}/TagHelpers/AbpModalBodyTagHelper.cs (85%) rename src/{Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc => Volo.Abp.AspNetCore.Mvc.UI.Bootstrap}/TagHelpers/AbpModalFooterTagHelper.cs (56%) rename src/{Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc => Volo.Abp.AspNetCore.Mvc.UI.Bootstrap}/TagHelpers/AbpModalHeaderTagHelper.cs (81%) rename src/{Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc => Volo.Abp.AspNetCore.Mvc.UI.Bootstrap}/TagHelpers/AbpModalTagHelper.cs (95%) diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs index 2d51e09c54..edf6b65716 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs @@ -1,6 +1,8 @@ using System; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource; +using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -18,6 +20,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"); }); + services.Configure(options => + { + options.Resources.AddJson("en"); + }); + services.Configure(options => { options.StyleBundles.Add("GlobalStyles", new[] diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs new file mode 100644 index 0000000000..25a70bcc28 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/AbpBootstrapResource.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource +{ + public class AbpBootstrapResource + { + } +} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json new file mode 100644 index 0000000000..61072f672c --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/en.json @@ -0,0 +1,7 @@ +{ + "culture": "en", + "texts": { + "Close": "Close", + "Save": "Save" + } +} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json new file mode 100644 index 0000000000..cb7c60111c --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resource/tr.json @@ -0,0 +1,7 @@ +{ + "culture": "tr", + "texts": { + "Close": "Kapat", + "Save": "Kaydet" + } +} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalBodyTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalBodyTagHelper.cs similarity index 85% rename from src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalBodyTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalBodyTagHelper.cs index f67e6291c8..a11f2fbefc 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalBodyTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalBodyTagHelper.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Razor.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.TagHelpers +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { public class AbpModalBodyTagHelper : TagHelper { diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalFooterTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalFooterTagHelper.cs similarity index 56% rename from src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalFooterTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalFooterTagHelper.cs index 4393bf24aa..62d5a534ad 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalFooterTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalFooterTagHelper.cs @@ -1,10 +1,19 @@ using System.Text; using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.Extensions.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resource; -namespace Volo.Abp.AspNetCore.Mvc.TagHelpers +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { public class AbpModalFooterTagHelper : TagHelper { + private readonly IStringLocalizer _localizer; + + public AbpModalFooterTagHelper(IStringLocalizer localizer) + { + _localizer = localizer; + } + public override void Process(TagHelperContext context, TagHelperOutput output) { output.TagName = "div"; @@ -16,8 +25,8 @@ namespace Volo.Abp.AspNetCore.Mvc.TagHelpers { var sb = new StringBuilder(); - sb.AppendLine(""); - sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); return sb.ToString(); } diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalHeaderTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalHeaderTagHelper.cs similarity index 81% rename from src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalHeaderTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalHeaderTagHelper.cs index 64169131ee..703fcb58fc 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalHeaderTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalHeaderTagHelper.cs @@ -1,10 +1,12 @@ using System.Text; using Microsoft.AspNetCore.Razor.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.TagHelpers +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { public class AbpModalHeaderTagHelper : TagHelper { + public string Title { get; set; } + public override void Process(TagHelperContext context, TagHelperOutput output) { output.TagName = "div"; @@ -16,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.TagHelpers { var sb = new StringBuilder(); - sb.AppendLine("
Modal Title
"); + sb.AppendLine("
" + Title + "
"); sb.AppendLine(" "); diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalTagHelper.cs similarity index 95% rename from src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalTagHelper.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalTagHelper.cs index a0823e3f8a..36dccf2656 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/TagHelpers/AbpModalTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpModalTagHelper.cs @@ -1,7 +1,7 @@ using System.Text; using Microsoft.AspNetCore.Razor.TagHelpers; -namespace Volo.Abp.AspNetCore.Mvc.TagHelpers +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers { public class AbpModalTagHelper : TagHelper { diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj index 85292657fc..b6000f93b5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj @@ -10,6 +10,21 @@ + + + + + + + PreserveNewest + + + PreserveNewest + + + + + diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json b/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json index d8f532143a..8ea034a938 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json @@ -2,7 +2,7 @@ "culture": "en", "texts": { "Users": "Users", - "CreateUser": "Create user", + "NewUser": "New user", "Actions": "Actions", "UserName": "User name", "EmailAddress": "Email address", @@ -12,6 +12,6 @@ "Close": "Close", "Save": "Save", "Password": "Password", - "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?" + "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?" } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json b/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json index 09be81e3d6..a8efd138e0 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json @@ -2,7 +2,7 @@ "culture": "tr", "texts": { "Users": "Kullanıcılar", - "CreateUser": "Kullanıcı oluştur", + "NewUser": "Yeni kullanıcı", "Actions": "İşlemler", "UserName": "Kullanıcı adı", "EmailAddress": "E-posta adresi", diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml index 43a1ee30f7..bd0adefd77 100644 --- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml +++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml @@ -7,17 +7,14 @@ Layout = null; } -@* TODO: tag helpers tabs *@ - - + -
- @* TODO: Remove id when model manager implemented *@ - + + -
@@ -52,10 +48,12 @@ @for (var i = 0; i < Model.Roles.Length; i++) {
- - - +
+ }
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml index 5e2faa8269..d1ac64721f 100644 --- a/src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml +++ b/src/Volo.Abp.Identity.Web/Pages/Identity/_ViewImports.cshtml @@ -1,2 +1,2 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js index 0ba1441197..64e90a67ec 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js @@ -4,8 +4,7 @@ var _identityUserAppService = volo.abp.identity.identityUser; var _editModal = new abp.ModalManager({ - viewUrl: abp.appPath + 'Identity/Users/EditModal'//, - //scriptUrl: abp.appPath + 'view-resources/Areas/AppAreaName/Views/Users/_CreateOrEditModal.js' + viewUrl: abp.appPath + 'Identity/Users/EditModal' }); var _$wrapper = $('#IdentityUsersWrapper');