Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use outline button variation in modals #18842

Merged
merged 11 commits into from
Jan 25, 2024
Merged

Use outline button variation in modals #18842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
39eeba5
Use outline variation for Cancel in Modals
enisn Jan 23, 2024
7c3583a
use outline variation for sweetalert modals
enisn Jan 23, 2024
a240717
Update Default.cshtml
enisn Jan 23, 2024
c95dbaa
Update abp-sweetalert2.js
enisn Jan 23, 2024
46f3338
Use Outline button variation for blazor alert
enisn Jan 24, 2024
2f1730f
Use outline button variation for Tenant Management on Blazor
enisn Jan 24, 2024
44d51d0
Update FeatureManagementModal buttons
enisn Jan 24, 2024
46fcdb2
Use outline variation of buttons for Identity module on blazor
enisn Jan 24, 2024
2761cdb
Merge branch 'dev' into ux-enhancements
enisn Jan 24, 2024
4384eb6
Update PermissionManagementModal.razor
enisn Jan 24, 2024
46afb5e
Update EmailSettingGroupViewComponent.razor
enisn Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...c/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ protected virtual string GetCloseButton()
return element.ToHtmlString();
}

protected virtual string GetCancelButton()
protected virtual string GetCancelButton(bool isDestructive = false)
{
var element = new TagBuilder("button");
element.Attributes.Add("type", "button");
element.Attributes.Add("data-bs-dismiss", "modal");
element.AddCssClass("btn");
element.AddCssClass("btn-secondary");
element.AddCssClass("btn-outline-primary");
element.InnerHtml.Append(_localizer["Cancel"]);

return element.ToHtmlString();
Expand Down
7 changes: 7 additions & 0 deletions ...eme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ var abp = abp || {};
abp.libs.sweetAlert.config.default.confirmButtonText = l('Ok');
abp.libs.sweetAlert.config.default.denyButtonText = l('No');
abp.libs.sweetAlert.config.default.cancelButtonText = l('Cancel');
abp.libs.sweetAlert.config.default.buttonsStyling = false;
abp.libs.sweetAlert.config.default.customClass = {
confirmButton: "btn btn-primary",
cancelButton: "btn btn-outline-primary mx-2",
denyButton: "btn btn-outline-primary mx-2"
};

abp.libs.sweetAlert.config.confirm.title = l('AreYouSure');
abp.libs.sweetAlert.config.confirm.confirmButtonText = l('Yes');
abp.libs.sweetAlert.config.confirm.showCancelButton = true;
Expand Down
2 changes: 1 addition & 1 deletion framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ModalFooter class="d-flex justify-content-center">
@if ( IsConfirmation )
{
<Button Color="Color.Danger" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnCancelClicked">
<Button Color="Color.Primary" Outline Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnCancelClicked">
@if ( Options?.CancelButtonIcon != null )
{
<Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" />
Expand Down
4 changes: 2 additions & 2 deletions ...-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
</Tabs>
</ModalBody>
<ModalFooter>
<Button Color="Color.Primary" Clicked="@(async () => await DeleteAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button>
<Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
<Button class="btn btn-link" Clicked="CloseModal">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="@(async () => await DeleteAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button>
<Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
</ModalFooter>
}
Expand Down
4 changes: 2 additions & 2 deletions modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@CreateEntityAsync"/>
</ModalFooter>
</Form>
Expand Down Expand Up @@ -101,7 +101,7 @@
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@UpdateEntityAsync"/>
</ModalFooter>
</Form>
Expand Down
4 changes: 2 additions & 2 deletions modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@CreateEntityAsync" />
</ModalFooter>
</Form>
Expand Down Expand Up @@ -275,7 +275,7 @@
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@UpdateEntityAsync" />
</ModalFooter>
</Form>
Expand Down
2 changes: 1 addition & 1 deletion ...ement/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
}
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseModal">@L["Cancel"]</Button>
<Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
</ModalFooter>
</ModalContent>
Expand Down
2 changes: 1 addition & 1 deletion ...ent.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<SubmitButton Clicked="@UpdateSettingsAsync"/>
@if (HasSendTestEmailPermission)
{
<Button style="margin: 0.25rem" Color="Color.Primary" Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button>
<Button style="margin: 0.25rem" Color="Color.Primary" Outline Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button>
}
</Column>

Expand Down
2 changes: 1 addition & 1 deletion ...SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</abp-button>
@if (await PermissionChecker.IsGrantedAsync(SettingManagementPermissions.EmailingTest))
{
<abp-button button-type="Primary" id="SendTestEmailButton">
<abp-button button-type="Outline_Primary" id="SendTestEmailButton">
<i class="fa fa-send"></i> @L["SendTestEmail"]
</abp-button>
}
Expand Down
4 changes: 2 additions & 2 deletions ...gement/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</Validations>
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@CreateEntityAsync"/>
</ModalFooter>
</Form>
Expand Down Expand Up @@ -119,7 +119,7 @@
<ExtensionProperties TEntityType="TenantUpdateDto" TResourceType="AbpTenantManagementResource" Entity="@EditingEntity" LH="@LH" ModalType="ExtensionPropertyModalType.EditModal" />
</ModalBody>
<ModalFooter>
<Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<Button Color="Color.Primary" Outline Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
<SubmitButton Clicked="@UpdateEntityAsync"/>
</ModalFooter>
</Form>
Expand Down