From 54d0c5797e3ca0bd9681bcc6e0f39545e4667dbe Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Wed, 20 Oct 2021 16:55:04 +0300
Subject: [PATCH 1/2] Improve cms-kit-pro comments search section

---
 .../Pages/CmsKit/Comments/Index.cshtml        | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
index 3e016c828c..c514525cf1 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
@@ -40,21 +40,29 @@
                 <abp-column>
                     <form id="CmsKitCommentsFilterForm" method="post">
                         <abp-row>
-                            <abp-column size-lg="_4" size-md="_12" class="input-group input-daterange">
-                                <abp-column size="_6" style="padding-left: 0">
-                                    <abp-input asp-for="@Model.CreationStartDate" label="@L["StartDate"].Value" value="@defaultStartDate" type="text" />
-                                </abp-column>
-                                <abp-column size="_6" style="padding-right: 0">
-                                    <abp-input asp-for="@Model.CreationEndDate" label="@L["EndDate"].Value" type="text" />
-                                </abp-column>
+                            <abp-column size-lg="_6" size-md="_6">
+                                <abp-row class="input-daterange">
+                                    <abp-column size-lg="_6" size-md="_6">
+                                        <abp-input asp-for="@Model.CreationStartDate" label="@L["StartDate"].Value" value="@defaultStartDate" type="text" />
+                                    </abp-column>
+                                    <abp-column size-lg="_6" size-md="_6">
+                                        <abp-input asp-for="@Model.CreationEndDate" label="@L["EndDate"].Value" type="text" />
+                                    </abp-column>
+                                </abp-row>
                             </abp-column>
-                            <abp-column size-lg="_4" size-md="_6">
-                                <abp-input asp-for="@Model.EntityType" label="@L["EntityType"].Value" type="text" />
+                            <abp-column size-lg="_6" size-md="_6">
+                                <abp-row>
+                                    <abp-column size-lg="_6" size-md="_6">
+                                        <abp-input asp-for="@Model.Author" label="@L["Username"].Value" type="text" />
+                                    </abp-column>
+                                    <abp-column size-lg="_6" size-md="_6">
+                                        <abp-input asp-for="@Model.EntityType" label="@L["EntityType"].Value" type="text" />
+                                    </abp-column>
+                                </abp-row>
                             </abp-column>
-                            <abp-column size-lg="_2" size-md="_6">
-                                <abp-input asp-for="@Model.Author" label="@L["Username"].Value" type="text" />
-                            </abp-column>
-                            <abp-column size-lg="_2" size-md="_12">
+                        </abp-row>
+                        <abp-row class="justify-content-end">
+                            <abp-column size-lg="_3" size-md="_3">
                                 <div class="d-grid gap-2">
                                     <abp-button class="mt-md-4" button-type="Primary" type="submit">
                                         <i class="fa fa-search" aria-hidden="true"></i>

From 41273c61a7f0a1016266fd5561303bf0f29b7fc2 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Thu, 21 Oct 2021 09:55:28 +0300
Subject: [PATCH 2/2] Update Index.cshtml

---
 .../Pages/CmsKit/Comments/Index.cshtml        | 57 ++++++++-----------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
index c514525cf1..a3a99969ff 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
@@ -36,43 +36,36 @@
 <abp-card class="mb-4">
     <abp-card-body>
         <div id="CmsKitCommentsWrapper">
-            <abp-row>
-                <abp-column>
-                    <form id="CmsKitCommentsFilterForm" method="post">
-                        <abp-row>
+            <form id="CmsKitCommentsFilterForm" method="post">
+                <abp-row>
+                    <abp-column size-lg="_4" size-md="_12">
+                        <abp-row class="input-daterange">
                             <abp-column size-lg="_6" size-md="_6">
-                                <abp-row class="input-daterange">
-                                    <abp-column size-lg="_6" size-md="_6">
-                                        <abp-input asp-for="@Model.CreationStartDate" label="@L["StartDate"].Value" value="@defaultStartDate" type="text" />
-                                    </abp-column>
-                                    <abp-column size-lg="_6" size-md="_6">
-                                        <abp-input asp-for="@Model.CreationEndDate" label="@L["EndDate"].Value" type="text" />
-                                    </abp-column>
-                                </abp-row>
+                                <abp-input asp-for="@Model.CreationStartDate" label="@L["StartDate"].Value" value="@defaultStartDate" type="text" />
                             </abp-column>
                             <abp-column size-lg="_6" size-md="_6">
-                                <abp-row>
-                                    <abp-column size-lg="_6" size-md="_6">
-                                        <abp-input asp-for="@Model.Author" label="@L["Username"].Value" type="text" />
-                                    </abp-column>
-                                    <abp-column size-lg="_6" size-md="_6">
-                                        <abp-input asp-for="@Model.EntityType" label="@L["EntityType"].Value" type="text" />
-                                    </abp-column>
-                                </abp-row>
+                                <abp-input asp-for="@Model.CreationEndDate" label="@L["EndDate"].Value" type="text" />
                             </abp-column>
                         </abp-row>
-                        <abp-row class="justify-content-end">
-                            <abp-column size-lg="_3" size-md="_3">
-                                <div class="d-grid gap-2">
-                                    <abp-button class="mt-md-4" button-type="Primary" type="submit">
-                                        <i class="fa fa-search" aria-hidden="true"></i>
-                                    </abp-button>
-                                </div>
-                            </abp-column>
-                        </abp-row>
-                    </form>
-                </abp-column>
-            </abp-row>
+                    </abp-column>
+
+                    <abp-column size-lg="_3" size-md="_6">
+                        <abp-input asp-for="@Model.Author" label="@L["Username"].Value" type="text" />
+                    </abp-column>
+
+                    <abp-column size-lg="_3" size-md="_6">
+                        <abp-input asp-for="@Model.EntityType" label="@L["EntityType"].Value" type="text" />
+                    </abp-column>
+
+                    <abp-column size-lg="_2" size-md="_6">
+                        <div class="d-grid gap-2">
+                            <abp-button class="mt-md-4" button-type="Primary" type="submit" style="margin-top: 1.75rem !important;">
+                                <i class="fa fa-search" aria-hidden="true"></i>
+                            </abp-button>
+                        </div>
+                    </abp-column>
+                </abp-row>
+            </form>
         </div>
     </abp-card-body>
 </abp-card>