Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
admin popup layout - action buttons
DanielŻuławski0bece8b54ab6
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtmlindex 8a30c7db6..be39d3b0e 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml@@ -17,11 +17,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Common.AddNew"]</div>- <div class="actions">- <div class="btn-group btn-group-devided">- <input type="submit" name="save" class="btn default" value="@Loc["Admin.Common.Save"]" />- </div>- </div></div><div class="x_content form"><partial name="_CreateOrUpdate" model="Model" />diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtmlindex 5adcb1c43..509246b58 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml@@ -16,11 +16,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Common.Edit"]</div>- <div class="actions">- <div class="btn-group btn-group-devided">- <input type="submit" name="save" class="btn default" value="@Loc["Admin.Common.Save"]" />- </div>- </div></div><div class="x_content form"><partial name="_CreateOrUpdate" model="Model" />diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/_CreateOrUpdate.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/_CreateOrUpdate.cshtmlindex 1e4def883..880d45e79 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/_CreateOrUpdate.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/_CreateOrUpdate.cshtml@@ -146,5 +146,10 @@<span asp-validation-for="PercentageRateOfSubtotal"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i>@Loc["Admin.Common.Save"]</button>+ </div>+ </div></div></div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtmlindex 310ff6a7d..559891724 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml@@ -13,9 +13,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Address.AddressAttributes.Values.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><vc:admin-widget widget-zone="address_attribute_value_details_buttons" additional-data="null" /><div class="x_content form">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtmlindex 00a5dcddc..3da877503 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml@@ -13,9 +13,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><vc:admin-widget widget-zone="address_attribute_value_details_buttons" additional-data="Model" /><div class="x_content form">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdateValue.cshtmlindex 25efefe1b..61ce5ad41 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdateValue.cshtml@@ -48,6 +48,11 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div></div></div><vc:admin-widget widget-zone="address_attribute_value_details_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtmlindex 19d6fa537..3ac7b26c8 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/ProductAddPopup.cshtml@@ -13,7 +13,7 @@<div class="row"><div class="col-md-12">- <div class="x_panel light form-fit">+ <div class="x_panel light form-fit popup-window"><div class="x_title"><div class="caption"><i class="fa fa-sitemap"></i>@@ -25,23 +25,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtmlindex 18cbde1d8..07c2bb960 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/ProductAddPopup.cshtml@@ -25,23 +25,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtmlindex 9dfc7197d..f866cb67b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml@@ -15,7 +15,6 @@@Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</div><div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="null" /></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtmlindex 787112fab..baa3a8fa5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml@@ -13,10 +13,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Orders.CheckoutAttributes.Values.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdateValue.cshtmlindex d0012fee6..d8901d075 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdateValue.cshtml@@ -83,6 +83,12 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="checkout_attribute_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtmlindex 1f076eb35..5fc923575 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/ProductAddPopup.cshtml@@ -25,24 +25,24 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtmlindex 2164701d1..9ed13bfa2 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml@@ -13,10 +13,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="contact_attribute_value_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtmlindex 559ed3c3d..c330d5ab7 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml@@ -12,10 +12,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="contact_attribute_value_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdateValue.cshtmlindex 4f37c86c4..b578913f7 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdateValue.cshtml@@ -70,6 +70,12 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="contact_attribute_value_details_buttons" additional-data="null" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="contact_attribute_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtmlindex fff73c834..979e9a73e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateCreatePopup.cshtml@@ -12,10 +12,6 @@<i class="fa fa-globe"></i>@Loc["Admin.Configuration.Countries.States.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="country_state_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateState" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtmlindex 037203c75..db0bb5266 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/StateEditPopup.cshtml@@ -12,10 +12,6 @@<i class="fa fa-globe"></i>@Loc["Admin.Configuration.Countries.States.EditStateDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="country_state_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateState" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdateState.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdateState.cshtmlindex e35eabdc0..75c684c65 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdateState.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdateState.cshtml@@ -56,6 +56,12 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="country_state_details_buttons" additional-data="null" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="country_state_details_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtmlindex fc31d98a0..8dfc522b3 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/ProductAddPopup.cshtml@@ -26,24 +26,24 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtmlindex a050db667..adf03aec8 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/ProductAddPopup.cshtml@@ -28,23 +28,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtmlindex 08e036de5..dd9f1edd5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml@@ -17,11 +17,7 @@<div class="caption"><i class="fa fa-list-alt"></i>@Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]- </div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="customer_attribute_value_details_buttons" additional-data="null" />- </div>+ </div></div><div class="x_content form"><partial name="_CreateOrUpdateValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtmlindex 22dcfc1bd..a16764cad 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml@@ -21,10 +21,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="customer_attribute_value_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdateValue.cshtmlindex dc1c64ad2..0e37ff14b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdateValue.cshtml@@ -47,6 +47,12 @@<span asp-validation-for="DisplayOrder"></span></div></dic>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="customer_attribute_value_details_buttons" additional-data="null" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="customer_attribute_values_details_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtmlindex be16c74d5..939795e9c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/ProductAddPopup.cshtml@@ -24,22 +24,22 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtmlindex d6e849515..67781382e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/ProductAddPopup.cshtml@@ -28,23 +28,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtmlindex 0fa20103a..4eafb736b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/ProductAddPopup.cshtml@@ -26,23 +26,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtmlindex 4a2f6635c..691a84742 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/ProductAddPopup.cshtml@@ -26,23 +26,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtmlindex ab096e062..f9c8ff933 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueCreatePopup.cshtml@@ -18,9 +18,6 @@<i class="fa fa-list-alt"></i>@Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><div class="x_content form"><partial name="_CreateOrUpdateAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtmlindex fa7a9ee51..50add1827 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/ValueEditPopup.cshtml@@ -19,9 +19,6 @@<i class="fa fa-list-alt"></i>@Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><div class="x_content form"><partial name="_CreateOrUpdateAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttributeValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttributeValue.cshtmlindex 73e357a5f..64dc4a0c5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttributeValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttributeValue.cshtml@@ -49,5 +49,10 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div></div></div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtmlindex 3b9eb2064..ec9dec3b2 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociateProductToAttributeValuePopup.cshtml@@ -23,13 +23,13 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions"><div class="btn-group"><button class="btn btn-success filter-submit" id="search-products">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtmlindex 353248d82..1ee18d212 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml@@ -26,23 +26,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtmlindex a124e1a5c..5d1515d55 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml@@ -38,10 +38,6 @@@Loc["Admin.Catalog.Products.ProductAttributes.AttributeCombinations.Update"]}</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_attribute_combination_details_buttons" additional-data="Model" />- </div></div><div class="x_content"><div class="form-horizontal">@@ -140,7 +136,7 @@<td align="center" style="width: 20%;"><admin-input asp-for="@Model.WarehouseInventoryModels[i].ReservedQuantity" /></td>-+</tr>}</tbody>@@ -237,6 +233,12 @@</ul></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="product_attribute_combination_details_buttons" additional-data="Model" />+ </div>+ </div></div>@if (!string.IsNullOrEmpty(Model.Id)){diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtmlindex c8528553f..4e73d1f3b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/BundleProductAddPopup.cshtml@@ -25,23 +25,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtmlindex 564a32148..3060a3c16 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/CrossSellProductAddPopup.cshtml@@ -25,23 +25,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtmlindex 2da82072a..3cb3cf0cb 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeMappingPopup.cshtml@@ -31,9 +31,6 @@<text>@Loc["Admin.Catalog.Products.ProductAttributes.Edit"]</text>}</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><div class="x_content form"><div class="form-horizontal">@@ -97,6 +94,11 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtmlindex ed6a1318e..94c1df0e0 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueCreatePopup.cshtml@@ -18,10 +18,6 @@<i class="fa fa-cube"></i>@Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_attribute_value_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateProductAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtmlindex cdfd2821b..06765a9d7 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValueEditPopup.cshtml@@ -18,10 +18,6 @@<i class="fa fa-cube"></i>@Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Values.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_attribute_value_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateProductAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtmlindex 29109bf20..454803084 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml@@ -44,9 +44,6 @@<i class="fa fa-cubes"></i><text> @Loc["Admin.Catalog.Products.Pictures.Details"]</text></div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><div class="x_content form"><div class="form-horizontal">@@ -82,6 +79,11 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtmlindex 3bf94bedf..891609c07 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RecommendedProductAddPopup.cshtml@@ -23,23 +23,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtmlindex 87d196ff3..33013a5c3 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml@@ -25,23 +25,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtmlindex 93782d856..c3e61f3aa 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml@@ -20,23 +20,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtmlindex aa162ae67..b6dd6c590 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/SimilarProductAddPopup.cshtml@@ -23,23 +23,23 @@<div class="form-body"><div class="main-header col-12 px-0"><div class="row align-items-end">- <div class="col-md-8 col-ms-12 col-12">+ <div class="col-md col-ms-12 col-12"><div class="form-group mb-0"><admin-label asp-for="SearchProductName" class="control-label" /><admin-input asp-for="SearchProductName" /></div></div>- <div class="col-md-4 col-sm-12 col-12">+ <div class="col-md-auto col-sm-12 col-12"><div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">+ <div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products"><i class="fa fa-search"></i> @Loc["Admin.Common.Search"]</button>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse"><i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]</button></div>+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtmlindex a7d3028fb..d2f786913 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceCreatePopup.cshtml@@ -20,10 +20,6 @@<i class="fa fa-cube"></i>@Loc["Admin.Catalog.Products.TierPrices.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_tier_price_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateTierPrice" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtmlindex 2f8918dfd..15105d9ba 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/TierPriceEditPopup.cshtml@@ -20,10 +20,6 @@<i class="fa fa-cube"></i>@Loc["Admin.Catalog.Products.TierPrices.Edit"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_tier_price_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateTierPrice" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateProductAttributeValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateProductAttributeValue.cshtmlindex d9d98a728..e2cf07cd0 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateProductAttributeValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateProductAttributeValue.cshtml@@ -206,6 +206,12 @@<span asp-validation-for="PictureId"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="product_attribute_value_details_buttons" additional-data="null" />+ </div>+ </div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateTierPrice.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateTierPrice.cshtmlindex b0374f1bc..757da71ac 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateTierPrice.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdateTierPrice.cshtml@@ -56,6 +56,12 @@<span asp-validation-for="EndDateTime"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="product_tier_price_details_buttons" additional-data="null" />+ </div>+ </div></div><vc:admin-widget widget-zone="product_details_tier_price_bottom" additional-data="Model" /></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmlindex 207b52861..73911cf94 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml@@ -11,10 +11,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_attribute_predefined_value_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmlindex 210184aeb..bd945ad34 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml@@ -12,10 +12,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.EditValueDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="product_attribute_predefined_value_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdatePredefinedProductAttributeValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdatePredefinedProductAttributeValue.cshtmlindex 18374fba1..a70fdfe0d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdatePredefinedProductAttributeValue.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdatePredefinedProductAttributeValue.cshtml@@ -72,6 +72,12 @@<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <vc:admin-widget widget-zone="product_attribute_predefined_value_details_buttons" additional-data="null" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="product_attribute_predefined_values_details_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtmlindex 0346ab5a9..715327743 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml@@ -36,9 +36,6 @@<i class="fa fa-cubes"></i><text> @Loc["Admin.Catalog.Picture"]</text></div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div></div><div class="x_content form"><div class="form-horizontal">@@ -67,6 +64,11 @@</div></div></localized-editor>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtmlindex 05673b72e..c944beee7 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml@@ -16,10 +16,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i>@Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="null" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateOption" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtmlindex 6a66e76e7..7c1753606 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml@@ -17,10 +17,6 @@<i class="fa fa-list-alt"></i>@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"]</div>- <div class="actions">- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- <vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="Model" />- </div></div><div class="x_content form"><partial name="_CreateOrUpdateOption" model="Model" />diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtmlindex 8decc1396..a12503044 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdateOption.cshtml@@ -89,6 +89,12 @@ function toggleEnableColorSquaresRgb() {<span asp-validation-for="DisplayOrder"></span></div></div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i>@Loc["Admin.Common.Save"]</button>+ <vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="null" />+ </div>+ </div></div></div><vc:admin-widget widget-zone="specification_attribute_option_details_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom.css b/src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom.cssindex 98908f38a..d8dbfaef9 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom.css+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom.css@@ -5655,10 +5655,10 @@ a span.username {/* magnific popup */.mfp-bg {- z-index: 10000 !important;+ z-index: 10001 !important;}.mfp-wrap {- z-index: 10001 !important;+ z-index: 10003 !important;}.mfp-container {padding: 8px;@@ -6494,6 +6494,10 @@ form>h4 {.btn-group.btn-group-devided>.btn {margin-bottom: 5px;}+ .popup-window .btn-group.btn-group-devided > .btn {+ margin-bottom: 0;+ margin-right: 2px;+ }}@media screen and (max-height: 991px) {@@ -7310,9 +7314,22 @@ table.tableFixHead {.popup-window .form-horizontal .main-header .btn-group {display: inline-flex;}-.popup-window .form-horizontal .main-header .btn-group-sm .btn {+.popup-window .form-horizontal .main-header .btn-group .btn:not(:last-child) {margin: 0 2px 0 0;- padding: 6px 6px;+}+.popup-window .form-horizontal .main-header {+ margin: 0 0 15px 0;+}+.popup-window .form-horizontal .main-header .form-actions {+ display: inline-flex;+ justify-content: space-between;+ width: 100%;+}+.popup-window .form-horizontal .main-header .form-actions .btn-group + .btn {+ margin: 0 0 0 15px;+}+.popup-window .btn-group.btn-group-devided > .btn:last-child {+ margin-right: 0;}.popup-window .form-horizontal .drop-filters-container {display: inline-flex;