From 9be7e164cb68e6eb2d72834441ffd4a9bb760f2d Mon Sep 17 00:00:00 2001 From: skrawus Date: Sun, 7 Jul 2024 13:04:21 +0200 Subject: [PATCH] Fix layout of AdDetails and change some unaccurate translations --- TutorLizard.Web/Resources/Home.Designer.cs | 18 ++++++++++ TutorLizard.Web/Resources/Home.en.resx | 6 ++++ TutorLizard.Web/Resources/Home.resx | 6 ++++ TutorLizard.Web/Resources/Student.Designer.cs | 2 +- TutorLizard.Web/Resources/Student.resx | 2 +- .../AdRequestStatusForAd/Default.cshtml | 33 +++++++++++-------- TutorLizard.Web/Views/Shared/_Layout.cshtml | 4 +-- 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/TutorLizard.Web/Resources/Home.Designer.cs b/TutorLizard.Web/Resources/Home.Designer.cs index 02a951d..62c6fd7 100644 --- a/TutorLizard.Web/Resources/Home.Designer.cs +++ b/TutorLizard.Web/Resources/Home.Designer.cs @@ -105,6 +105,15 @@ public static string Data { } } + /// + /// Looks up a localized string similar to Funkcje. + /// + public static string Functions { + get { + return ResourceManager.GetString("Functions", resourceCulture); + } + } + /// /// Looks up a localized string similar to Strona startowa. /// @@ -141,6 +150,15 @@ public static string ScheduleItems { } } + /// + /// Looks up a localized string similar to Przeglądaj. + /// + public static string Search { + get { + return ResourceManager.GetString("Search", resourceCulture); + } + } + /// /// Looks up a localized string similar to Uczeń. /// diff --git a/TutorLizard.Web/Resources/Home.en.resx b/TutorLizard.Web/Resources/Home.en.resx index d4af504..921e5dd 100644 --- a/TutorLizard.Web/Resources/Home.en.resx +++ b/TutorLizard.Web/Resources/Home.en.resx @@ -132,6 +132,9 @@ Data + + Functions + Home @@ -144,6 +147,9 @@ Schedule Items + + Search + Student diff --git a/TutorLizard.Web/Resources/Home.resx b/TutorLizard.Web/Resources/Home.resx index f0464dc..74a6150 100644 --- a/TutorLizard.Web/Resources/Home.resx +++ b/TutorLizard.Web/Resources/Home.resx @@ -132,6 +132,9 @@ Dane + + Funkcje + Strona startowa @@ -144,6 +147,9 @@ Terminy + + Przeglądaj + Uczeń diff --git a/TutorLizard.Web/Resources/Student.Designer.cs b/TutorLizard.Web/Resources/Student.Designer.cs index e5d369b..e3d5de0 100644 --- a/TutorLizard.Web/Resources/Student.Designer.cs +++ b/TutorLizard.Web/Resources/Student.Designer.cs @@ -97,7 +97,7 @@ public static string StudentFunction { } /// - /// Looks up a localized string similar to Przyjęte zgłoszenia. + /// Looks up a localized string similar to Twoje zgłoszenia. /// public static string YourAdRequests { get { diff --git a/TutorLizard.Web/Resources/Student.resx b/TutorLizard.Web/Resources/Student.resx index 9b84cf0..78839be 100644 --- a/TutorLizard.Web/Resources/Student.resx +++ b/TutorLizard.Web/Resources/Student.resx @@ -130,6 +130,6 @@ Student - Przyjęte zgłoszenia + Twoje zgłoszenia \ No newline at end of file diff --git a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml index fe5dd4a..0defcdf 100644 --- a/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml +++ b/TutorLizard.Web/Views/Shared/Components/AdRequestStatusForAd/Default.cshtml @@ -3,8 +3,8 @@ @if(Model is not null) { -
-

@TutorLizard.Web.Resources.Shared.YourRequest

+
+

@TutorLizard.Web.Resources.Shared.YourRequest

@TutorLizard.Web.Resources.Shared.RequestStatus @if(Model.Status == GetAdRequestStatusResponse.RequestStatus.Accepted) @@ -20,19 +20,24 @@ @TutorLizard.Web.Resources.Shared.RequestRejected } -
Data wysłania: @Model.DateCreated
+
Data wysłania: @Model.DateCreated
-
-
@TutorLizard.Web.Resources.Shared.RequestMessage
-
@Model.Message
-
- @if(Model.ReplyMessage is not null) - { -
-
@TutorLizard.Web.Resources.Shared.RequestTutorResponse
-
@Model.ReplyMessage
-
- } + +
+
+
@TutorLizard.Web.Resources.Shared.RequestMessage
+
@Model.Message
+ + + + @if(Model.ReplyMessage is not null) + { +
@TutorLizard.Web.Resources.Shared.RequestTutorResponse +
@Model.ReplyMessage
+
+ } +
+
@* if (Model.Status == AdRequestStatusResponse.RequestStatus.Pending) { diff --git a/TutorLizard.Web/Views/Shared/_Layout.cshtml b/TutorLizard.Web/Views/Shared/_Layout.cshtml index 50e37e2..c2e182c 100644 --- a/TutorLizard.Web/Views/Shared/_Layout.cshtml +++ b/TutorLizard.Web/Views/Shared/_Layout.cshtml @@ -39,7 +39,7 @@