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 panel - Use modal popup with magnific popup js library (#122)
Krzysztof Pajak270f5ce11ae8
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtmlindex 37f4b283f..47a664374 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml@@ -45,7 +45,9 @@<span class="control-label" style="text-align:left" id="discountrequirement-product-names@(Model.RequirementId)"></span><div class="group-btn btn-group-devided margin-top-10"><input type="button" id="saveHasAllProductsrequirement@(Model.RequirementId)" class="btn default" value="@Loc["Admin.Common.Save"]" />- <input type="submit" id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" value="@Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.AddNew"]" onclick="javascript:OpenWindow('@(Url.RouteUrl("Plugin.DiscountRules.HasAllProducts.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" href="@(Url.RouteUrl("Plugin.DiscountRules.HasAllProducts.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))" class="btn default">+ @Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.AddNew"]+ </a></div><div id="pnl-save-requirement-result@(Model.RequirementId)" style="display:none;">@Loc["admin.marketing.Discounts.Requirements.Saved"]</div>@@ -54,6 +56,18 @@<input type="submit" id="btnRefreshDiscountRequirementProducts@(Model.RequirementId)" style="display: none" /><script>$(document).ready(function () {+ $('#btnAddNewDiscountRequirementProduct@(Model.RequirementId)').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$('#btnRefreshDiscountRequirementProducts@(Model.RequirementId)').click(function () {//refresh product listloadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtmlindex f20783e88..cbcdab3ce 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml@@ -1,5 +1,5 @@@{- Layout = "~/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml";+ Layout = "";}@model DiscountRules.HasAllProducts.Models.RequirementModel.AddProductModel@using Grand.Domain.Common;@@ -8,8 +8,8 @@//page titleViewBag.Title = Loc["Plugins.DiscountRules.HasAllProducts.Fields.Products.Choose"];}-<form asp-controller="HasAllProducts" asp-action="ProductAddPopup" method="post">-+<form id="ProductAddPopup" asp-controller="HasAllProducts" asp-action="ProductAddPopup" method="post">+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -75,7 +75,35 @@</div><div id="products-grid"></div><script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#products-grid").kendoGrid({dataSource: {type: "json",@@ -128,17 +156,13 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function () {+$('#search-products').click(function () {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1//grid.dataSource.read(); we already loaded the grid above using "page" functionreturn false;});- });$("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {if (event.keyCode == 13) {@@ -162,16 +186,16 @@function selectRequiredProduct(productid) {try {- var currentValue = window.opener.document.getElementById('@(ViewBag.productIdsInput)').value;+ var currentValue = document.getElementById('@(ViewBag.productIdsInput)').value;if (currentValue) {//add comma- window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += ', ';+ document.getElementById('@(ViewBag.productIdsInput)').value += ', ';}- window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += productid;- window.opener.document.getElementById('@(ViewBag.btnId)').click();+ document.getElementById('@(ViewBag.productIdsInput)').value += productid;+ document.getElementById('@(ViewBag.btnId)').click();}catch (e){}- window.close();+ $.magnificPopup.instance.close();}</script></form>\ No newline at end of filediff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtmlindex 9b5f57405..c4952c947 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml@@ -45,7 +45,9 @@<label class="control-label" style="text-align:left" id="discountrequirement-product-names@(Model.RequirementId)"></label><div class="group-btn btn-group-devided margin-top-10"><input type="button" id="saveHasOneProductrequirement@(Model.RequirementId)" class="btn default" value="@Loc["Admin.Common.Save"]" />- <input type="submit" id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" value="@Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.AddNew"]" onclick="javascript:OpenWindow('@(Url.RouteUrl("Plugin.DiscountRules.HasOneProduct.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewDiscountRequirementProduct@(Model.RequirementId)" href="@(Url.RouteUrl("Plugin.DiscountRules.HasOneProduct.ProductAddPopup", new { btnId = "btnRefreshDiscountRequirementProducts" + Model.RequirementId, productIdsInput = Html.IdFor(model => model.Products) }))" class="btn default">+ @Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.AddNew"]+ </a></div><div id="pnl-save-requirement-result@(Model.RequirementId)" style="display:none;">@Loc["admin.marketing.Discounts.Requirements.Saved"]</div>@@ -56,6 +58,18 @@<script>$(document).ready(function () {+ $('#btnAddNewDiscountRequirementProduct@(Model.RequirementId)').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$('#btnRefreshDiscountRequirementProducts@(Model.RequirementId)').click(function () {//refresh product listloadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();@@ -63,9 +77,9 @@//return false to don't reload a pagereturn false;});-+loadDiscountRequirementProductFriendlyNames@(Model.RequirementId)();-+$('#@Html.IdFor(model => model.Products)').data('timeout', null).keyup(function () {diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtmlindex c0c3c9351..0c7224dbd 100644--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml@@ -1,5 +1,5 @@@{- Layout = "~/Areas/Admin/Views/Shared/_AdminPopupLayout.cshtml";+ Layout = "";}@model DiscountRules.HasOneProduct.Models.RequirementModel.AddProductModel@using Grand.Domain.Common;@@ -8,7 +8,7 @@//page titleViewBag.Title = Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.Choose"];}-<form asp-controller="HasOneProduct" asp-action="ProductAddPopup" method="post">+<form id="ProductAddPopup" asp-controller="HasOneProduct" asp-action="ProductAddPopup" method="post"><div class="row"><div class="col-md-12">@@ -75,7 +75,35 @@</div><div id="products-grid"></div><script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#products-grid").kendoGrid({dataSource: {transport: {@@ -127,17 +155,13 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function () {+$('#search-products').click(function () {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1//grid.dataSource.read(); we already loaded the grid above using "page" functionreturn false;});- });$("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {if (event.keyCode == 13) {@@ -161,16 +185,16 @@function selectRequiredProduct(productid) {try {- var currentValue = window.opener.document.getElementById('@(ViewBag.productIdsInput)').value;+ var currentValue = document.getElementById('@(ViewBag.productIdsInput)').value;if (currentValue) {//add comma- window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += ', ';+ document.getElementById('@(ViewBag.productIdsInput)').value += ', ';}- window.opener.document.getElementById('@(ViewBag.productIdsInput)').value += productid;- window.opener.document.getElementById('@(ViewBag.btnId)').click();+ document.getElementById('@(ViewBag.productIdsInput)').value += productid;+ document.getElementById('@(ViewBag.btnId)').click();}catch (e){}- window.close();+ $.magnificPopup.instance.close();}</script></form>\ No newline at end of filediff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtmlindex 57c8f052f..8a30c7db6 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/AddPopup.cshtml@@ -1,9 +1,9 @@@{- Layout = "_AdminPopupLayout";+ Layout = "";}@model ShippingByWeightModel@using Shipping.ByWeight.Models;-<form asp-controller="ShippingByWeight" asp-action="AddPopup" method="post"+<form id="AddPopup" asp-controller="ShippingByWeight" asp-action="AddPopup" method="post"asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -29,4 +29,21 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#AddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ mfp.close();+ $('#btnRefresh').click();+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtmlindex 1c10b623b..cccd8b27f 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/Configure.cshtml@@ -22,13 +22,41 @@<div id="shipping-byweight-grid"></div></div><div class="panel-footer">- <input type="submit" id="btnAddNewOption" value="@Loc["Plugins.Shipping.ByWeight.AddRecord"]" onclick="javascript:OpenWindow('@(addNewUrl)', 800, 550, true); return false;" class="btn default" />+ <a id="btnAddNewOption" href="@(addNewUrl)" class="btn default">+ @Loc["Plugins.Shipping.ByWeight.AddRecord"]+ </a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewOption').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#shipping-byweight-grid").kendoGrid({+ dataBound: function() {+ $('.editpopup').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -109,7 +137,7 @@field: "Id",title: "@Loc["Admin.Common.Edit"]",width: 100,- template: "<input type='submit' value='@Loc["Admin.Common.Edit"]' onclick=\"javascript:OpenWindow('@Url.Action("EditPopup","ShippingByWeight")?id=#=Id#&btnId=btnRefresh&formId=shipping-byweight-form', 800, 400, true); return false;\" class='k-button k-button-icontext' />"+ template: "<a href=\"@Url.Action("EditPopup","ShippingByWeight")?id=#=Id#&btnId=btnRefresh&formId=shipping-byweight-form\" class='k-button editpopup k-button-icontext'>@Loc["Admin.Common.Edit"]</a>"}, {command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },title: "@Loc["Admin.Common.Delete"]",diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtmlindex 95bf7c932..5adcb1c43 100644--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Views/ShippingByWeight/EditPopup.cshtml@@ -3,11 +3,11 @@}@model ShippingByWeightModel@using Shipping.ByWeight.Models;-<form asp-controller="ShippingByWeight" asp-action="EditPopup" method="post"+<form id="EditPopup" asp-controller="ShippingByWeight" asp-action="EditPopup" method="post"asp-route-ShippingByWeightId="@Context.Request.Query["ShippingByWeightId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -28,4 +28,21 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#EditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ mfp.close();+ $('#btnRefresh').click();+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.csindex 614b99dd7..1937998f3 100644--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs@@ -109,6 +109,7 @@ namespace Shipping.ShippingPoint.Controllersawait _shippingPointService.InsertStoreShippingPoint(shippingPoint);ViewBag.RefreshPage = true;+ return Content("");}await PrepareShippingPointModel(model);@@ -132,6 +133,8 @@ namespace Shipping.ShippingPoint.Controllersvar shippingPoint = await _shippingPointService.GetStoreShippingPointById(model.Id);shippingPoint = model.ToEntity();await _shippingPointService.UpdateStoreShippingPoint(shippingPoint);++ return Content("");}ViewBag.RefreshPage = true;diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtmlindex 24bf801e8..a23639831 100644--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Configure.cshtml@@ -9,8 +9,34 @@<div class="panel-body"><div id="shipping-points-grid"></div><script>- $(document).ready(function() {+ $(document).ready(function () {+ $('#btnAddNewOption').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#shipping-points-grid").kendoGrid({+ dataBound: function () {+ $('.editpopup').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {type: "json",transport: {@@ -79,7 +105,7 @@field: "Id",title: "@Loc["Admin.Common.Edit"]",width: 100,- template: "<input type='submit' value='@Loc["Admin.Common.Edit"]' onclick=\"javascript:OpenWindow('@Url.Action("Edit", "ShippingPoint")?id=#=Id#&btnId=btnRefresh&formId=shipping-instore-form', 800, 800, true); return false;\" class='k-button k-button-icontext' />"+ template: "<a href=\"@Url.Action("Edit", "ShippingPoint")?id=#=Id#&btnId=btnRefresh&formId=shipping-instore-form\" class='k-button editpopup k-button-icontext'>@Loc["Admin.Common.Edit"]</a>"}, {command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },title: "@Loc["Admin.Common.Delete"]",@@ -90,7 +116,9 @@</script></div><div class="panel-footer">- <input type="submit" id="btnAddNewOption" class="btn btn-primary" value="@Loc["Admin.Common.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("Create", "ShippingPoint") + "?btnId=btnRefresh&formId=shipping-instore-form")', 800, 800, true); return false;" />+ <a id="btnAddNewOption" class="btn btn-primary" href="@(Url.Action("Create", "ShippingPoint") + "?btnId=btnRefresh&formId=shipping-instore-form")">+ @Loc["Admin.Common.AddNew"]+ </a><input type="submit" id="btnRefresh" class="btn btn-default" style="display: none" /></div>diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtmlindex c06f454a1..715e348e4 100644--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Create.cshtml@@ -1,13 +1,13 @@@{- Layout = "_AdminPopupLayout";+ Layout = "";}@model Shipping.ShippingPoint.Models.ShippingPointModel-<form asp-controller="ShippingPoint" asp-action="Create" method="post"+<form id="CreatePopup" asp-controller="ShippingPoint" asp-action="Create" method="post"asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -29,4 +29,35 @@<partial name="_CreateOrUpdate" model="Model" /></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#CreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtmlindex f8ed522c6..ddb335bf6 100644--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Views/ShippingPoint/Edit.cshtml@@ -1,13 +1,13 @@@{- Layout = "_AdminPopupLayout";+ Layout = "";}@model Shipping.ShippingPoint.Models.ShippingPointModel-<form asp-controller="ShippingPoint" asp-action="Edit" method="post"- asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"- asp-route-btnId="@Context.Request.Query["btnId"]"- asp-route-formId="@Context.Request.Query["formId"]">-+<form id="EditPopup" asp-controller="ShippingPoint" asp-action="Edit" method="post"+ asp-route-ShippingPointId="@Context.Request.Query["ShippingPointId"]"+ asp-route-btnId="@Context.Request.Query["btnId"]"+ asp-route-formId="@Context.Request.Query["formId"]">+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -29,4 +29,35 @@<partial name="_CreateOrUpdate" model="Model" /></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#EditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ 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 305b3eb12..8f41d1273 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@@ -1,13 +1,13 @@@model AddressAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"asp-route-addressAttributeId="@Context.Request.Query["addressAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -27,4 +27,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 08fd6e701..7a1e237d7 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@@ -1,13 +1,13 @@@model AddressAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueEditPopup"- asp-route-btnId="@Context.Request.Query["btnId"]"- asp-route-formId="@Context.Request.Query["formId"]">-+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueEditPopup"+ asp-route-btnId="@Context.Request.Query["btnId"]"+ asp-route-formId="@Context.Request.Query["formId"]">+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -27,4 +27,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtmlindex e6a2337d5..e889374dc 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/_CreateOrUpdate.TabValues.cshtml@@ -9,13 +9,39 @@<vc:admin-widget widget-zone="address_attribute_details_values_bottom" additional-data="Model" /></div><div class="panel-footer">- <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, btnId = "btnRefresh", formId = "addressattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Address.AddressAttributes.Values.AddNew"]</button>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, btnId = "btnRefresh", formId = "addressattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Address.AddressAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#addressattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -62,7 +88,7 @@columns: [{field: "Name",title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#?addressAttributeId=@(Model.Id)&btnId=btnRefresh&formId=addressattribute-form', 800, 350, true); return false;\">#=Name#</a>",+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#?addressAttributeId=@(Model.Id)&btnId=btnRefresh&formId=addressattribute-form\">#=Name#</a>",}, {field: "IsPreSelected",title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.IsPreSelected"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtmlindex 21cdb503e..901f9248c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/BlogPostAddPopup.cshtml@@ -2,15 +2,15 @@@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Content.Blog.BlogCategory.AddNewPost"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="BlogPostAddPopup" method="post"+<form id="BlogPostAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="BlogPostAddPopup" method="post"asp-route-CategoryId="@Context.Request.Query["CategoryId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -52,19 +52,36 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-</form>--<script>- $(document).ready(function () {+ <script>+ var mfp = $.magnificPopup.instance;+ $("#BlogPostAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshPosts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#blogposts-grid").kendoGrid({dataSource: {@@ -112,10 +129,7 @@title: "@Loc["Admin.Content.Blog.BlogCategory.Fields.Post"]"}]});- });-</script>-<script>- $(document).ready(function() {+$('#search-posts').click(function() {var grid = $('#blogposts-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -140,7 +154,6 @@$('#blogposts-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {@@ -157,5 +170,5 @@$('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);}-</script>-+ </script>+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtmlindex 0ecddfc07..9bfb529da 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Edit.cshtml@@ -17,7 +17,7 @@</div><div class="actions"><div class="btn-group btn-group-devided">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("BlogPost", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("BlogPost", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --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 2791624ed..19d6fa537 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@@ -1,12 +1,12 @@@model BlogProductModel.AddProductModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Blog" asp-action="ProductAddPopup" method="post"asp-route-BlogPostId="@Context.Request.Query["BlogPostId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -94,19 +94,36 @@</div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }--<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -168,10 +185,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {+$('#search-products').click(function() {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -196,7 +210,6 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtmlindex 45117edfc..a64349bad 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabInfo.cshtml@@ -102,8 +102,25 @@@if (!string.IsNullOrEmpty(Model.PictureId)){<label class="control-label">- <a class='k-link' href='javascript:OpenWindow("@Url.Action("PicturePopup", "Blog", new { area = Constants.AreaAdmin })/?blogpostId=@(Model.Id)", 800, 600, true);'>@Loc["Admin.Common.Picture.Attributes"]</a>+ <a class='k-link picturelink' href='@Url.Action("PicturePopup", "Blog", new { area = Constants.AreaAdmin })/?blogpostId=@(Model.Id)'>@Loc["Admin.Common.Picture.Attributes"]</a></label>+ <script>+ $(document).ready(function () {+ $('.picturelink').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks:+ {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });+ </script>}</div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtmlindex 2f642d7f4..cfc90ce0c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdate.TabProducts.cshtml@@ -8,13 +8,25 @@<div id="product-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Blog", new { blogPostId = Model.Id, btnId = "btnRefreshProducts", formId = "blog-edit", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Blog", new { blogPostId = Model.Id, btnId = "btnRefreshProducts", formId = "blog-edit", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Blog.BlogPosts.Products.AddNew"]</a><input type="button" id="btnRefreshProducts" style="display: none" /></div><vc:admin-widget widget-zone="blog_details_product_bottom" additional-data="Model" /></div><script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#product-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtmlindex 14bbf314d..f6b70368f 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/_CreateOrUpdateCategory.Posts.cshtml@@ -8,12 +8,24 @@<div id="posts-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewPost" onclick="javascript:OpenWindow('@(Url.Action("BlogPostAddPopup", "Blog", new { categoryId = Model.Id, btnId = "btnRefreshPosts", formId = "category-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Blog.BlogCategory.AddNewPost"]</button>+ <a id="btnAddNewPost" href="@(Url.Action("BlogPostAddPopup", "Blog", new { categoryId = Model.Id, btnId = "btnRefreshPosts", formId = "category-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Blog.BlogCategory.AddNewPost"]</a><input type="submit" id="btnRefreshPosts" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewPost').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#posts-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtmlindex ca760e7f9..9c59e8ead 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Brand", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("Brand", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtmlindex 05f9e920c..c5300163e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Category", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("Category", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>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 3826077b0..18cbde1d8 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@@ -6,11 +6,11 @@//page titleViewBag.Title = Loc["Admin.Catalog.Categories.Products.AddNew"];}-<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="ProductAddPopup" method="post"asp-route-CategoryId="@Context.Request.Query["CategoryId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit popup-window">@@ -93,18 +93,7 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-</form>--<script>+ <script>var mfp = $.magnificPopup.instance;$("#ProductAddPopup").submit(function (e) {e.preventDefault();@@ -134,7 +123,7 @@}});});-+$('.extend-collapse').hide();$('.filter-extend-button').click(function () {$('.extend-collapse').toggle("slow");@@ -240,5 +229,6 @@$('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);}-</script>+ </script>+</form>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 77322dbc5..bd55fba6e 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@@ -1,5 +1,5 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}@model CheckoutAttributeValueModel@@ -8,7 +8,7 @@//page titleViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -32,4 +32,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 a8d0bbf25..708bdcfd1 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@@ -1,14 +1,14 @@@model CheckoutAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.Values.EditValueDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"asp-route-checkoutAttributeId="@Context.Request.Query["checkoutAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -23,9 +23,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateValue" model="Model" />+ <partial name="_CreateOrUpdateValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtmlindex 4dc583e7a..fce8c9fb4 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/_CreateOrUpdate.TabValues.cshtml@@ -9,14 +9,40 @@<div id="checkoutattributevalues-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, btnId = "btnRefresh", formId = "checkoutattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</button>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, btnId = "btnRefresh", formId = "checkoutattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#checkoutattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -63,7 +89,7 @@columns: [{field: "Name",title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=checkoutattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=checkoutattribute-form\">#=kendo.htmlEncode(Name)#</a>"}, {field: "PriceAdjustment",title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.PriceAdjustment"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtmlindex 2f1e8bd75..699946bac 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Collection", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("Collection", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --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 041a6179c..1f076eb35 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@@ -9,8 +9,7 @@<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Collection" asp-action="ProductAddPopup" method="post"asp-route-CollectionId="@Context.Request.Query["CollectionId"]"asp-route-btnId="@Context.Request.Query["btnId"]"- asp-route-formId="@Context.Request.Query["formId"]">-+ asp-route-formId="@Context.Request.Query["formId"]"><div class="row"><div class="col-md-12">@@ -95,16 +94,6 @@</div></div>--- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#ProductAddPopup").submit(function (e) {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 33cf91699..6ea07ed02 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@@ -1,5 +1,5 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}@model ContactAttributeValueModel@@ -8,7 +8,7 @@//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -32,4 +32,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 96df6439a..1e2761f34 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@@ -1,14 +1,14 @@@model ContactAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.Values.EditValueDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"asp-route-contactAttributeId="@Context.Request.Query["contactAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -23,9 +23,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateValue" model="Model" />+ <partial name="_CreateOrUpdateValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtmlindex b232e40e6..9ab88033a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/_CreateOrUpdate.TabValues.cshtml@@ -9,14 +9,40 @@<div id="contactattributevalues-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, btnId = "btnRefresh", formId = "contactattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</button>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, btnId = "btnRefresh", formId = "contactattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#contactattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -63,7 +89,7 @@columns: [{field: "Name",title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=contactattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=contactattribute-form\">#=kendo.htmlEncode(Name)#</a>"}, {field: "IsPreSelected",title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",diff --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 2d92db2a4..a1f11d8b1 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@@ -1,11 +1,11 @@@model StateProvinceModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Configuration.Countries.States.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateCreatePopup"+<form id="StateCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateCreatePopup"asp-route-countryId="@Context.Request.Query["countryId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -29,4 +29,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#StateCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 85bfb87df..9e6b58289 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@@ -1,9 +1,9 @@@model StateProvinceModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";ViewBag.Title = Loc["Admin.Configuration.Countries.States.EditStateDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateEditPopup"+<form id="StateEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="Country" asp-action="StateEditPopup"asp-route-countryId="@Context.Request.Query["countryId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -27,4 +27,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#StateEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtmlindex 3e7dd8e2b..401d236ed 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Country/_CreateOrUpdate.TabStates.cshtml@@ -8,14 +8,40 @@<div id="states-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewState" onclick="javascript:OpenWindow('@(Url.Action("StateCreatePopup", "Country", new { countryId = Model.Id, btnId = "btnRefresh", formId = "country-form", area = Constants.AreaAdmin }))', 800, 500, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Configuration.Countries.States.AddNew"]</button>+ <a id="btnAddNewState" href="@(Url.Action("StateCreatePopup", "Country", new { countryId = Model.Id, btnId = "btnRefresh", formId = "country-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Configuration.Countries.States.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewState').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#states-grid").kendoGrid({+ dataBound: function () {+ $('.editstate').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -63,7 +89,7 @@field: "Name",title: "@Loc["Admin.Configuration.Countries.States.Fields.Name"]",width: 300,- template: "<a class=\"k-link\" onclick=\"javascript:OpenWindow('@Url.Action("StateEditPopup", "Country", new { area = Constants.AreaAdmin })/#=Id#?countryId=@(Model.Id)&btnId=btnRefresh&formId=country-form', 800, 500, true); return false;\">#=Name#</a>",+ template: "<a class=\"k-link editstate\" href=\"@Url.Action("StateEditPopup", "Country", new { area = Constants.AreaAdmin })/#=Id#?countryId=@(Model.Id)&btnId=btnRefresh&formId=country-form\">#=Name#</a>",}, {field: "Abbreviation",title: "@Loc["Admin.Configuration.Countries.States.Fields.Abbreviation"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtmlindex 8f739089e..32717bf36 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/AssociateProductToCoursePopup.cshtml@@ -1,7 +1,7 @@@model CourseModel.AssociateProductToCourseModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Choose"];}@@ -14,7 +14,6 @@id="associateproduct">-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -92,12 +91,12 @@{<script>try {- window.opener.document.getElementById('@(Context.Request.Query["productIdInput"])').value = '@(ViewBag.productId)';- window.opener.document.getElementById('@(Context.Request.Query["productNameInput"])').innerHTML = '@(ViewBag.productName)';- window.opener.document.getElementById('@(Context.Request.Query["btnId"])').click();+ document.getElementById('@(Context.Request.Query["productIdInput"])').value = '@(ViewBag.productId)';+ document.getElementById('@(Context.Request.Query["productNameInput"])').innerHTML = '@(ViewBag.productName)';+ document.getElementById('@(Context.Request.Query["btnId"])').click();}catch (e){}- window.close();+ $.magnificPopup.instance.close();</script>}@@ -106,7 +105,30 @@<div id="products-grid"></div><script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#associateproduct").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -165,19 +187,14 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>-- <script>- $(document).ready(function () {$('#search-products').click(function () {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1//grid.dataSource.read(); we already loaded the grid above using "page" functionreturn false;});- });+$("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {if (event.keyCode == 13) {@@ -199,7 +216,7 @@addAntiForgeryToken(data);return data;}-+function selectAssociatedProduct(productid) {$("#@Html.IdFor(model => model.AssociatedToProductId)").val(productid);$('#associateproduct').submit();diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtmlindex 551c2d0e6..32eac58d7 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Course/_CreateOrUpdate.TabInfo.cshtml@@ -124,19 +124,30 @@<div class="form-group"><div class="col-md-3 col-sm-3"></div><div class="col-md-9 col-sm-9">- <button type="button"- onclick="javascript:OpenWindow('@(Url.Action("AssociateProductToCoursePopup", "Course",+ <a id="btnAssociateProductToCoursePopup" href="@(Url.Action("AssociateProductToCoursePopup", "Course",new { productIdInput = Html.IdFor(model => model.ProductId),productNameInput = "purchased-with-product-name",- btnId = "btnRefreshPurchasedWithProduct", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button">+ btnId = "btnRefreshPurchasedWithProduct", area = Constants.AreaAdmin }))" class="k-button">@Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Choose"]- </button>+ </a><button type="button" id="purchased-with-product-name-remove" class="k-button">@Loc["Admin.Courses.Course.Fields.PurchasedWithProduct.Remove"]</button><input type="button" id="btnRefreshPurchasedWithProduct" style="display: none" /><script>$(document).ready(function () {+ $('#btnAssociateProductToCoursePopup').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$('#purchased-with-product-name-remove').click(function () {$('#purchased-with-product-name').text('');$("#@Html.IdFor(model => model.ProductId)").val('');diff --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 04628f7c3..fc31d98a0 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@@ -1,12 +1,12 @@@model CustomerModel.AddProductModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.Products.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Customer" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Customer" asp-action="ProductAddPopup" method="post"asp-route-CustomerId="@Context.Request.Query["CustomerId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]"@@ -95,19 +95,37 @@</div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }--<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshPersonalizedProducts').click();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -168,11 +186,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>-- <script>- $(document).ready(function() {+$('#search-products').click(function() {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -197,7 +211,7 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });+function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtmlindex dad5e725c..6a52eccae 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProduct.cshtml@@ -8,13 +8,25 @@<div id="personalizedproduct-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewPersonalizedProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshPersonalizedProducts", formId = "customer-form", personalized = "true", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.Customers.PersonalizedProduct.AddNew"]</button>+ <a id="btnAddNewPersonalizedProduct" href="@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshPersonalizedProducts", formId = "customer-form", personalized = "true", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.Customers.PersonalizedProduct.AddNew"]</a><input type="submit" id="btnRefreshPersonalizedProducts" style="display: none" /></div><vc:admin-widget widget-zone="customer_details_product_bottom" additional-data="Model" /></div><script>- $(document).ready(function () {+ $(document).ready(function () {+ $('#btnAddNewPersonalizedProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#personalizedproduct-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtmlindex 984104c13..19805096c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabProductPrice.cshtml@@ -8,7 +8,7 @@<div id="productprice-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.Customers.ProductPrice.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Customer", new { customerId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.Customers.ProductPrice.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div><vc:admin-widget widget-zone="customer_details_product_price_bottom" additional-data="Model" />@@ -19,6 +19,18 @@<script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#productprice-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtmlindex 215641af2..8ca4f32cf 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CategoryAddPopup.cshtml@@ -1,11 +1,11 @@@model CustomerActionConditionModel.AddCategoryConditionModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CategoryAddPopup" method="post"+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CategoryAddPopup" method="post"asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -52,19 +52,36 @@</div></div></div>--- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CategoryAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCategories').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#categories-grid").kendoGrid({dataSource: {transport: {@@ -118,11 +135,6 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>-- <script>- $(document).ready(function() {$('#search-categories').click(function() {var grid = $('#categories-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -147,7 +159,7 @@$('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });+function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtmlindex 8d0c81581..b5432c162 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/CollectionAddPopup.cshtml@@ -1,11 +1,11 @@@model CustomerActionConditionModel.AddCollectionConditionModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CollectionAddPopup" method="post"+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="CollectionAddPopup" method="post"asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -47,22 +47,43 @@</div><div id="collections-grid"></div></div>+ </div></div></div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CollectionAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCollections').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+$("#collections-grid").kendoGrid({dataSource: {transport: {@@ -116,11 +137,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {$('#search-collections').click(function() {var grid = $('#collections-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -145,7 +162,6 @@$('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {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 4944328ca..a050db667 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@@ -1,20 +1,19 @@@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"];}@model CustomerActionConditionModel.AddProductToConditionModel-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAction" asp-action="ProductAddPopup" method="post"asp-route-CustomerActionId="@Context.Request.Query["CustomerActionId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]"><input asp-for="CustomerActionId" type="hidden" /><input asp-for="CustomerActionConditionId" type="hidden" />--+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit popup-window">@@ -98,16 +97,36 @@</div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-text-open').hide();@@ -170,11 +189,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {$('#search-products').click(function() {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1);@@ -197,7 +212,6 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtmlindex d0a9f10a7..8256c771e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCategory.cshtml@@ -12,13 +12,25 @@<div id="categories-grid"></div></div><div class="panel-footer">- <input type="submit" id="btnAddNewCategory" value="@Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerActionCondition.Category.AddNew"]</a><input type="submit" id="btnRefreshCategories" style="display: none" /></div></div><script>- $(document).ready(function () {+ $(document).ready(function () {+ $('#btnAddNewCategory').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#categories-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtmlindex fda1bbd76..27cc6f699 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionCollection.cshtml@@ -13,12 +13,24 @@<div id="collections-grid"></div></div><div class="panel-footer">- <input type="submit" id="btnAddNewCollection" value="@Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerActionCondition.Collections.AddNew"]</a><input type="submit" id="btnRefreshCollections" style="display: none" /></div></div><script>- $(document).ready(function () {+ $(document).ready(function () {+ $('#btnAddNewCollection').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#collections-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtmlindex afc3e25eb..79e3ef652 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAction/_ConditionProduct.cshtml@@ -15,12 +15,24 @@<div id="products-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-action-condition-form", area = Constants.AreaAdmin })) ', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"]</button>+ <a type="submit" id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerAction", new { customerActionId = Model.CustomerActionId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-action-condition-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerActionCondition.Products.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#products-grid").kendoGrid({dataSource: {transport: {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 da4eebbfa..08e036de5 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@@ -1,15 +1,15 @@@model CustomerAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" manifest="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -24,9 +24,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateValue" model="Model" />+ <partial name="_CreateOrUpdateValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 50ae81858..22dcfc1bd 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@@ -1,5 +1,5 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}@model CustomerAttributeValueModel@@ -8,11 +8,11 @@//page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"asp-route-customerAttributeId="@Context.Request.Query["customerAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -27,9 +27,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateValue" model="Model" />+ <partial name="_CreateOrUpdateValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtmlindex e6790ba08..671513c23 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/_CreateOrUpdate.TabValues.cshtml@@ -9,15 +9,41 @@<div id="customerattributevalues-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewValue" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</button>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none" /></div></div><script>- $(document).ready(function () {+ $(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#customerattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -64,7 +90,7 @@columns: [{field: "Name",title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#?customerAttributeId=@(Model.Id)&btnId=btnRefresh&formId=customerattribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>",+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#?customerAttributeId=@(Model.Id)&btnId=btnRefresh&formId=customerattribute-form\">#=kendo.htmlEncode(Name)#</a>",}, {field: "IsPreSelected",title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.IsPreSelected"]",diff --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 cdb3d4678..be16c74d5 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@@ -1,11 +1,11 @@@model CustomerGroupProductModel.AddProductModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerGroups.Products.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerGroup" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerGroup" asp-action="ProductAddPopup" method="post"asp-route-CustomerGroupId="@Context.Request.Query["CustomerGroupId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -92,16 +92,36 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -163,12 +183,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>-- <script>- $(document).ready(function () {$('#search-products').click(function () {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -193,7 +208,6 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtmlindex cb5f4a572..10b21f02b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabAcl.cshtml@@ -17,6 +17,20 @@<script>$(document).ready(function () {$("#acl-grid").kendoGrid({+ dataBound: function () {+ $('.permissionlink').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -86,7 +100,7 @@width: 10,headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },- template: '# if(Actions.length > 0) {# <a class="k-link" onclick="javascript:OpenWindow(\'@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=#=SystemName#&[email protected]\', 600, 400, true); return false;"><i class="icon-settings"></i></a> #} #'+ template: '# if(Actions.length > 0) {# <a class="k-link permissionlink" href="\@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=#=SystemName#&[email protected]\"><i class="icon-settings"></i></a> #} #'},{diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtmlindex 9d55d169f..a6fc31506 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.TabProducts.cshtml@@ -17,13 +17,25 @@<div id="products-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerGroup", new { customerGroupId = Model.Id, btnId = "btnRefreshProducts", formId = "customergroup-form", area = Constants.AreaAdmin })) ', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerGroups.Products.Fields.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerGroup", new { customerGroupId = Model.Id, btnId = "btnRefreshProducts", formId = "customergroup-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerGroups.Products.Fields.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#products-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtmlindex 3451abb3c..de607155e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CategoryAddPopup.cshtml@@ -1,12 +1,12 @@@model CustomerReminderModel.ConditionModel.AddCategoryConditionModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CategoryAddPopup" method="post"+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CategoryAddPopup" method="post"asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -14,8 +14,6 @@<input asp-for="CustomerReminderId" type="hidden" /><input asp-for="ConditionId" type="hidden" />--<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -55,17 +53,36 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CategoryAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCategories').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#categories-grid").kendoGrid({dataSource: {transport: {@@ -119,11 +136,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {$('#search-categories').click(function() {var grid = $('#categories-grid').data('kendoGrid');grid.dataSource.page(1);@@ -146,7 +159,6 @@$('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtmlindex 49580d8b6..96e273743 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/CollectionAddPopup.cshtml@@ -2,19 +2,18 @@@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CollectionAddPopup" method="post"+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="CollectionAddPopup" method="post"asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">- <input asp-for="CustomerReminderId" type="hidden" />+ <input asp-for="CustomerReminderId" type="hidden" /><input asp-for="ConditionId" type="hidden" />-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -55,18 +54,37 @@</div></div>--- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CollectionAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCollections').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+$("#collections-grid").kendoGrid({dataSource: {transport: {@@ -120,11 +138,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {$('#search-collections').click(function() {var grid = $('#collections-grid').data('kendoGrid');grid.dataSource.page(1);@@ -147,7 +161,7 @@$('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });+function additionalData() {var data = {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 76c839166..d6e849515 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@@ -1,12 +1,12 @@@model CustomerReminderModel.ConditionModel.AddProductToConditionModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerReminder" asp-action="ProductAddPopup" method="post"asp-route-CustomerReminderId="@Context.Request.Query["CustomerReminderId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -14,17 +14,6 @@<input asp-for="CustomerReminderId" type="hidden" /><input asp-for="ConditionId" type="hidden" />--- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit popup-window">@@ -109,7 +98,35 @@</div><script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -170,11 +187,8 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {+$('#search-products').click(function() {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1);@@ -197,7 +211,7 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });+function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtmlindex cc6e87d30..22902ebfa 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCategory.cshtml@@ -12,13 +12,25 @@<div id="categories-grid"></div></div><div class="panel-footer">- <input type="submit" id="btnAddNewCategory" value="@Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCategories", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerReminder.Condition.Category.AddNew"]</a><input type="submit" id="btnRefreshCategories" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewCategory').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#categories-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtmlindex 7287d97cf..c4fac31d3 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionCollection.cshtml@@ -13,13 +13,25 @@<div id="collections-grid"></div></div><div class="panel-footer">- <input type="submit" id="btnAddNewCollection" value="@Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"]" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="btn default" />+ <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshCollections", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="btn default">@Loc["Admin.Customers.CustomerReminder.Condition.Collections.AddNew"]</a><input type="submit" id="btnRefreshCollections" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewCollection').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#collections-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtmlindex 40651293f..160fe5dab 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerReminder/_ConditionProduct.cshtml@@ -12,13 +12,25 @@<div id="products-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin })) ', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerReminder", new { customerReminderId = Model.CustomerReminderId, conditionId = Model.Id, btnId = "btnRefreshProducts", formId = "customer-reminder-condition-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerReminder.Condition.Products.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#products-grid").kendoGrid({dataSource: {transport: {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 824474999..0fa20103a 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@@ -1,12 +1,12 @@@model CustomerTagProductModel.AddProductModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerTags.Products.AddNew"];}@inject AdminAreaSettings adminAreaSettings-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerTag" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerTag" asp-action="ProductAddPopup" method="post"asp-route-CustomerTagId="@Context.Request.Query["CustomerTagId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -94,19 +94,36 @@</div></div></div>---- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -168,12 +185,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>-- <script>- $(document).ready(function () {$('#search-products').click(function () {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -198,7 +210,6 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtmlindex b9dd31802..0a7ec6c38 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerTag/_CreateOrUpdate.TabProducts.cshtml@@ -17,12 +17,24 @@<div id="products-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "CustomerTag", new { customerTagId = Model.Id, btnId = "btnRefreshProducts", formId = "customertag-form", area = Constants.AreaAdmin })) ', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerTags.Products.Fields.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "CustomerTag", new { customerTagId = Model.Id, btnId = "btnRefreshProducts", formId = "customertag-form", area = Constants.AreaAdmin })) " class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerTags.Products.Fields.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#products-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtmlindex 4ebb00eb4..61ef7423e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml@@ -6,7 +6,7 @@ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"+<form id="BrandAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"asp-route-DiscountId="@Context.Request.Query["DiscountId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -48,17 +48,36 @@</div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#BrandAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshBrands').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#brands-grid").kendoGrid({dataSource: {transport: {@@ -106,11 +125,7 @@}]});- });- </script>- <script>- $(document).ready(function() {$('#search-brands').click(function() {var grid = $('#brands-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -135,7 +150,6 @@$('#brands-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtmlindex 495e903b8..76d3cba1d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml@@ -1,26 +1,15 @@@model DiscountModel.AddCategoryToDiscountModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"+<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"asp-route-DiscountId="@Context.Request.Query["DiscountId"]"asp-route-btnId="@Context.Request.Query["btnId"]"- asp-route-formId="@Context.Request.Query["formId"]">---- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }+ asp-route-formId="@Context.Request.Query["formId"]"><div class="row"><div class="col-md-12">@@ -62,9 +51,36 @@</div></div>-<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CategoryAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCategories').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#categories-grid").kendoGrid({dataSource: {transport: {@@ -118,10 +134,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {+$('#search-categories').click(function() {var grid = $('#categories-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -146,7 +159,6 @@$('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtmlindex 35986639c..36632e226 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml@@ -2,13 +2,13 @@@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"+<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"asp-route-DiscountId="@Context.Request.Query["DiscountId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -53,17 +53,36 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#CollectionAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshCollections').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#collections-grid").kendoGrid({dataSource: {transport: {@@ -117,10 +136,6 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {$('#search-collections').click(function() {var grid = $('#collections-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -143,7 +158,6 @@$('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {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 e0e1100ca..4a2f6635c 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@@ -1,26 +1,17 @@@model DiscountModel.AddProductToDiscountModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="ProductAddPopup" method="post"+<form id="ProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="ProductAddPopup" method="post"asp-route-DiscountId="@Context.Request.Query["DiscountId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<div class="row"><div class="col-md-12"><div class="x_panel light form-fit popup-window">@@ -106,7 +97,35 @@<div id="products-grid"></div><script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ProductAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshProducts').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$('.extend-collapse').hide();$('.filter-extend-button').click(function () {@@ -167,10 +186,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function() {+$('#search-products').click(function() {var grid = $('#products-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -195,7 +211,7 @@$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });+function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtmlindex 2d5e2d2a1..286377dff 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/VendorAddPopup.cshtml@@ -1,12 +1,12 @@@model DiscountModel.AddVendorToDiscountModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="VendorAddPopup" method="post"+<form id="VendorAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="VendorAddPopup" method="post"asp-route-DiscountId="@Context.Request.Query["DiscountId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -53,18 +53,36 @@</div></div></div>--- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#VendorAddPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshVendors').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });$("#vendors-grid").kendoGrid({dataSource: {transport: {@@ -116,11 +134,6 @@}]});- });- </script>-- <script>- $(document).ready(function() {$('#search-vendors').click(function() {var grid = $('#vendors-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -152,7 +165,6 @@$('#vendors-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtmlindex 63940abb6..1aaaa9ee8 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToBrands.cshtml@@ -8,7 +8,7 @@<div id="brands-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewBrand" onclick="javascript:OpenWindow('@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</button>+ <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a><input type="button" id="btnRefreshBrands" style="display: none" /></div><vc:admin-widget widget-zone="discount_details_applied_to_brands_bottom" additional-data="Model" />@@ -16,6 +16,18 @@<script>$(document).ready(function () {+ $('#btnAddNewBrand').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#brands-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtmlindex 363f19980..3d13947f0 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCategories.cshtml@@ -9,13 +9,25 @@<div id="categories-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewCategory" onclick="javascript:OpenWindow('@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</button>+ <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a><input type="submit" id="btnRefreshCategories" style="display: none" /></div><vc:admin-widget widget-zone="discount_details_applied_to_categories_bottom" additional-data="Model" /></div><script>$(document).ready(function () {+ $('#btnAddNewCategory').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#categories-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtmlindex 51db10fdf..511df4956 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToCollections.cshtml@@ -9,13 +9,25 @@<div id="collections-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewCollection" onclick="javascript:OpenWindow('@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</button>+ <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a><input type="submit" id="btnRefreshCollections" style="display: none" /></div><vc:admin-widget widget-zone="discount_details_applied_to_collections_bottom" additional-data="Model" /></div><script>$(document).ready(function () {+ $('#btnAddNewCollection').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#collections-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtmlindex 309f8ea48..02d1d7bb5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToProducts.cshtml@@ -11,7 +11,7 @@<div id="products-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewProduct" onclick="javascript:OpenWindow('@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaAdmin }))', 1000, 1000, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</button>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none" /></div><vc:admin-widget widget-zone="discount_details_applied_to_products_bottom" additional-data="Model" />@@ -19,6 +19,18 @@<script>$(document).ready(function () {+ $('#btnAddNewProduct').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#products-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtmlindex 109c7ecfa..bb8923d0c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/_CreateOrUpdate.TabAppliedToVendors.cshtml@@ -8,14 +8,26 @@<div id="vendors-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewVendor" onclick="javascript:OpenWindow('@(Url.Action("VendorAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshVendors", formId = "discount-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"]</button>+ <a id="btnAddNewVendor" href="@(Url.Action("VendorAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshVendors", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToVendors.AddNew"]</a><input type="button" id="btnRefreshVendors" style="display: none" /></div><vc:admin-widget widget-zone="discount_details_applied_to_vendors_bottom" additional-data="Model" /></div><script>- $(document).ready(function () {+ $(document).ready(function () {+ $('#btnAddNewVendor').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#vendors-grid").kendoGrid({dataSource: {transport: {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 c029e1a2a..ab096e062 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@@ -1,16 +1,15 @@@model InteractiveFormAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueCreatePopup"asp-route-form="@Context.Request.Query["form"]"asp-route-aId="@Context.Request.Query["aId"]"asp-route-btnId="@Context.Request.Query["btnId"]"- asp-route-formId="@Context.Request.Query["formId"]"- >-+ asp-route-formId="@Context.Request.Query["formId"]">+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -24,9 +23,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateAttributeValue" model="Model" />+ <partial name="_CreateOrUpdateAttributeValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshValues').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 347eec310..fa7a9ee51 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@@ -1,32 +1,63 @@@model InteractiveFormAttributeValueModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="InteractiveForm" asp-action="ValueEditPopup"asp-route-form="@Context.Request.Query["form"]"asp-route-aId="@Context.Request.Query["aId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">--- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <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 class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["admin.marketing.InteractiveForms.Attribute.Values.EditValue"]</div>- <div class="x_content form">- <partial name="_CreateOrUpdateAttributeValue" model="Model" />+ <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" />+ </div></div></div>+ </div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshValues').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtmlindex 4edfbcf21..44cb7d56c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/InteractiveForm/_CreateOrUpdateAttribute.TabValues.cshtml@@ -8,14 +8,40 @@<div id="attributeValues-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewValues" onclick="javascript:OpenWindow('@(Url.Action("ValueCreatePopup", "InteractiveForm", new { form = Model.FormId, aId = Model.Id, formId = "attribute-form", btnId = "btnRefreshValues", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"]</button>+ <a id="btnAddNewValues" href="@(Url.Action("ValueCreatePopup", "InteractiveForm", new { form = Model.FormId, aId = Model.Id, formId = "attribute-form", btnId = "btnRefreshValues", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.InteractiveForms.Attribute.Values.AddNew"]</a><input type="submit" id="btnRefreshValues" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewValues').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#attributeValues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -62,7 +88,7 @@columns: [{field: "Name",title: "@Loc["admin.marketing.InteractiveForms.Attribute.Values.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("ValueEditPopup", "InteractiveForm", new { area = Constants.AreaAdmin })/#=Id#[email protected]&[email protected]&btnId=btnRefreshValues&formId=attribute-form', 800, 350, true); return false;\">#=kendo.htmlEncode(Name)#</a>",+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "InteractiveForm", new { area = Constants.AreaAdmin })/#=Id#[email protected]&[email protected]&btnId=btnRefreshValues&formId=attribute-form\">#=kendo.htmlEncode(Name)#</a>",},{field: "IsPreSelected",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtmlindex 9b8b8a330..7bdb69ef2 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/ArticlesPopup.cshtml@@ -2,9 +2,9 @@@inject AdminAreaSettings adminAreaSettings@{ViewBag.Title = Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"];- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}-<form asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"+<form id="ArticlesPopup" asp-area="@Constants.AreaAdmin" asp-controller="Knowledgebase" asp-action="ArticlesPopup" method="post"asp-route-KnowledgebaseId="@Context.Request.Query["KnowledgebaseId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -49,18 +49,37 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-<script>- $(document).ready(function () {+ var mfp = $.magnificPopup.instance;+ $("#ArticlesPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefreshRelatedArticles').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+$("#articles-grid").kendoGrid({dataSource: {transport: {@@ -114,11 +133,7 @@template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'}]});- });- </script>- <script>- $(document).ready(function () {$('#search-articles').click(function () {var grid = $('#articles-grid').data('kendoGrid');grid.dataSource.page(1); //new search. Set page size to 1@@ -143,7 +158,6 @@$('#articles-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {updateMasterCheckbox();});- });function additionalData() {var data = {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtmlindex e653be61e..c4192a019 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditArticle.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("KnowledgebaseArticle", new { SeName = Model.SeName })', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("KnowledgebaseArticle", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtmlindex 214731ba3..305bd081d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/EditCategory.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("KnowledgebaseCategory", new { SeName = Model.SeName })', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("KnowledgebaseCategory", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtmlindex 97c5d672d..1dbe5f987 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/_CreateOrUpdateArticle.TabRelated.cshtml@@ -7,13 +7,25 @@<div id="relatedarticles-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewRelatedArticle" onclick="javascript:OpenWindow('@(Url.Action("ArticlesPopup", "Knowledgebase", new { articleId = Model.Id, btnId = "btnRefreshRelatedArticles", formId = "article-form", area = Constants.AreaAdmin }))', 800, 800, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"]</button>+ <a id="btnAddNewRelatedArticle" href="@(Url.Action("ArticlesPopup", "Knowledgebase", new { articleId = Model.Id, btnId = "btnRefreshRelatedArticles", formId = "article-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.Related.AddNew"]</a><input type="submit" id="btnRefreshRelatedArticles" style="display: none" /></div></div><script>$(document).ready(function () {+ $('#btnAddNewRelatedArticle').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#relatedarticles-grid").kendoGrid({dataSource: {transport: {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtmlindex b3673554d..d84b719cf 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/News/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("NewsItem", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("NewsItem", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtmlindex 52cc4b355..bce51458b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/UploadLicenseFilePopup.cshtml@@ -1,10 +1,10 @@@model OrderModel.UploadLicenseModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Orders.Products.License.UploadFile"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post">+<form id="UploadLicenseFilePopup" asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="UploadLicenseFilePopup" method="post"><div class="row"><div class="col-md-12">@@ -31,14 +31,34 @@{<script>try {- window.opener.location.href = window.opener.location.href;+ window.location.href = window.location.href;}catch (e){}- window.close();</script>}<input asp-for="OrderId" type="hidden" /><input asp-for="OrderItemId" type="hidden" /><admin-input asp-for="LicenseDownloadId" />+ <script>+ var mfp = $.magnificPopup.instance;+ $("#UploadLicenseFilePopup").submit(function (e) {+ e.preventDefault();+ var url;+ var form = $(this);+ if (e.originalEvent.submitter.id == "deletelicense") {+ url = e.originalEvent.submitter.getAttribute('formaction');+ } else {+ url = form.attr('action');+ }+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ window.location.href = window.location.href;+ }+ });+ });+ </script></form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtmlindex b44b2eb16..89ae1f6af 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Products.cshtml@@ -187,8 +187,27 @@<a href="@Url.Action("DownloadFile", "Download", new { downloadGuid = item.LicenseDownloadGuid, area = Constants.AreaAdmin })" class="btn purple">@Loc["Admin.Orders.Products.License.DownloadLicense"]</a>}<br />- <input type="submit" id="pvlicensefile" name="pvlicensefile" value="@Loc["Admin.Orders.Products.License.UploadFile"]" onclick="javascript:OpenWindow('@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 550, 300, true); return false;" class="k-button" />+ <a id="pvlicensefile" name="pvlicensefile" href="@(Url.Action("UploadLicenseFilePopup", "Order", new { id = Model.Id, orderItemId = item.Id, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))" class="k-button">+ @Loc["Admin.Orders.Products.License.UploadFile"]+ </a></div>+ <script>+ $(document).ready(function () {+ $('#pvlicensefile').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });+ </script>+}</p>}@@ -330,4 +349,3 @@</div>}-diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtmlindex fdf6db33e..9bbb7ca1e 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Page", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("Page", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtmlindex cdcd8ede3..7b4c84584 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/Edit.cshtml@@ -31,11 +31,12 @@}@if (Model.CanPartiallyPaidOffline){- <input type="submit" id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"- value="@Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]"- onclick="javascript:OpenWindow('@(Url.Action("PartiallyPaidPopup", "PaymentTransaction",- new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "- class="k-button" />+ <a id="partiallypaidpaymenttransactionoffline" name="partiallypaidpaymenttransactionoffline"+ href="@(Url.Action("PartiallyPaidPopup", "PaymentTransaction",+ new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"+ class="k-button">+ @Loc["Admin.PaymentTransaction.Fields.PartialPaidOffline"]+ </a><text> </text>}@if (Model.CanRefund)@@ -52,20 +53,23 @@}@if (Model.CanPartiallyRefund){- <input type="submit" id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"+ <a id="partiallyrefundpaymenttransaction" name="partiallyrefundpaymenttransaction"value="@Loc["Admin.PaymentTransaction.Fields.PartialRefund"]"- onclick="javascript:OpenWindow('@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",- new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "- class="k-button" />+ href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",+ new { id = Model.Id, online = true, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"+ class="k-button">+ @Loc["Admin.PaymentTransaction.Fields.PartialRefund"]+ </a><text> </text>}@if (Model.CanPartiallyRefundOffline){- <input type="submit" id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"- value="@Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]"- onclick="javascript:OpenWindow('@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",- new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))', 500, 300, true); return false; "- class="k-button" />+ <a id="partiallyrefundpaymenttransactionoffline" name="partiallyrefundpaymenttransactionoffline"+ href="@(Url.Action("PartiallyRefundPopup", "PaymentTransaction",+ new { id = Model.Id, online = false, btnId = "btnRefreshPage", formId = "order-form", area = Constants.AreaAdmin }))"+ class="k-button">+ @Loc["Admin.PaymentTransaction.Fields.PartialRefundOffline"]+ </a><text> </text>}@if (Model.CanVoid)@@ -93,5 +97,45 @@</div></div></div>+ <script>+ $(document).ready(function () {+ $('#partiallypaidpaymenttransactionoffline').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ $('#partiallyrefundpaymenttransaction').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ $('#partiallyrefundpaymenttransactionoffline').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });+ </script></form><admin-delete-confirmation button-id="paymenttransaction-delete"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtmlindex 87a983ca0..effdde4f8 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyPaidPopup.cshtml@@ -1,10 +1,10 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialPaid"];}@model PaymentTransactionModel-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"+<form id="PartiallyPaidPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyPaidPopup" method="post"asp-route-OrderId="@Context.Request.Query["Id"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-online="@Context.Request.Query["online"]"@@ -50,10 +50,29 @@{<script>try {- window.opener.location.href = window.opener.location.href;+ window.location.href = window.location.href;}catch (e) { }- window.close();</script>}+ <script>+ $("#PartiallyPaidPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ }+ });+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtmlindex 9543d83fc..7902a68b1 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PaymentTransaction/PartiallyRefundPopup.cshtml@@ -1,10 +1,10 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.PaymentTransaction.Fields.PartialRefund"];}@model PaymentTransactionModel-<form asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"+<form id="PartiallyRefundPopup" asp-area="@Constants.AreaAdmin" asp-controller="PaymentTransaction" asp-action="PartiallyRefundPopup" method="post"asp-route-OrderId="@Context.Request.Query["Id"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-online="@Context.Request.Query["online"]"@@ -50,10 +50,30 @@{<script>try {- window.opener.location.href = window.opener.location.href;+ window.location.href = window.location.href;}catch (e) { }- window.close();</script>}+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PartiallyRefundPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ }+ });+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtmlindex 831cc9b24..b5d025a4b 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml@@ -114,8 +114,24 @@<label class='mt-checkbox mt-checkbox-outline control control-checkbox @if (!item.Actions) { <text>no-action</text> }'><input class="allow_@(cr.Id)" type="checkbox" value="@(item.SystemName)" name="allow_@(cr.Id)" @(allowed ? " checked=checked" : null) /> <div class="control__indicator"></div></label>@if (item.Actions){- <a class='k-link'- onclick="javascript:OpenWindow('@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&[email protected]', 600, 400, true); return false;"><i class="icon-settings"></i></a>+ <a class='k-link permissionlink'+ href="@Url.Action("PermissionsAction", "Permission", new { area = Constants.AreaAdmin })/?systemname=@(item.SystemName)&[email protected]"><i class="icon-settings"></i></a>+ <script>+ $(document).ready(function () {+ $('.permissionlink').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });+ </script>}</li>}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtmlindex e95e1c1f8..70adb4644 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/PermissionsAction.cshtml@@ -1,16 +1,10 @@@model PermissionActionModel@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Configuration.Permissions"];}-@if (ViewBag.ClosePage == true)-{- <script>- window.close();- </script>-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="PermissionsAction" method="post">+<form id="PermissionsAction" asp-area="@Constants.AreaAdmin" asp-controller="Permission" asp-action="PermissionsAction" method="post"><input asp-for="SystemName" type="hidden" /><input asp-for="CustomerGroupId" type="hidden" /><div class="row">@@ -48,4 +42,20 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PermissionsAction").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ mfp.close();+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 d1979e64e..353248d82 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@@ -1,7 +1,7 @@@model ProductModel.AddAssociatedProductModel@inject AdminAreaSettings adminAreaSettings@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"];}@@ -94,19 +94,7 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }--<script>-var mfp = $.magnificPopup.instance;$("#AssociatedProductAddPopup").submit(function (e) {e.preventDefault();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 964400612..a124e1a5c 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@@ -254,14 +254,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#AttributeCombinationPopup").submit(function (e) {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 7145cfeee..c8528553f 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@@ -87,15 +87,6 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#BundleProductAddPopup").submit(function (e) {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 92950d09a..564a32148 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@@ -93,14 +93,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtmlindex 082b2a05e..94f2eb2c1 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Edit.cshtml@@ -16,7 +16,7 @@</div><div class="actions"><div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <button type="button" onclick="javascript:OpenWindow('@Url.RouteUrl("Product", new {SeName = Model.SeName})', 800, 600, true); return false;" class="btn purple">+ <button type="button" onclick="window.open('@Url.RouteUrl("Product", new {SeName = Model.SeName})','_blank');" class="btn purple"><i class="fa fa-eye"></i>@Loc["Admin.Common.Preview"]</button>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtmlindex 25885dc11..a64a2a925 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeConditionPopup.cshtml@@ -54,11 +54,11 @@<div class="col-md-9 col-sm-9"><admin-select asp-for="SelectedProductAttributeId" asp-items="@(attributesList)" /><script>- $(document).ready(function() {+$("#@Html.IdFor(model => model.SelectedProductAttributeId)").change(toggleProductAttributes);toggleProductAttributes();- });+function toggleProductAttributes() {var selectedProductAttributeId = $("#@Html.IdFor(model => model.SelectedProductAttributeId)").val();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 88fa88529..af50a1a6c 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@@ -108,15 +108,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- alert('test');- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#ProductAttributeMappingPopup").submit(function (e) {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtmlindex e7452b983..6d1892a48 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductAttributeValidationRulesPopup.cshtml@@ -72,17 +72,6 @@</div></div></div>-- @if (ViewBag.RefreshPage == true)- {- <script>- try {- window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();- } catch (e) {- }- window.close();- </script>- }@if (!Model.ValidationRulesAllowed){<div class="note note-danger">This attribute type cannot have validation rules</div>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 0321f5659..b558f618a 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@@ -89,14 +89,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#ProductPicturePopup").submit(function (e) {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 0c2f7f4aa..3bf94bedf 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@@ -91,15 +91,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }-<script>var mfp = $.magnificPopup.instance;$("#RecommendedProductAddPopup").submit(function (e) {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 224a247ef..87d196ff3 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@@ -93,14 +93,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- try {window.opener.document.forms['@(Context.Request.Query["formId"])'].@(Context.Request.Query["btnId"]).click();}- catch (e){}- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#RelatedProductAddPopup").submit(function (e) {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtmlindex e10060446..6f5a0bcfe 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml@@ -166,15 +166,6 @@]});});- //details grid- function toolbar_click_newProductAttributeValue(id) {- javascript: OpenWindow('@Url.Action("ProductAttributeValueCreatePopup", "Product", new { area = Constants.AreaAdmin })/' + '?productAttributeMappingId=' + id + '&[email protected]&formId=product-form&btnId=btnRefreshProductAttributesValues', 800, 550, true);- return false;- }- function toolbar_click_editProductAttributeValue(id, pam) {- javascript: OpenWindow('@Url.Action("ProductAttributeValueEditPopup", "Product", new { area = Constants.AreaAdmin })/' + id + '?productId=@(Model.Id)&productAttributeMappingId=' + pam + '&btnId=btnRefreshProductAttributesValues&formId=product-form', 800, 500, true);- return false;- }function detailInit(e) {$("<div data-name='productattributevalue' data-id='" + e.data.id+"' />").appendTo(e.detailCell).kendoGrid({dataSource: {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 9b6a5d767..9fb42ffcb 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@@ -1,12 +1,12 @@@model PredefinedProductAttributeValueModel@{// layout- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post"+<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">@@ -29,4 +29,35 @@</div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PredefinedProductAttributeValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 56ca89633..0b91051bb 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@@ -1,14 +1,14 @@@model PredefinedProductAttributeValueModel@{// layout- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.EditValueDetails"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post"+<form id="PredefinedProductAttributeValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -23,9 +23,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" />+ <partial name="_CreateOrUpdatePredefinedProductAttributeValue" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#PredefinedProductAttributeValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtmlindex 7541fafde..a3bf954ef 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/_CreateOrUpdate.TabPredefinedValues.cshtml@@ -8,14 +8,42 @@<div id="productattributevalues-grid"></div></div><div class="panel-footer">- <button type="submit" id="btnAddNewValue" onclick=" javascript:OpenWindow('@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new {productAttributeId = Model.Id, btnId = "btnRefresh", formId = "productattribute-form", area = Constants.AreaAdmin }))', 800, 550, true); return false; " class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</button>+ <a id="btnAddNewValue" href="@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new {productAttributeId = Model.Id, btnId = "btnRefresh", formId = "productattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</a><input type="submit" id="btnRefresh" style="display:none" /></div><vc:admin-widget widget-zone="product_attribute_details_predefined_values_bottom" additional-data="Model" /></div><script>$(document).ready(function() {+ $(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ });$("#productattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -68,7 +96,7 @@field: "Name",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name"]",width: 200,- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=productattribute-form', 800, 500, true); return false;\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]&btnId=btnRefresh&formId=productattribute-form\">#=kendo.htmlEncode(Name)#</a>"}, {field: "PriceAdjustmentStr",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment"]",diff --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 1fed45c86..4411ca023 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@@ -74,12 +74,6 @@</div></div></div>- @if (ViewBag.RefreshPage == true)- {- <script>- window.close();- </script>- }<script>var mfp = $.magnificPopup.instance;$("#PicturePopup").submit(function (e) {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 9297983d4..be8fb6320 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@@ -1,17 +1,17 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}@model SpecificationAttributeOptionModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"- method="post" id="specificationattribute-form"+<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"+ method="post" id="specificationattribute-form"asp-route-Id="@Context.Request.Query["Id"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -26,9 +26,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateOption" model="Model" />+ <partial name="_CreateOrUpdateOption" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#specificationattribute-form").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --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 b53842cf8..6227012e5 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@@ -1,5 +1,5 @@@{- Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ Layout = "";}@model SpecificationAttributeOptionModel@{@@ -10,7 +10,7 @@asp-route-SpecificationAttributeId="@Context.Request.Query["SpecificationAttributeId"]"asp-route-btnId="@Context.Request.Query["btnId"]"asp-route-formId="@Context.Request.Query["formId"]">-+<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -25,9 +25,40 @@</div></div><div class="x_content form">- <partial name="_CreateOrUpdateOption" model="Model" />+ <partial name="_CreateOrUpdateOption" model="Model" /></div></div></div></div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#specificationattribute-form").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script></form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtmlindex 1e5c54658..21ef3734c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/_CreateOrUpdate.TabOptions.cshtml@@ -1,23 +1,53 @@@model SpecificationAttributeModel++<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.css" />+<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.js"></script>+@{if (!String.IsNullOrEmpty(Model.Id)){-<div class="panel panel-default">- <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null" />- <div class="panel-body">- <div id="specificationattributeoptions-grid"></div>- </div>- <div class="panel-footer">- <button type="submit" id="btnAddNewOption" onclick="javascript:OpenWindow('@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, btnId = "btnRefresh", formId = "specificationattribute-form", area = Constants.AreaAdmin }))', 800, 350, true); return false;" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</button>- <input type="submit" id="btnRefresh" style="display: none" />- </div>- <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model" />-</div>+ <div class="panel panel-default">+ <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null" />+ <div class="panel-body">+ <div id="specificationattributeoptions-grid"></div>+ </div>+ <div class="panel-footer">+ <a id="btnAddNewOption" href="@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, btnId = "btnRefresh", formId = "specificationattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</a>+ <input type="submit" id="btnRefresh" style="display: none" />+ </div>+ <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model" />+ </div>-<script>+ <script>$(document).ready(function () {+ $('#btnAddNewOption').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });$("#specificationattributeoptions-grid").kendoGrid({+ dataBound: function () {+ $('.editoption').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },dataSource: {transport: {read: {@@ -64,7 +94,7 @@columns: [{field: "Name",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name"]",- template: "<a class='k-link' onclick=\"javascript:OpenWindow('@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaAdmin })/#=Id#?btnId=btnRefresh&formId=specificationattribute-form', 800, 450, true); return false;\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editoption' href=\"@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaAdmin })/#=Id#?btnId=btnRefresh&formId=specificationattribute-form\">#=kendo.htmlEncode(Name)#</a>"}, {field: "DisplayOrder",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.DisplayOrder"]",@@ -80,7 +110,7 @@}]});});-</script>+ </script><script>$(document).ready(function () {$('#btnRefresh').click(function () {@@ -100,5 +130,5 @@@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.SaveBeforeEdit"]</div>}-+}\ No newline at end of filediff --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 0ea0d74fb..f7b057fec 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@@ -1,9 +1,6 @@@model SpecificationAttributeOptionModel@using Microsoft.AspNetCore.Mvc.Razor;-<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.css" />-<script asp-location="Footer" asp-src="/_content/Grand.Web.Admin/administration/farbtastic/farbtastic.js"></script>-<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden" /><input asp-for="SpecificationAttributeId" type="hidden" />@@ -24,10 +21,10 @@}<script>-$(document).ready(function() {+$("#@Html.IdFor(model => model.EnableColorSquaresRgb)").click(toggleEnableColorSquaresRgb);toggleEnableColorSquaresRgb();-});+function toggleEnableColorSquaresRgb() {if ($('#@Html.IdFor(model => model.EnableColorSquaresRgb)').is(':checked')) {@@ -89,9 +86,7 @@ function toggleEnableColorSquaresRgb() {<admin-input asp-for="ColorSquaresRgb" /><div id="color-picker"></div><script>- $(document).ready(function(){- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');- });+ $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');</script><span asp-validation-for="ColorSquaresRgb"></span></div>diff --git a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.csindex 056e9afdb..9745c0da9 100644--- a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs@@ -191,7 +191,7 @@ namespace Grand.Web.Admin.Controllers{await _addressAttributeViewModelService.InsertAddressAttributeValueModel(model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formreturn View(model);@@ -236,7 +236,7 @@ namespace Grand.Web.Admin.Controllers{await _addressAttributeViewModelService.UpdateAddressAttributeValueModel(model, cav);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.csindex 3df7bd842..bfdb502d7 100644--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs@@ -269,7 +269,7 @@ namespace Grand.Web.Admin.Controllersawait _pictureViewModelService.UpdatePicture(model);ViewBag.RefreshPage = true;- return View("PicturePopup", model);+ return Content("");}Error(ModelState);@@ -542,7 +542,7 @@ namespace Grand.Web.Admin.Controllers}}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -642,7 +642,7 @@ namespace Grand.Web.Admin.Controllers}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}[PermissionAuthorizeAction(PermissionActionName.Edit)]diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.csindex 2b5ac187b..a6c469f44 100644--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs@@ -235,7 +235,7 @@ namespace Grand.Web.Admin.Controllers{var cav = await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay form@@ -288,7 +288,7 @@ namespace Grand.Web.Admin.Controllers{await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.csindex 59409a574..fa5187c36 100644--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs@@ -230,7 +230,7 @@ namespace Grand.Web.Admin.Controllersawait _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay form@@ -279,7 +279,7 @@ namespace Grand.Web.Admin.Controllers{await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs b/src/Web/Grand.Web.Admin/Controllers/CountryController.csindex 22f3fef6a..a2acc4d03 100644--- a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs@@ -266,7 +266,7 @@ namespace Grand.Web.Admin.Controllers{await _countryViewModelService.InsertStateProvinceModel(model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay form@@ -317,7 +317,7 @@ namespace Grand.Web.Admin.Controllers{await _countryViewModelService.UpdateStateProvinceModel(sp, model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.csindex 8b8a8c68f..5dffbf522 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs@@ -373,7 +373,7 @@ namespace Grand.Web.Admin.Controllersawait _customerActionViewModelService.InsertProductToConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -437,7 +437,7 @@ namespace Grand.Web.Admin.Controllersawait _customerActionViewModelService.InsertCategoryConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -495,7 +495,7 @@ namespace Grand.Web.Admin.Controllersawait _customerActionViewModelService.InsertCollectionConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregiondiff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.csindex 7875d466e..9029dd6c4 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs@@ -184,7 +184,7 @@ namespace Grand.Web.Admin.Controllers{await _customerAttributeViewModelService.InsertCustomerAttributeValueModel(model);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay form@@ -226,7 +226,7 @@ namespace Grand.Web.Admin.Controllersawait _customerAttributeViewModelService.UpdateCustomerAttributeValueModel(model, cav);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.csindex 9a7e119e7..3d9e11db6 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs@@ -989,7 +989,7 @@ namespace Grand.Web.Admin.Controllers}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}[PermissionAuthorizeAction(PermissionActionName.Edit)]diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.csindex 952c95bd8..600a5c013 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs@@ -249,7 +249,7 @@ namespace Grand.Web.Admin.Controllers//a vendor should have access only to his productsViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregiondiff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.csindex 0c73e4777..80e1c5f5c 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs@@ -374,7 +374,7 @@ namespace Grand.Web.Admin.Controllersawait _customerReminderViewModelService.InsertCategoryConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -431,7 +431,7 @@ namespace Grand.Web.Admin.Controllersawait _customerReminderViewModelService.InsertCollectionConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -481,7 +481,7 @@ namespace Grand.Web.Admin.Controllersawait _customerReminderViewModelService.InsertProductToConditionModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.csindex 35f3dd4c5..4b41a8f96 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs@@ -275,7 +275,7 @@ namespace Grand.Web.Admin.Controllers//a vendor should have access only to his productsViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion}diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.csindex 8196d3ee7..cfe7357d6 100644--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs@@ -430,7 +430,7 @@ namespace Grand.Web.Admin.Controllers}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -525,7 +525,7 @@ namespace Grand.Web.Admin.Controllersawait _discountViewModelService.InsertCategoryToDiscountModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -607,7 +607,7 @@ namespace Grand.Web.Admin.Controllersawait _discountViewModelService.InsertBrandToDiscountModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -690,7 +690,7 @@ namespace Grand.Web.Admin.Controllersawait _discountViewModelService.InsertCollectionToDiscountModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregion@@ -779,7 +779,7 @@ namespace Grand.Web.Admin.Controllersawait _discountViewModelService.InsertVendorToDiscountModel(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}#endregiondiff --git a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.csindex 7e167692c..1c6bcb3dc 100644--- a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs@@ -395,7 +395,7 @@ namespace Grand.Web.Admin.ControllersViewBag.RefreshPage = true;ViewBag.btnId = btnId;ViewBag.formId = formId;- return View(model);+ return Content("");}return View(model);@@ -452,7 +452,7 @@ namespace Grand.Web.Admin.ControllersViewBag.RefreshPage = true;ViewBag.btnId = btnId;ViewBag.formId = formId;- return View(model);+ return Content("");}return View(model);diff --git a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.csindex 3c057c726..3ee5398ae 100644--- a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs@@ -335,7 +335,7 @@ namespace Grand.Web.Admin.Controllersawait _knowledgebaseViewModelService.InsertKnowledgebaseRelatedArticle(model);}ViewBag.RefreshPage = true;- return View(model);+ return Content("");}[PermissionAuthorizeAction(PermissionActionName.Delete)]diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.csindex d6e372de4..5c4b983e6 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs@@ -287,7 +287,7 @@ namespace Grand.Web.Admin.Controllersawait _productAttributeService.UpdateProductAttribute(productAttribute);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formreturn View(model);@@ -325,7 +325,7 @@ namespace Grand.Web.Admin.Controllersawait _productAttributeService.UpdateProductAttribute(productAttribute);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formreturn View(model);diff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.csindex 08e922a97..808812ea1 100644--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs@@ -258,7 +258,7 @@ namespace Grand.Web.Admin.Controllersawait _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay form@@ -307,7 +307,7 @@ namespace Grand.Web.Admin.Controllersawait _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);ViewBag.RefreshPage = true;- return View(model);+ return Content("");}//If we got this far, something failed, redisplay formdiff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.jsindex b7c0cc0a4..1401bdba2 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js@@ -2,15 +2,6 @@ function setLocation(url) {window.location.href = url;}-function OpenWindow(query, w, h, scroll) {- var l = (screen.width - w) / 2;- var t = (screen.height - h) / 2;-- winprops = 'resizable=1, height=' + h + ',width=' + w + ',top=' + t + ',left=' + l + 'w';- if (scroll) winprops += ',scrollbars=1';- var f = window.open(query, "_blank", winprops);-}-function showThrobber(message) {$('.throbber-header').html(message);window.setTimeout(function () {