Browse Source

Merge pull request #18865 from abpframework/ux-enhancements

Add missing Outline variation buttons
pull/18891/head
oykuermann 2 years ago
committed by GitHub
parent
commit
a48f4dc7f4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
  2. 4
      modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
  3. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
  4. 6
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml

@ -132,7 +132,7 @@
</abp-card-body> </abp-card-body>
<abp-card-footer> <abp-card-footer>
<abp-button button-type="Primary" type="button" text="@L["SaveAsDraft"].Value" id="button-blog-post-create" /> <abp-button button-type="Outline_Primary" type="button" text="@L["SaveAsDraft"].Value" id="button-blog-post-create" />
@if ((await AuthorizationService.AuthorizeAsync(CmsKitAdminPermissions.BlogPosts.Publish)).Succeeded) @if ((await AuthorizationService.AuthorizeAsync(CmsKitAdminPermissions.BlogPosts.Publish)).Succeeded)
{ {
<abp-button button-type="Primary" type="button" text="@L["Publish"].Value" id="button-blog-post-publish"/> <abp-button button-type="Primary" type="button" text="@L["Publish"].Value" id="button-blog-post-publish"/>

4
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@ -123,8 +123,8 @@
</abp-tabs> </abp-tabs>
</abp-modal-body> </abp-modal-body>
<abp-modal-footer> <abp-modal-footer>
<abp-button button-type="Primary" id="ResetToDefaults"><i class="fa fa-refresh"></i> @L["ResetToDefault"]</abp-button> <abp-button data-bs-dismiss="modal" button-type="Link">@L["Cancel"]</abp-button>
<abp-button data-bs-dismiss="modal" button-type="Secondary">@L["Cancel"]</abp-button> <abp-button button-type="Outline_Primary" id="ResetToDefaults"><i class="fa fa-refresh"></i> @L["ResetToDefault"]</abp-button>
<abp-button button-type="Primary" type="submit"><i class="fa fa-check"></i> @L["Save"]</abp-button> <abp-button button-type="Primary" type="submit"><i class="fa fa-check"></i> @L["Save"]</abp-button>
</abp-modal-footer> </abp-modal-footer>
} }

2
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor

@ -92,11 +92,11 @@
</Validations> </Validations>
<Row> <Row>
<Column> <Column>
<SubmitButton Clicked="@UpdateSettingsAsync"/>
@if (HasSendTestEmailPermission) @if (HasSendTestEmailPermission)
{ {
<Button style="margin: 0.25rem" Color="Color.Primary" Outline Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button> <Button style="margin: 0.25rem" Color="Color.Primary" Outline Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button>
} }
<SubmitButton Clicked="@UpdateSettingsAsync"/>
</Column> </Column>
</Row> </Row>

6
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml

@ -26,15 +26,15 @@
</div> </div>
<hr class="my-4"/> <hr class="my-4"/>
<div> <div>
<abp-button button-type="Primary" type="submit">
<i class="fa fa-save"></i> @L["Save"]
</abp-button>
@if (await PermissionChecker.IsGrantedAsync(SettingManagementPermissions.EmailingTest)) @if (await PermissionChecker.IsGrantedAsync(SettingManagementPermissions.EmailingTest))
{ {
<abp-button button-type="Outline_Primary" id="SendTestEmailButton"> <abp-button button-type="Outline_Primary" id="SendTestEmailButton">
<i class="fa fa-send"></i> @L["SendTestEmail"] <i class="fa fa-send"></i> @L["SendTestEmail"]
</abp-button> </abp-button>
} }
<abp-button button-type="Primary" type="submit">
<i class="fa fa-save"></i> @L["Save"]
</abp-button>
</div> </div>
</abp-column> </abp-column>
</abp-row> </abp-row>

Loading…
Cancel
Save