diff --git a/HaWeb/Controllers/BriefeContoller.cs b/HaWeb/Controllers/BriefeContoller.cs index 0ada1f2..b681e49 100644 --- a/HaWeb/Controllers/BriefeContoller.cs +++ b/HaWeb/Controllers/BriefeContoller.cs @@ -53,9 +53,11 @@ public class Briefecontroller : Controller ViewData["Filename"] = "HKB_" + meta.Autopsic + ".pdf"; // Model creation - var model = new BriefeViewModel(this.id, index, generateMetaViewModel(meta)); - if (nextmeta != null) model.MetaData.Next = (generateMetaViewModel(nextmeta), url + nextmeta.Autopsic); - if (prevmeta != null) model.MetaData.Prev = (generateMetaViewModel(prevmeta), url + prevmeta.Autopsic); + var hasMarginals = false; + if (marginals != null && marginals.Any()) hasMarginals = true; + var model = new BriefeViewModel(this.id, index, generateMetaViewModel(meta, hasMarginals)); + if (nextmeta != null) model.MetaData.Next = (generateMetaViewModel(nextmeta, false), url + nextmeta.Autopsic); + if (prevmeta != null) model.MetaData.Prev = (generateMetaViewModel(prevmeta, false), url + prevmeta.Autopsic); if (hands != null && hands.Any()) model.ParsedHands = HaWeb.HTMLHelpers.BriefeHelpers.CreateHands(_lib, hands); if (editreasons != null && editreasons.Any()) model.ParsedEdits = HaWeb.HTMLHelpers.BriefeHelpers.CreateEdits(_lib, _readerService, editreasons); if (tradition != null && !String.IsNullOrWhiteSpace(tradition.Element)) model.ParsedTradition = HaWeb.HTMLHelpers.BriefeHelpers.CreateTraditions(_lib, _readerService, marginals, tradition); @@ -71,11 +73,11 @@ public class Briefecontroller : Controller return Redirect("/Error404"); } - private BriefeMetaViewModel generateMetaViewModel(Meta meta) + private BriefeMetaViewModel generateMetaViewModel(Meta meta, bool hasMarginals) { var senders = meta.Senders.Select(x => _lib.Persons[x].Name) ?? new List(); var recivers = meta.Receivers.Select(x => _lib.Persons[x].Name) ?? new List(); - return new BriefeMetaViewModel(meta) + return new BriefeMetaViewModel(meta, hasMarginals) { ParsedSenders = HTMLHelpers.StringHelpers.GetEnumerationString(senders), ParsedReceivers = HTMLHelpers.StringHelpers.GetEnumerationString(recivers) diff --git a/HaWeb/Models/BriefeMetaViewModel.cs b/HaWeb/Models/BriefeMetaViewModel.cs index 54b7587..e31c100 100644 --- a/HaWeb/Models/BriefeMetaViewModel.cs +++ b/HaWeb/Models/BriefeMetaViewModel.cs @@ -4,18 +4,19 @@ using HaDocument.Models; public class BriefeMetaViewModel { public Meta Meta { get; private set; } - public bool ShowSurroundingLetterLinks { get; private set; } - public bool ShowPDFButton { get; private set; } + public bool HasMarginals { get; private set; } public string? ParsedSenders { get; set; } public string? ParsedReceivers { get; set; } + public string? ParsedZHString { get; set; } public (BriefeMetaViewModel, string)? Next { get; set; } public (BriefeMetaViewModel, string)? Prev { get; set; } - public BriefeMetaViewModel(Meta meta) + public BriefeMetaViewModel(Meta meta, bool hasMarginals) { Meta = meta; + HasMarginals = hasMarginals; } } \ No newline at end of file diff --git a/HaWeb/README.md b/HaWeb/README.md index e192dc8..09198a3 100644 --- a/HaWeb/README.md +++ b/HaWeb/README.md @@ -8,6 +8,7 @@ Veränderungenen in der Funktionalität für den Benutzer - Suche im Brieftext wird gefixt - Seite wird zugänglich für Menschen mit eingeschränktem Sehvermögen / Screenreadern +- Bibellinks in Bibelkommentaren Veränderungen in der Funktionalität für die Forscher - Online-Syntaxcheck für XML-Dateien @@ -23,4 +24,7 @@ Veränderungen im Code - Auslagerungen einzelner Einstellungen in Einstellungsdateien - Code open source zugänglich machen? -Für diese Anpassungen sind in etwa 3-4 Monate eingeplant. \ No newline at end of file +Für diese Anpassungen sind in etwa 3-4 Monate eingeplant. + +- Ladezeiten (???) +- PDF-Parser \ No newline at end of file diff --git a/HaWeb/Views/Briefe/Index.cshtml b/HaWeb/Views/Briefe/Index.cshtml index 3d7bc91..13eebc0 100644 --- a/HaWeb/Views/Briefe/Index.cshtml +++ b/HaWeb/Views/Briefe/Index.cshtml @@ -4,8 +4,8 @@ @await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", Model.MetaData)
- Brieftext - Überlieferung & Textkritik + Brieftext + Überlieferung & Textkritik PDF
@@ -23,18 +23,28 @@ ▶ @Model.MetaData.Next.Value.Item1.Meta.Autopsic - } + }
}
-
+
@if (Model.ParsedText != null) { @Html.Raw(@Model.ParsedText) }
+
+ @if (Model.ParsedTradition != null) { + @Html.Raw(Model.ParsedTradition) + } + @if (Model.ParsedEdits != null) { + @foreach (var edit in Model.ParsedEdits) { + @Html.Raw(edit) + } + } +
diff --git a/HaWeb/Views/Shared/_LetterHead.cshtml b/HaWeb/Views/Shared/_LetterHead.cshtml index 97f7f6d..7e4be7f 100644 --- a/HaWeb/Views/Shared/_LetterHead.cshtml +++ b/HaWeb/Views/Shared/_LetterHead.cshtml @@ -8,11 +8,77 @@
-
- @Model.Meta.Date +
+
+ @Model.Meta.Date +
+ @if (Model.Meta.hasOriginal != HaDocument.Models.OptionalBool.True) { +
+
+ Orig +
+
+ Original verschollen +
+
+ } + else { +
+
+ Orig +
+
+ Original vorhanden +
+
+ } + + @if (Model.Meta.isProofread != HaDocument.Models.OptionalBool.True) { +
+
+ geprüft +
+
+ Nicht textkritisch geprüft +
+
+ } + else { +
+
+ geprüft +
+
+ Textkritisch geprüft +
+
+ } + + @if (Model.HasMarginals) { +
+
+ Komm +
+
+ Mit Stellenkommentar +
+
+ }
- @Model.ParsedSenders → @Model.ParsedReceivers + @if (Model.Meta.isDraft == HaDocument.Models.OptionalBool.True) { + @Model.ParsedSenders +
+ ↛ +
+ Entwurf +
+
+ @Model.ParsedReceivers + } + else { + @Model.ParsedSenders → @Model.ParsedReceivers + }
diff --git a/HaWeb/Views/_ViewImports.cshtml b/HaWeb/Views/_ViewImports.cshtml index daaaf61..60be57f 100644 --- a/HaWeb/Views/_ViewImports.cshtml +++ b/HaWeb/Views/_ViewImports.cshtml @@ -1,4 +1,5 @@ @using HaWeb @using HaWeb.Models @using HaWeb.Settings +@using HaDocument.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/HaWeb/wwwroot/css/output.css b/HaWeb/wwwroot/css/output.css index a8deafc..a671a03 100644 --- a/HaWeb/wwwroot/css/output.css +++ b/HaWeb/wwwroot/css/output.css @@ -1068,13 +1068,84 @@ body { flex-direction: column; } -.ha-letterhead .ha-metadata .ha-metadatarows .ha-metadatadate { +.ha-letterhead .ha-metadata .ha-metadataupperrow { display: flex; + flex-direction: row; line-height: 1.375; +} + +.ha-letterhead .ha-metadata .ha-metadatarows .ha-metadataupperrow .ha-metadatadate { + display: flex; font-variant-numeric: oldstyle-nums; font-variant-caps: petite-caps; } +.ha-letterhead .ha-metadata .ha-tooltip { + position: relative; + display: inline-block; + cursor: default; + align-self: center; +} + +.ha-letterhead .ha-metadata .ha-tooltiptext { + position: absolute; + z-index: 10; + border-radius: 0.25rem; + --tw-bg-opacity: 1; + background-color: rgb(241 245 249 / var(--tw-bg-opacity)); + padding-left: 0.25rem; + padding-right: 0.25rem; + padding-top: 0.125rem; + padding-bottom: 0.125rem; + text-align: center; + font-size: 0.875rem; + line-height: 1.25rem; + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.ha-letterhead .ha-metadata .ha-tooltiptext::after { + position: absolute; + top: 100%; + left: 50%; +} + +.ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill { + margin-left: 0.5rem; + border-radius: 0.25rem; + --tw-bg-opacity: 1; + background-color: rgb(241 245 249 / var(--tw-bg-opacity)); + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.1rem; + padding-bottom: 0.1rem; + font-size: 0.75rem; + line-height: 1rem; + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross { + position: relative; + display: inline-block; +} + +.ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::before { + border-bottom-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(75 85 99 / var(--tw-border-opacity)); +} + +.ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::before, .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::after { + position: absolute; + right: 0px; + top: 50%; + height: 0px; + width: 100%; +} + .ha-letterhead .ha-metadata .ha-metadatarows .hametadatapersons { display: flex; line-height: 1.375; @@ -1115,6 +1186,7 @@ body { .ha-letterheader .ha-lettertabs a { margin-right: 0.25rem; display: inline-block; + cursor: pointer; padding-left: 0.25rem; padding-right: 0.25rem; --tw-text-opacity: 1; @@ -1133,6 +1205,7 @@ body { } .ha-letterheader .ha-lettertabs a.active { + pointer-events: none; border-bottom-width: 2px; --tw-border-opacity: 1; border-color: rgb(226 232 240 / var(--tw-border-opacity)); @@ -1191,6 +1264,10 @@ body { line-height: 1.48; } +.hide { + display: none; +} + .ha-lettertext div { display: inline; } @@ -2081,6 +2158,32 @@ body { color:#000000; } +.ha-tooltip .ha-tooltiptext { + visibility: hidden; + width: 160px; + bottom: 155%; + left: 50%; + margin-left: -80px; + opacity: 0; + transition: opacity 0.3s; +} + +.ha-tooltip .ha-tooltiptext::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: rgb(226 232 240 / var(--tw-bg-opacity)) transparent transparent transparent; +} + +.ha-tooltip:hover .ha-tooltiptext { + visibility: visible; + opacity: 1; +} + .ha-open-btn-collapsed-box::before { content: '\200E+'; font-weight: 900; @@ -2664,6 +2767,15 @@ body { min-width: 8.333%; } +.ha-cross::before, .ha-cross::after { + content: ''; + top: 50%; +} + +.ha-cross::before { + transform: skewY(-27deg); +} + /* Not possible otherwise, overwrites javascript set style values, which cant be defined before render */ /* @media (max-width: 1190px) { diff --git a/HaWeb/wwwroot/css/site.css b/HaWeb/wwwroot/css/site.css index 41a4ffe..8197931 100644 --- a/HaWeb/wwwroot/css/site.css +++ b/HaWeb/wwwroot/css/site.css @@ -327,14 +327,52 @@ @apply flex flex-col } - .ha-letterhead .ha-metadata .ha-metadatarows .ha-metadatadate { - @apply flex caps-petite leading-snug numeric-mediaeval + .ha-letterhead .ha-metadata .ha-metadataupperrow { + @apply flex flex-row leading-snug + } + + .strikethrough { + @apply line-through + } + + .ha-letterhead .ha-metadata .ha-metadatarows .ha-metadataupperrow .ha-metadatadate { + @apply flex caps-petite numeric-mediaeval + } + + .ha-letterhead .ha-metadata .ha-tooltip { + @apply self-center cursor-default inline-block relative + } + + .ha-letterhead .ha-metadata .ha-tooltiptext { + @apply bg-slate-100 rounded text-sm px-1 py-0.5 absolute z-10 text-center shadow + } + + .ha-letterhead .ha-metadata .ha-tooltiptext::after { + @apply absolute top-full left-1/2 + } + + .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill { + @apply text-xs bg-slate-100 rounded px-2 ml-2 py-[0.1rem] shadow + } + + .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross { + @apply relative inline-block + } + + .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::before { + @apply border-b-2 border-gray-600 + } + + .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::before, + .ha-letterhead .ha-metadata .ha-metadataupperrow .ha-pill .ha-cross::after { + @apply w-full h-0 absolute right-0 top-1/2 } .ha-letterhead .ha-metadata .ha-metadatarows .hametadatapersons { @apply flex leading-snug } + /* Classes for Letter View */ .ha-letterheader { @@ -350,11 +388,11 @@ } .ha-letterheader .ha-lettertabs a { - @apply inline-block px-1 mr-1 md:mr-3 text-slate-700 hover:text-slate-900 + @apply inline-block px-1 mr-1 md:mr-3 text-slate-700 hover:text-slate-900 cursor-pointer } .ha-letterheader .ha-lettertabs a.active { - @apply border-b-2 border-slate-200 text-hamannHighlight + @apply pointer-events-none border-b-2 border-slate-200 text-hamannHighlight } .ha-letterheader .ha-lettertabs a:first { @@ -381,6 +419,10 @@ @apply shrink-0 border-l-2 ml-12 px-4 pt-4 relative font-serif leading-[1.48] pb-7 bg-slate-50 } + .hide { + @apply hidden + } + .ha-rightsidebar { @apply shrink-0 grow basis-1/3 } @@ -764,6 +806,33 @@ body { color:#000000; } +.ha-tooltip .ha-tooltiptext { + visibility: hidden; + width: 160px; + bottom: 155%; + left: 50%; + margin-left: -80px; + opacity: 0; + transition: opacity 0.3s; + } + + .ha-tooltip .ha-tooltiptext::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: rgb(226 232 240 / var(--tw-bg-opacity)) transparent transparent transparent; + } + + .ha-tooltip:hover .ha-tooltiptext { + visibility: visible; + opacity: 1; + } + + .ha-open-btn-collapsed-box::before { content: '\200E+'; @@ -1348,6 +1417,15 @@ body { } +.ha-cross::before, .ha-cross::after { + content: ''; + } + + .ha-cross::before { + -webkit-transform: skewY(-27deg); + transform: skewY(-27deg); + } + /* Not possible otherwise, overwrites javascript set style values, which cant be defined before render */ /* @media (max-width: 1190px) { diff --git a/HaWeb/wwwroot/js/site.js b/HaWeb/wwwroot/js/site.js index a47e74e..3fd9223 100644 --- a/HaWeb/wwwroot/js/site.js +++ b/HaWeb/wwwroot/js/site.js @@ -155,6 +155,37 @@ const overlappingcollapsebox = function (selector, hoverfunction) { } }; +const showhidebutton = function (buttonid, prevbuttonid, hideid, showid, starthidden) { + let button = document.getElementById(buttonid); + let prevbtn = document.getElementById(prevbuttonid); + if (starthidden) { + let hiddenelement = document.getElementById(hideid); + let shownelement = document.getElementById(showid); + if (hiddenelement !== null) { + hiddenelement.classList.add("hide"); + } + if (shownelement !== null) { + shownelement.classList.remove("hide"); + } + prevbtn.classList.remove("active"); + button.classList.add("active"); + } + if(button !== null) { + button.addEventListener("click", function() { + let hiddenelement = document.getElementById(hideid); + let shownelement = document.getElementById(showid); + if (hiddenelement !== null) { + hiddenelement.classList.add("hide"); + } + if (shownelement !== null) { + shownelement.classList.remove("hide"); + } + prevbtn.classList.remove("active"); + button.classList.add("active"); + }) + } +} + window.addEventListener("load", function () { if ( document.getElementById("openmenubutton") != null && @@ -174,4 +205,6 @@ window.addEventListener("load", function () { overlappingcollapsebox(".ha-neuzeit .ha-letlinks", true); overlappingcollapsebox(".ha-forschung .ha-letlinks", true); overlappingcollapsebox(".ha-lettertext .ha-marginalbox", true); + showhidebutton("ha-lettertextbtn", "ha-additionsbtn", "ha-additions", "ha-lettertext", true); + showhidebutton("ha-additionsbtn", "ha-lettertextbtn", "ha-lettertext", "ha-additions", false); });