Skip to content

Commit

Permalink
nopSolutions#4112 Some refactoring view tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@DmitriyKulagin
DmitriyKulagin committed Dec 18, 2019
1 parent 5b65b1e commit 9f0c26e
Show file tree
Hide file tree
Showing 23 changed files with 82 additions and 94 deletions.
11 changes: 5 additions & 6 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Blog/BlogComments.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,11 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_comments"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(BlogCommentModel.BlogPostTitle))
{
Title = T("Admin.ContentManagement.Blog.Comments.Fields.BlogPost").Text,
Width = "200",
Render = new RenderLink(new DataUrl("~/Admin/Blog/BlogPostEdit/", nameof(BlogCommentModel.BlogPostId)))
},
new ColumnProperty(nameof(BlogCommentModel.StoreName))
Expand All @@ -146,13 +145,13 @@
new ColumnProperty(nameof(BlogCommentModel.Comment))
{
Title = T("Admin.ContentManagement.Blog.Comments.Fields.Comment").Text,
Width = "200",
Width = "300",
Encode = false
},
new ColumnProperty(nameof(BlogCommentModel.IsApproved))
{
Title = T("Admin.ContentManagement.Blog.Comments.Fields.IsApproved").Text,
Width = "100",
Width = "80",
ClassName = NopColumnClassDefaults.CenterAll,
Render = new RenderBoolean(),
Editable = true,
Expand All @@ -161,14 +160,14 @@
new ColumnProperty(nameof(BlogCommentModel.CreatedOn))
{
Title = T("Admin.ContentManagement.Blog.Comments.Fields.CreatedOn").Text,
Width = "200",
Width = "150",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderDate()
},
new ColumnProperty(nameof(BlogCommentModel.Id))
{
Title = T("Admin.Common.Edit").Text,
Width = "200",
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonsInlineEdit()
},
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Category/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_categories"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(CategoryModel.Breadcrumb))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/CheckoutAttribute/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_checkoutattributes"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(CheckoutAttributeModel.Name))
{
Expand Down
7 changes: 3 additions & 4 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Common/SeNames.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@
},
new ColumnProperty(nameof(UrlRecordModel.Name))
{
Title = T("Admin.System.SeNames.Name").Text,
Width = "300"
Title = T("Admin.System.SeNames.Name").Text
},
new ColumnProperty(nameof(UrlRecordModel.EntityId))
{
Title = T("Admin.System.SeNames.EntityId").Text,
Width = "50"
Width = "80"
},
new ColumnProperty(nameof(UrlRecordModel.EntityName))
{
Expand All @@ -106,7 +105,7 @@
new ColumnProperty(nameof(UrlRecordModel.IsActive))
{
Title = T("Admin.System.SeNames.IsActive").Text,
Width = "50",
Width = "80",
ClassName = NopColumnClassDefaults.CenterAll,
Render = new RenderBoolean()
},
Expand Down
9 changes: 4 additions & 5 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Country/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_countries"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(CountryModel.Name))
{
Title = T("Admin.Configuration.Countries.Fields.Name").Text,
Width = "200"
Title = T("Admin.Configuration.Countries.Fields.Name").Text
},
new ColumnProperty(nameof(CountryModel.AllowsBilling))
{
Expand Down Expand Up @@ -89,7 +88,7 @@
new ColumnProperty(nameof(CountryModel.NumericIsoCode))
{
Title = T("Admin.Configuration.Countries.Fields.NumericIsoCode").Text,
Width = "150"
Width = "120"
},
new ColumnProperty(nameof(CountryModel.SubjectToVat))
{
Expand All @@ -113,7 +112,7 @@
new ColumnProperty(nameof(CountryModel.Published))
{
Title = T("Admin.Configuration.Countries.Fields.Published").Text,
Width = "100",
Width = "80",
ClassName = NopColumnClassDefaults.CenterAll,
Render = new RenderBoolean()
},
Expand Down
5 changes: 2 additions & 3 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Customer/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,11 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_customers"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
});
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(CustomerModel.Email))
{
Title = T("Admin.Customers.Customers.Fields.Email").Text,
Width = "200"
Title = T("Admin.Customers.Customers.Fields.Email").Text
});
if (Model.AvatarEnabled)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ else
IsMasterCheckBox = true,
Render = new RenderCheckBox(nameof(AddCategoryToDiscountModel.SelectedCategoryIds)),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(CategoryModel.Breadcrumb))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Discount/ManufacturerAddPopup.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ else
IsMasterCheckBox = true,
Render = new RenderCheckBox(nameof(AddManufacturerToDiscountModel.SelectedManufacturerIds)),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(ManufacturerModel.Name))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Log/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_log"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(LogModel.LogLevel))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Manufacturer/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_manufacturers"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(ManufacturerModel.Name))
{
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Manufacturer/ProductAddPopup.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ else
IsMasterCheckBox = true,
Render = new RenderCheckBox(nameof(AddProductToManufacturerModel.SelectedProductIds)),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(ProductModel.Name))
{
Expand Down
7 changes: 3 additions & 4 deletions src/Presentation/Nop.Web/Areas/Admin/Views/News/NewsComments.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_comments"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
Width = "50"
},
new ColumnProperty(nameof(NewsCommentModel.NewsItemTitle))
{
Expand Down Expand Up @@ -151,7 +151,6 @@
new ColumnProperty(nameof(NewsCommentModel.CommentText))
{
Title = T("Admin.ContentManagement.News.Comments.Fields.CommentText").Text,
Width = "200",
Encode = false
},
new ColumnProperty(nameof(NewsCommentModel.IsApproved))
Expand All @@ -166,14 +165,14 @@
new ColumnProperty(nameof(NewsCommentModel.CreatedOn))
{
Title = T("Admin.ContentManagement.News.Comments.Fields.CreatedOn").Text,
Width = "200",
Width = "120",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderDate()
},
new ColumnProperty(nameof(NewsCommentModel.Id))
{
Title = T("Admin.Common.Edit").Text,
Width = "200",
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonsInlineEdit()
},
Expand Down
65 changes: 32 additions & 33 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Order/List.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,39 +291,39 @@
FooterCallback = !Model.IsLoggedInAsVendor ? "ordersfootercallback" : null,
FooterColumns = !Model.IsLoggedInAsVendor ? 10 : 0,
Filters = new List<FilterParameter>
{
new FilterParameter(nameof(Model.StartDate)),
new FilterParameter(nameof(Model.EndDate)),
new FilterParameter(nameof(Model.OrderStatusIds)),
new FilterParameter(nameof(Model.PaymentStatusIds)),
new FilterParameter(nameof(Model.ShippingStatusIds)),
new FilterParameter(nameof(Model.StoreId)),
new FilterParameter(nameof(Model.VendorId)),
new FilterParameter(nameof(Model.WarehouseId)),
new FilterParameter(nameof(Model.BillingEmail)),
new FilterParameter(nameof(Model.BillingPhone)),
new FilterParameter(nameof(Model.BillingLastName)),
new FilterParameter(nameof(Model.BillingCountryId)),
new FilterParameter(nameof(Model.PaymentMethodSystemName)),
new FilterParameter(nameof(Model.ProductId)),
new FilterParameter(nameof(Model.OrderNotes))
}
{
new FilterParameter(nameof(Model.StartDate)),
new FilterParameter(nameof(Model.EndDate)),
new FilterParameter(nameof(Model.OrderStatusIds)),
new FilterParameter(nameof(Model.PaymentStatusIds)),
new FilterParameter(nameof(Model.ShippingStatusIds)),
new FilterParameter(nameof(Model.StoreId)),
new FilterParameter(nameof(Model.VendorId)),
new FilterParameter(nameof(Model.WarehouseId)),
new FilterParameter(nameof(Model.BillingEmail)),
new FilterParameter(nameof(Model.BillingPhone)),
new FilterParameter(nameof(Model.BillingLastName)),
new FilterParameter(nameof(Model.BillingCountryId)),
new FilterParameter(nameof(Model.PaymentMethodSystemName)),
new FilterParameter(nameof(Model.ProductId)),
new FilterParameter(nameof(Model.OrderNotes))
}
};
gridModel.ColumnCollection = new List<ColumnProperty>
{
new ColumnProperty(nameof(OrderModel.Id))
{
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_orders"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50",
},
new ColumnProperty(nameof(OrderModel.CustomOrderNumber))
{
Title = T("Admin.Orders.Fields.CustomOrderNumber").Text,
Width = "80"
}
};
{
new ColumnProperty(nameof(OrderModel.Id))
{
IsMasterCheckBox = true,
Render = new RenderCheckBox("checkbox_orders"),
ClassName = NopColumnClassDefaults.CenterAll,
Width = "50"
},
new ColumnProperty(nameof(OrderModel.CustomOrderNumber))
{
Title = T("Admin.Orders.Fields.CustomOrderNumber").Text,
Width = "80"
}
};
//a vendor does not have access to this functionality
if (!Model.IsLoggedInAsVendor)
{
Expand Down Expand Up @@ -351,7 +351,6 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.CustomerEmail))
{
Title = T("Admin.Orders.Fields.Customer").Text,
Width = "250",
Render = new RenderLink(new DataUrl("~/Admin/Customer/Edit", nameof(OrderModel.CustomerId)))
});
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.StoreName))
Expand All @@ -363,7 +362,7 @@
gridModel.ColumnCollection.Add(new ColumnProperty(nameof(OrderModel.CreatedOn))
{
Title = T("Admin.Orders.Fields.CreatedOn").Text,
Width = "100",
Width = "120",
Render = new RenderDate()
});
//a vendor does not have access to this functionality
Expand Down
Loading

0 comments on commit 9f0c26e

Please sign in to comment.