From 6784765b793ffef95b808c8abc5e3243481f97e3 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Thu, 25 Jan 2024 15:47:25 +0300
Subject: [PATCH 1/4] Update FeatureManagementModal.cshtml

---
 .../Pages/FeatureManagement/FeatureManagementModal.cshtml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
index ca38284046..a3a00a89c1 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
@@ -123,8 +123,8 @@
                 </abp-tabs>
             </abp-modal-body>
             <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="Secondary">@L["Cancel"]</abp-button>
+                <abp-button data-bs-dismiss="modal" button-type="Link">@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-modal-footer>
         }

From 66cf8377cfe50b86d0789fa1f9cf3f729ee7cc9d Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Thu, 25 Jan 2024 15:50:43 +0300
Subject: [PATCH 2/4] Update Create.cshtml

---
 .../Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
index 190df58ecb..5c855e9ffe 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
@@ -132,7 +132,7 @@
 
     </abp-card-body>
     <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)
         {
             <abp-button button-type="Primary" type="button" text="@L["Publish"].Value" id="button-blog-post-publish"/>

From 446de0b438eff6b465b678369824b24208f37b83 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Thu, 25 Jan 2024 16:49:39 +0300
Subject: [PATCH 3/4] Reorder buttons in email setting group component

---
 .../Components/EmailSettingGroup/Default.cshtml             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml
index 61d4dbe996..ee8db3e38f 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml
@@ -26,15 +26,15 @@
             </div>
             <hr class="my-4"/>
             <div>
-                <abp-button button-type="Primary" type="submit">
-                    <i class="fa fa-save"></i> @L["Save"]
-                </abp-button>
                 @if (await PermissionChecker.IsGrantedAsync(SettingManagementPermissions.EmailingTest))
                 {
                     <abp-button button-type="Outline_Primary" id="SendTestEmailButton">
                         <i class="fa fa-send"></i> @L["SendTestEmail"]
                     </abp-button>
                 }
+                <abp-button button-type="Primary" type="submit">
+                    <i class="fa fa-save"></i> @L["Save"]
+                </abp-button>
             </div>
         </abp-column>
     </abp-row>

From 707b99f35a0d905b5d77037d8fea9f8fe1e9a7f5 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Thu, 25 Jan 2024 16:52:02 +0300
Subject: [PATCH 4/4] Refactor email setting group view component

---
 .../EmailSettingGroup/EmailSettingGroupViewComponent.razor      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
index 177f1d75fa..19f95ca52a 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
@@ -92,11 +92,11 @@
         </Validations>
         <Row>
             <Column>
-                <SubmitButton Clicked="@UpdateSettingsAsync"/>
                 @if (HasSendTestEmailPermission)
                 {
                     <Button style="margin: 0.25rem" Color="Color.Primary" Outline Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button>
                 }
+                <SubmitButton Clicked="@UpdateSettingsAsync"/>
             </Column>
             
         </Row>