Skip to content

Pull request - Add missing media settings - 1.0.x #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrzysztofPajak merged 2 commits into from
Jul 22, 2021
Merged

Pull request - Add missing media settings - 1.0.x #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da66fcd
Grand.Web.Admin - Add missing media settings - allow to edit by store…
KrzysztofPajak Jul 21, 2021
69a74e9
Merge branch '1.0.x' of https://github.com/grandnode/grandnode2 into …
KrzysztofPajak Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Media.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,15 @@
<span asp-validation-for="DefaultImageName"></span>
</div>
</div>
<div class="form-group">
<div class="col-8 col-md-4 col-sm-4 text-right">
<admin-label asp-for="StoreLocation" class="control-label" />
</div>
<div class="col-4 col-md-8 col-sm-8">
<admin-input asp-for="StoreLocation" />
<span asp-validation-for="StoreLocation"></span>
</div>
</div>
</div>
</div>
<vc:admin-widget widget-zone="media_settings_bottom" additional-data="null" />
Expand Down
3 changes: 3 additions & 0 deletions src/Web/Grand.Web.Admin/Models/Settings/MediaSettingsModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public partial class MediaSettingsModel : BaseModel
[GrandResourceDisplayName("Admin.Settings.Media.AllowedFileTypes")]
public string AllowedFileTypes { get; set; }

[GrandResourceDisplayName("Admin.Settings.Media.StoreLocation")]
public string StoreLocation { get; set; }

[GrandResourceDisplayName("Admin.Settings.Media.DefaultImageName")]
public string DefaultImageName { get; set; } = "no-image.png";

Expand Down
6 changes: 6 additions & 0 deletions src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11484,6 +11484,12 @@
<Resource Name="Admin.Settings.Media.ProductThumbPictureSizeOnProductDetailsPage">
<Value>Product thumbnail image size (product page)</Value>
</Resource>
<Resource Name="Admin.Settings.Media.StoreLocation">
<Value>Image location (url)</Value>
</Resource>
<Resource Name="Admin.Settings.Media.StoreLocation.hint">
<Value>This settings is only for advanced user</Value>
</Resource>
<Resource Name="Admin.Settings.Media.VendorThumbPictureSize">
<Value>Vendor thumbnail image size</Value>
</Resource>
Expand Down