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
Improvement - Category picture - use localizable alternate text and title attributes for a picture
KrzysztofPajak50334c765d6f
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/PicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/PicturePopup.cshtmlnew file mode 100644index 000000000..00bf61994--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/PicturePopup.cshtml@@ -0,0 +1,87 @@+@using Microsoft.AspNetCore.Mvc.Razor;++@model CategoryModel.PictureModel+@{+ Layout = Grand.Web.Admin.Extensions.Constants.Layout_AdminPopup;+ //page title+ ViewBag.Title = Loc["Admin.Catalog.Categories.Picture"];+}+<form asp-area="@Constants.AreaAdmin" asp-controller="Category" asp-action="PicturePopup" enctype="multipart/form-data" method="post"+ asp-route-CategoryId="@Context.Request.Query["CategoryId"]">+++ <!-- #region languages template -->+ @{ Func<int, HelperResult> template = @<div class="form-body">+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].AltAttribute" class="col-sm-3 control-label" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].AltAttribute" />+ <span asp-validation-for="@Model.Locales[item].AltAttribute"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].TitleAttribute" class="col-sm-3 control-label" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].TitleAttribute" />+ <span asp-validation-for="@Model.Locales[item].TitleAttribute"></span>+ </div>+ </div>+ <input asp-for="@Model.Locales[item].LanguageId" type="hidden" />+ </div>;+ }++ <div asp-validation-summary="All"></div>+ <input asp-for="CategoryId" type="hidden" />+ <input asp-for="Id" type="hidden" />+ <input asp-for="PictureUrl" type="hidden" />+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="PictureUrl" />+ <div class="col-md-9 col-sm-9">+ <a href="@Model.PictureUrl" target="_blank"><img src="@Model.PictureUrl" width="150" /></a>+ </div>+ </div>+ <localized-editor localized-template=template name="picturevalue-localized" [email protected](c=>c.LanguageId).ToList()>+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="AltAttribute" class="col-sm-3 control-label" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="AltAttribute" />+ <span asp-validation-for="AltAttribute"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="TitleAttribute" class="col-sm-3 control-label" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="TitleAttribute" />+ <span asp-validation-for="TitleAttribute"></span>+ </div>+ </div>+ </div>+ </localized-editor>+ <div class="form-actions">+ <div class="row">+ <div class="offset-md-3 offset-sm-3 col-md-9 col-sm-9">+ <button class="k-button" type="submit" name="save"><i class="fa fa-check"></i>@Loc["Admin.Common.Save"] </button>+ </div>+ </div>+ </div>++ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ @if (ViewBag.RefreshPage == true)+ {+ <script>+ window.close();+ </script>+ }+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.TabInfo.cshtmlindex c2b3f1959..6f647ae1c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.TabInfo.cshtml@@ -30,38 +30,38 @@@{ Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name" />- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>+ template = @<div class="form-body">+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].Name" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].Name" />+ <span asp-validation-for="@Model.Locales[item].Name"></span></div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Description" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Description" asp-template="Editor" />- <span asp-validation-for="@Model.Locales[item].Description"></span>- </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].Description" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].Description" asp-template="Editor" />+ <span asp-validation-for="@Model.Locales[item].Description"></span></div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].BottomDescription" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].BottomDescription" asp-template="Editor" />- <span asp-validation-for="@Model.Locales[item].BottomDescription"></span>- </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].BottomDescription" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].BottomDescription" asp-template="Editor" />+ <span asp-validation-for="@Model.Locales[item].BottomDescription"></span></div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Flag" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Flag" />- <span asp-validation-for="@Model.Locales[item].Flag"></span>- </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].Flag" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].Flag" />+ <span asp-validation-for="@Model.Locales[item].Flag"></span></div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId" />- </div>;- }+ </div>+ <input type="hidden" asp-for="@Model.Locales[item].LanguageId" />+ </div>;+}<div class="form-horizontal"><vc:admin-widget widget-zone="category_details_info_top" additional-data="Model" /><localized-editor localized-template=@template name="category-info-localized" [email protected](c=>c.LanguageId).ToList()>@@ -141,6 +141,12 @@<div class="col-md-9 col-sm-9"><admin-input asp-for="PictureId" /><span asp-validation-for="PictureId"></span>+ @if (!string.IsNullOrEmpty(Model.PictureId))+ {+ <label class="control-label">+ <a class='k-link' href='javascript:OpenWindow("@Url.Action("PicturePopup", "Category", new { area = Constants.AreaAdmin })/?categoryId=@(Model.Id)", 800, 600, true);'>@Loc["Admin.Common.Picture.Attributes"]</a>+ </label>+ }</div></div><div class="form-group">diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.csindex a5dfbf641..1070d7119 100644--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs@@ -252,6 +252,60 @@ namespace Grand.Web.Admin.Controllers}+ #endregion++ #region Picture++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> PicturePopup(string categoryId)+ {+ var category = await _categoryService.GetCategoryById(categoryId);+ if (category == null)+ return Content("Category not exist");++ if (string.IsNullOrEmpty(category.PictureId))+ return Content("Picture not exist");++ var permission = await CheckAccessToCategory(category);+ if (!permission.allow)+ return Content(permission.message);+++ var (model, picture) = await _categoryViewModelService.PreparePictureModel(category);+ //locales+ await AddLocales(_languageService, model.Locales, (locale, languageId) =>+ {+ locale.AltAttribute = picture?.GetTranslation(x => x.AltAttribute, languageId, false);+ locale.TitleAttribute = picture?.GetTranslation(x => x.TitleAttribute, languageId, false);+ });++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> PicturePopup(CategoryModel.PictureModel model)+ {+ if (ModelState.IsValid)+ {+ var category = await _categoryService.GetCategoryById(model.CategoryId);+ if (category == null)+ throw new ArgumentException("No category found with the specified id");++ if (string.IsNullOrEmpty(category.PictureId))+ throw new ArgumentException("No picture found with the specified id");++ await _categoryViewModelService.UpdateCategoryPicture(model);++ ViewBag.RefreshPage = true;+ return View(model);+ }++ Error(ModelState);++ return View(model);+ }+#endregion#region Export / Importdiff --git a/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.csindex e7de7f490..8508bf2ae 100644--- a/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Interfaces/ICategoryViewModelService.cs@@ -1,4 +1,5 @@using Grand.Domain.Catalog;+using Grand.Domain.Media;using Grand.Web.Admin.Models.Catalog;using System.Collections.Generic;using System.Threading.Tasks;@@ -14,6 +15,8 @@ namespace Grand.Web.Admin.InterfacesTask<Category> InsertCategoryModel(CategoryModel model);Task<Category> UpdateCategoryModel(Category category, CategoryModel model);Task DeleteCategory(Category category);+ Task<(CategoryModel.PictureModel model, Picture Picture)> PreparePictureModel(Category category);+ Task UpdateCategoryPicture(CategoryModel.PictureModel model);Task<(IEnumerable<CategoryModel.CategoryProductModel> categoryProductModels, int totalCount)> PrepareCategoryProductModel(string categoryId, int pageIndex, int pageSize);Task<ProductCategory> UpdateProductCategoryModel(CategoryModel.CategoryProductModel model);Task DeleteProductCategoryModel(string id, string productId);diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.csindex 46db2fa98..68491ffac 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/CategoryModel.cs@@ -192,6 +192,37 @@ namespace Grand.Web.Admin.Models.Catalogpublic string CustomerEmail { get; set; }}+ public partial class PictureModel : BaseEntityModel, ILocalizedModel<PictureModel.PictureLocalizedModel>+ {+ public PictureModel()+ {+ Locales = new List<PictureLocalizedModel>();+ }++ public string CategoryId { get; set; }++ [GrandResourceDisplayName("Admin.Catalog.Categories.Picture")]+ public string PictureUrl { get; set; }++ [GrandResourceDisplayName("Admin.Catalog.Categories.Picture.Fields.AltAttribute")]+ public string AltAttribute { get; set; }++ [GrandResourceDisplayName("Admin.Catalog.Categories.Picture.Fields.TitleAttribute")]+ public string TitleAttribute { get; set; }++ public IList<PictureLocalizedModel> Locales { get; set; }++ public partial class PictureLocalizedModel : ILocalizedModelLocal+ {+ public string LanguageId { get; set; }++ [GrandResourceDisplayName("Admin.Catalog.Categories.Picture.Fields.AltAttribute")]+ public string AltAttribute { get; set; }++ [GrandResourceDisplayName("Admin.Catalog.Categories.Picture.Fields.TitleAttribute")]+ public string TitleAttribute { get; set; }+ }+ }#endregion}diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.csindex bb0871831..a4a88b1e3 100644--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs@@ -22,6 +22,7 @@ using System;using System.Collections.Generic;using System.Linq;using System.Threading.Tasks;+using Grand.Domain.Media;namespace Grand.Web.Admin.Services{@@ -34,7 +35,6 @@ namespace Grand.Web.Admin.Servicesprivate readonly ITranslationService _translationService;private readonly IStoreService _storeService;private readonly ICustomerService _customerService;- private readonly IGroupService _groupService;private readonly ISlugService _slugService;private readonly IPictureService _pictureService;private readonly ICustomerActivityService _customerActivityService;@@ -46,7 +46,7 @@ namespace Grand.Web.Admin.Servicesprivate readonly SeoSettings _seoSettings;public CategoryViewModelService(ICategoryService categoryService, IProductCategoryService productCategoryService, ICategoryLayoutService categoryLayoutService, IDiscountService discountService,- ITranslationService translationService, IStoreService storeService, ICustomerService customerService, IGroupService groupService, IPictureService pictureService,+ ITranslationService translationService, IStoreService storeService, ICustomerService customerService, IPictureService pictureService,ISlugService slugService, ICustomerActivityService customerActivityService, IProductService productService,IVendorService vendorService, IDateTimeService dateTimeService, ILanguageService languageService, CatalogSettings catalogSettings, SeoSettings seoSettings){@@ -57,7 +57,6 @@ namespace Grand.Web.Admin.Services_translationService = translationService;_storeService = storeService;_customerService = customerService;- _groupService = groupService;_slugService = slugService;_customerActivityService = customerActivityService;_productService = productService;@@ -248,6 +247,31 @@ namespace Grand.Web.Admin.Services//activity logawait _customerActivityService.InsertActivity("DeleteCategory", category.Id, _translationService.GetResource("ActivityLog.DeleteCategory"), category.Name);}++ public virtual async Task<(CategoryModel.PictureModel model, Picture Picture)> PreparePictureModel(Category category)+ {+ var picture = await _pictureService.GetPictureById(category.PictureId);+ var model = new CategoryModel.PictureModel {+ Id = picture.Id,+ CategoryId = category.Id,+ PictureUrl = picture != null ? await _pictureService.GetPictureUrl(picture) : null,+ AltAttribute = picture?.AltAttribute,+ TitleAttribute = picture?.TitleAttribute,+ };+ return (model, picture);+ }+ public virtual async Task UpdateCategoryPicture(CategoryModel.PictureModel model)+ {+ var picture = await _pictureService.GetPictureById(model.Id);+ if (picture == null)+ throw new ArgumentException("No picture found with the specified id");++ //Update picture fields+ await _pictureService.UpdatField(picture, x => x.AltAttribute, model.AltAttribute);+ await _pictureService.UpdatField(picture, x => x.TitleAttribute, model.TitleAttribute);+ await _pictureService.UpdatField(picture, x => x.Locales, model.Locales.ToTranslationProperty());++ }public virtual async Task<(IEnumerable<CategoryModel.CategoryProductModel> categoryProductModels, int totalCount)> PrepareCategoryProductModel(string categoryId, int pageIndex, int pageSize){var productCategories = await _productCategoryService.GetProductCategoriesByCategoryId(categoryId,diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 115fc980e..c052bc2a2 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -2301,6 +2301,15 @@<Resource Name="Admin.Catalog.Categories.Permisions"><Value>You can't edit this category, because it can be used in many stores.</Value></Resource>+ <Resource Name="Admin.Catalog.Categories.Picture">+ <Value>Picture</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Categories.Picture.Fields.AltAttribute">+ <Value>Picture alternate text</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Categories.Picture.Fields.TitleAttribute">+ <Value>Picture title</Value>+ </Resource><Resource Name="Admin.Catalog.Categories.Products"><Value>Products</Value></Resource>@@ -3906,6 +3915,9 @@<Resource Name="Admin.Common.NoCancel"><Value>No, cancel</Value></Resource>+ <Resource Name="Admin.Common.Picture.Attributes">+ <Value>Picture attributes</Value>+ </Resource><Resource Name="Admin.Common.Preview"><Value>Show in the shop page</Value></Resource>diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.csindex 7b6fb306d..201b41528 100644--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs@@ -18,6 +18,7 @@ using System.Collections.Generic;using System.Linq;using System.Threading;using System.Threading.Tasks;+using Grand.Business.Common.Extensions;namespace Grand.Web.Features.Handlers.Catalog{@@ -62,14 +63,22 @@ namespace Grand.Web.Features.Handlers.Catalog{var catModel = x.ToModel(request.Language);//prepare picture model+ var picture = await _pictureService.GetPictureById(x.PictureId);catModel.PictureModel = new PictureModel{Id = x.PictureId,FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),- Title = string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), catModel.Name),- AlternateText = string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), catModel.Name)};+ //"title" attribute+ catModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.TitleAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), x.Name);+ //"alt" attribute+ catModel.PictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.AltAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), x.Name);+catlistmodel.Add(catModel);}return catlistmodel;diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.csindex 4b4ac621f..d80f4cece 100644--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs@@ -118,14 +118,22 @@ namespace Grand.Web.Features.Handlers.CatalogFlagStyle = x.FlagStyle};//prepare picture model+ var picture = await _pictureService.GetPictureById(x.PictureId);subCatModel.PictureModel = new PictureModel{Id = x.PictureId,FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),- Title = string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), subCatModel.Name),- AlternateText = string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), subCatModel.Name)};+ //"title" attribute+ subCatModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.TitleAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), x.Name);+ //"alt" attribute+ subCatModel.PictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.AltAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), x.Name);+subCategories.Add(subCatModel);};diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.csindex 5925946e2..69e751c52 100644--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs@@ -13,6 +13,7 @@ using MediatR;using System.Collections.Generic;using System.Threading;using System.Threading.Tasks;+using Grand.Business.Common.Extensions;namespace Grand.Web.Features.Handlers.Catalog{@@ -52,14 +53,22 @@ namespace Grand.Web.Features.Handlers.Catalog{var catModel = x.ToModel(request.Language);//prepare picture model+ var picture = await _pictureService.GetPictureById(x.PictureId);catModel.PictureModel = new PictureModel{Id = x.PictureId,FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),- Title = string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), catModel.Name),- AlternateText = string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), catModel.Name)};+ //"title" attribute+ catModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.TitleAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), x.Name);+ //"alt" attribute+ catModel.PictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, request.Language.Id))) ?+ picture.GetTranslation(x => x.AltAttribute, request.Language.Id) :+ string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), x.Name);+cat.Add(catModel);}return cat;