imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored modal, form and cards.

Browse Source
pull/179/head
Halil İbrahim Kalkan 7 years ago
parent 126b9786e2
commit f2ce836ef1
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardBodyTagHelper.cs
Unescape View File

@ -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");
}

3
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardHeaderTagHelper.cs
Unescape View File

@ -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");
}

3
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs
Unescape View File

@ -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");
}

2
src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs
Unescape View File

@ -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());
}

8
src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
Unescape View File

@ -7,9 +7,9 @@
Layout = null;
}
<abp-modal>
<form method="post" asp-page="/Identity/Users/CreateModal">
<form method="post" asp-page="/Identity/Users/CreateModal">
<abp-modal>
<abp-modal-header title="@L["NewUser"]"></abp-modal-header>
@ -71,6 +71,6 @@
<abp-modal-footer></abp-modal-footer>
</form>
</abp-modal>
</abp-modal>
</form>

8
src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
Unescape View File

@ -7,9 +7,9 @@
Layout = null;
}
<abp-modal>
<form method="post" asp-page="/Identity/Users/EditModal">
<form method="post" asp-page="/Identity/Users/EditModal">
<abp-modal>
<abp-modal-header title="@L["NewUser"]"></abp-modal-header>
@ -68,6 +68,6 @@
<abp-modal-footer></abp-modal-footer>
</form>
</abp-modal>
</abp-modal>
</form>

4
src/Volo.Abp.Identity.Web/wwwroot/modules/identity/helpers/ModalManager.js
Unescape View File

@ -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({

Write Preview
Loading…
Cancel
Save