diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Create.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Create.cshtml index 7a611d9..6a732e7 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Create.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Create.cshtml @@ -20,13 +20,18 @@
- +
- - - + + + +
+
+ + +
@@ -36,36 +41,10 @@
-
- -
-
+ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Delete.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Delete.cshtml index 224a84e..cac35ea 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Delete.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Delete.cshtml @@ -13,7 +13,8 @@

@Html.DisplayNameFor(model => model.Name): @Model.Name
- @Html.DisplayNameFor(model => model.Description): @Model.Description
+ @Html.DisplayNameFor(model => model.EnglishDescription): @Model.EnglishDescription
+ @Html.DisplayNameFor(model => model.RussianDescription): @Model.RussianDescription
@Html.DisplayNameFor(model => model.Image): @(Model.Image).png
Preview: diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Edit.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Edit.cshtml index 5de435a..d1152e3 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Edit.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Edit.cshtml @@ -24,9 +24,14 @@

- - - + + + +
+
+ + +
@@ -36,36 +41,10 @@
-
- -
-
+
- - - - \ No newline at end of file + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Index.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Index.cshtml index b08034f..6df9836 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Index.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Index.cshtml @@ -20,7 +20,10 @@ @Html.DisplayNameFor(model => model.Name) - @Html.DisplayNameFor(model => model.Description) + @Html.DisplayNameFor(model => model.EnglishDescription) + + + @Html.DisplayNameFor(model => model.RussianDescription) @Html.DisplayNameFor(model => model.Image) @@ -36,7 +39,8 @@
@item.Name - @item.Description + @item.EnglishDescription + @item.RussianDescription @item.Image Edit | diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Preview.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Preview.cshtml new file mode 100644 index 0000000..e96e80e --- /dev/null +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Badges/Preview.cshtml @@ -0,0 +1,29 @@ +
+ +
+
+ + \ No newline at end of file diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml index daf7593..0b6fb31 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml @@ -16,7 +16,6 @@ @Html.DisplayNameFor(model => model.Order): @Model.Order
@Html.DisplayNameFor(model => model.EnglishTitle): @Model.EnglishTitle
@Html.DisplayNameFor(model => model.RussianTitle): @Model.RussianTitle
- @Html.DisplayNameFor(model => model.Title): @Model.Title
@Html.DisplayNameFor(model => model.Username): @Model.Username
@Html.DisplayNameFor(model => model.Url): @Model.Url
@Html.DisplayNameFor(model => model.CanContactMe): @Html.DisplayFor(model => model.CanContactMe)
diff --git a/MyWebsite/MyWebsite/Models/Badge.cs b/MyWebsite/MyWebsite/Models/Badge.cs index 8762c44..4f1b120 100644 --- a/MyWebsite/MyWebsite/Models/Badge.cs +++ b/MyWebsite/MyWebsite/Models/Badge.cs @@ -1,6 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Globalization; namespace MyWebsite.Models { @@ -10,10 +11,18 @@ namespace MyWebsite.Models [Column(TypeName = "varchar(10)")] [DisplayName("ID")] public string Name { get; set; } - [Column(TypeName = "varchar(100)")] - [Required] + [DisplayName("Caption")] - public string Description { get; set; } + public string Description => CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "ru" && !string.IsNullOrWhiteSpace(RussianDescription) ? RussianDescription : EnglishDescription; + + [Required] + [Column(TypeName = "varchar(50)")] + [DisplayName("Caption (en)")] + public string EnglishDescription { get; set; } + [Column(TypeName = "varchar(50)")] + [DisplayName("Caption (ru)")] + public string RussianDescription { get; set; } + [Column(TypeName = "varchar(20)")] [Required] [DisplayName("Image name")] diff --git a/MyWebsite/MyWebsite/wwwroot/css/Gallery.css b/MyWebsite/MyWebsite/wwwroot/css/Gallery.css index fe2f13f..68071cb 100644 --- a/MyWebsite/MyWebsite/wwwroot/css/Gallery.css +++ b/MyWebsite/MyWebsite/wwwroot/css/Gallery.css @@ -2,7 +2,7 @@ .gallery img { object-fit: cover; - max-height: 300px; + height: 300px; max-width: 100%; margin: 2px; transition: .25s; @@ -19,7 +19,7 @@ { .gallery img { - max-height: none; + height: initial; } .gallery img:hover