From 3eaa97390dc7767869f4c425c78cd5cc1b58f4e1 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Fri, 11 Nov 2022 18:10:45 +0100 Subject: [PATCH] Fixed little things --- HaWeb/Controllers/BriefeContoller.cs | 2 +- HaWeb/SearchHelpers/SearchRules.cs | 16 +++++++++------- HaWeb/Views/HKB/Dynamic/Briefe.cshtml | 10 +++++++++- HaWeb/Views/Shared/_Javascript.cshtml | 13 +++++++------ HaWeb/wwwroot/css/letter.css | 2 +- HaWeb/wwwroot/css/output.css | 2 +- HaWeb/wwwroot/css/shared.css | 7 ++++++- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/HaWeb/Controllers/BriefeContoller.cs b/HaWeb/Controllers/BriefeContoller.cs index ff723cb..ae12d7d 100644 --- a/HaWeb/Controllers/BriefeContoller.cs +++ b/HaWeb/Controllers/BriefeContoller.cs @@ -51,7 +51,7 @@ public class Briefecontroller : Controller { ViewData["SEODescription"] = "Johann Georg Hamann: Kommentierte Briefausgabe. Brief " + id.ToLower(); ViewData["Filename"] = "HKB_" + meta.Autopsic + ".pdf"; if (!string.IsNullOrWhiteSpace(search)) { - ViewData["Mark"] = "search"; + ViewData["Mark"] = search; } // Model creation diff --git a/HaWeb/SearchHelpers/SearchRules.cs b/HaWeb/SearchHelpers/SearchRules.cs index 51e6f8a..f3379ee 100644 --- a/HaWeb/SearchHelpers/SearchRules.cs +++ b/HaWeb/SearchHelpers/SearchRules.cs @@ -40,13 +40,15 @@ public class SearchRules { } sb.Remove(0, sb.Length - sw.Length); } - } else { - if (t.ToUpperInvariant().Contains(sw)) { - if (reader.State.Results == null) - reader.State.Results = new List<(string Page, string Line, string Identifier)>(); - reader.State.Results.Add((reader.CurrentPage, reader.CurrentLine, reader.State.CurrentIdentifier)); - } - } + } + // Enable, if zou want unparsed context tto be conidered when searching. + // else { + // if (t.ToUpperInvariant().Contains(sw)) { + // if (reader.State.Results == null) + // reader.State.Results = new List<(string Page, string Line, string Identifier)>(); + // reader.State.Results.Add((reader.CurrentPage, reader.CurrentLine, reader.State.CurrentIdentifier)); + // } + // } } }) }; diff --git a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml index c1ad763..88c2484 100644 --- a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml @@ -154,4 +154,12 @@ } - \ No newline at end of file + + + +@* + *@ \ No newline at end of file diff --git a/HaWeb/Views/Shared/_Javascript.cshtml b/HaWeb/Views/Shared/_Javascript.cshtml index c71b651..0a93d56 100644 --- a/HaWeb/Views/Shared/_Javascript.cshtml +++ b/HaWeb/Views/Shared/_Javascript.cshtml @@ -4,9 +4,10 @@ @if(ViewData.ContainsKey("Mark")) { }