diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelper.cs
index 4b7e1d9793..d5ed691924 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelper.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelper.cs
@@ -1,12 +1,11 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card
{
public class AbpCardBodyTagHelper : TagHelper
{
public override void Process(TagHelperContext context, TagHelperOutput output)
{
- //TODO: Remove abp-modal HTML element which is unnecessary!
output.TagName = "div";
output.Attributes.AddClass("card-body");
}
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardHeaderTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardHeaderTagHelper.cs
index 4637809a0c..b146dc1ec3 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardHeaderTagHelper.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardHeaderTagHelper.cs
@@ -1,12 +1,11 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card
{
public class AbpCardHeaderTagHelper : TagHelper
{
public override void Process(TagHelperContext context, TagHelperOutput output)
{
- //TODO: Remove abp-modal HTML element which is unnecessary!
output.TagName = "div";
output.Attributes.AddClass("card-header");
}
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs
index 41122375f6..df2ddf209c 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs
@@ -1,12 +1,11 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Card
{
public class AbpCardTagHelper : TagHelper
{
public override void Process(TagHelperContext context, TagHelperOutput output)
{
- //TODO: Remove abp-modal HTML element which is unnecessary!
output.TagName = "div";
output.Attributes.AddClass("card");
}
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs
index b559975660..0dbd6f63ea 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
{
public override void Process(TagHelperContext context, TagHelperOutput output)
{
- //TODO: Remove abp-modal HTML element which is unnecessary!
+ output.TagName = null;
output.PreContent.SetHtmlContent(CreatePreContent());
output.PostContent.SetHtmlContent(CreatePostContent());
}
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 7878f04cae..2642ddda2c 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -7,9 +7,9 @@
Layout = null;
}
-
+
+
-
\ No newline at end of file
+
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 c3c78fe329..2e6605dfb7 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -7,9 +7,9 @@
Layout = null;
}
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/helpers/ModalManager.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/helpers/ModalManager.js
index e70b0604eb..94026f26da 100644
--- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/helpers/ModalManager.js
+++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/helpers/ModalManager.js
@@ -58,10 +58,10 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
function _initAndShowModal() {
_$modal = _$modalContainer.find('.modal');
+ _$form = _$modalContainer.find('form');
- _$form = _$modal.find('form');
if (_$form.length) {
- $.validator.unobtrusive.parse(_$form);
+ $.validator.unobtrusive.parse(_$form); //TODO: We should do a more common system to initialize component on ajax-loaded DOM elements. validator.unobtrusive.parse is only one thing to do.
if (_$form.attr('data-ajaxForm') !== 'false') {
//TODO: Create abpAjaxForm to not repeat that code!
_$form.ajaxForm({