From 7fc0d22bd90d7d06aee173341eb9d0d5ed44e739 Mon Sep 17 00:00:00 2001 From: Aleksa Marinkovic Date: Tue, 17 Oct 2023 16:06:21 +0200 Subject: [PATCH 1/2] KAN-35 : fixed image and text --- .vs/VSWorkspaceState.json | 7 +++++++ .vs/sloboda-nema-cenu-website/v17/.wsuo | Bin 0 -> 38400 bytes .../blocklist/Components/imageAndTextV2.cshtml | 13 ++++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/sloboda-nema-cenu-website/v17/.wsuo diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..3983b7d --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\binding.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/sloboda-nema-cenu-website/v17/.wsuo b/.vs/sloboda-nema-cenu-website/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..8c2f82f0de28b3fd6f7e6de81da90ecb3501daba GIT binary patch literal 38400 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 @item.Description

-
- @item.ShortText -
- Triangle shape + @if (!string.IsNullOrWhiteSpace(item.ShortText)) + { +
+ @item.ShortText +
+ Triangle shape +
-
+ }
From d8e7025a7768edb0247b5fb66c0f97250c4ee8bd Mon Sep 17 00:00:00 2001 From: Aleksa Marinkovic Date: Tue, 17 Oct 2023 16:16:21 +0200 Subject: [PATCH 2/2] KAN-41 : fixed all date formats --- .../Views/ActivitiesPage.cshtml | 19 ++++++++++++++++++- .../Components/relatedContent.cshtml | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml index 9dfca86..a96fef8 100644 --- a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml +++ b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/ActivitiesPage.cshtml @@ -4,6 +4,8 @@ @{ Layout = "_Layout.cshtml"; var children = Model.Children().OrderByDescending(d => d.Date); + + } @@ -31,11 +33,26 @@
@foreach (var item in children){ + + string dayStr = item.Date.Day.ToString(); + if (dayStr.Length == 1) + { + dayStr = "0" + dayStr; + } + + string monthStr = item.Date.Month.ToString(); + if (monthStr.Length == 1) + { + monthStr = "0" + monthStr; + } + + string yearStr = item.Date.Year.ToString(); +
Card img
- @item.Date.ToString("dd/MM/yyyy") + @dayStr/@monthStr/@yearStr @item.Category
diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml index cd395bd..87006f2 100644 --- a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml +++ b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/relatedContent.cshtml @@ -16,11 +16,26 @@ @foreach(var content in items) { + + string dayStr = content.Date.Day.ToString(); + if (dayStr.Length == 1) + { + dayStr = "0" + dayStr; + } + + string monthStr = content.Date.Month.ToString(); + if (monthStr.Length == 1) + { + monthStr = "0" + monthStr; + } + + string yearStr = content.Date.Year.ToString(); +
Card img
- @content.Date.ToString("dd/mm/yyyy") + @dayStr/@monthStr/@yearStr @content.Category