mirror of
https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git
synced 2025-10-30 01:35:32 +00:00
Did a few thinng to fi x small bugs (see readme changes)
This commit is contained in:
schnulller
@@ -13,7 +13,7 @@
|
||||
</noscript>
|
||||
|
||||
<div class="ha-letterheader">
|
||||
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (Model.MetaData, false))
|
||||
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (Model.MetaData, false, false))
|
||||
<div class="ha-letterheadernav">
|
||||
<div class="ha-lettertabs">
|
||||
@if (!String.IsNullOrWhiteSpace(Model.ParsedText))
|
||||
@@ -107,7 +107,7 @@
|
||||
class="ha-handto">–@hand.Item2</div>
|
||||
}
|
||||
</td>
|
||||
<td class="ha-handperson">@hand.Item3</td>
|
||||
<td class="ha-handperson">@Html.Raw(@hand.Item3)</td>
|
||||
</tr>
|
||||
}
|
||||
</table>
|
||||
|
||||
@@ -37,10 +37,9 @@
|
||||
</div>
|
||||
}
|
||||
@if (Model.AllowSearch) {
|
||||
<form class="ha-registersearchform" asp-controller="Register" asp-action="Search" asp-route-id="@string.Empty" method="post" >
|
||||
<input class="ha-registersearchtext" type="text" name="search" placeholder="Suchbegriff..." />
|
||||
<input type="hidden" name="category" value="@Model.Category" />
|
||||
<button class="ha-registersearchbutton" type="submit">Suchen</button>
|
||||
<form asp-controller="Register" asp-action="Search" asp-route-id="@string.Empty" method="GET" >
|
||||
<input type="text" name="search" placeholder="Suchbegriff" />
|
||||
<button type="submit">Suchen</button>
|
||||
</form>
|
||||
}
|
||||
<div class="ha-register-nav" id="ha-register-nav">
|
||||
|
||||
@@ -1,95 +1,20 @@
|
||||
@model (BriefeMetaViewModel Letter, bool ShowZHData)
|
||||
@model (BriefeMetaViewModel Letter, bool ShowZHData, bool Compact)
|
||||
|
||||
<div class="ha-letterhead">
|
||||
@if (!Model.Compact) {
|
||||
<div class="ha-letternumber">
|
||||
<div class="ha-letternumberinline">
|
||||
@Model.Letter.Meta.Autopsic
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
<div class="ha-metadata">
|
||||
<div class="ha-metadataupperrow">
|
||||
<div class="ha-metadatadate">
|
||||
@Model.Letter.Meta.Date
|
||||
</div>
|
||||
@if (Model.Letter.HasText) {
|
||||
@if (Model.Letter.ParsedZHString != null && Model.ShowZHData) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span>@Html.Raw(Model.Letter.ParsedZHString)</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else if (Model.Letter.ParsedZHString == null) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill ha-newpill">
|
||||
<span>Neu</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.hasOriginal != HaDocument.Models.OptionalBool.True) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span class="ha-cross">Orig</span>
|
||||
</div>
|
||||
<div class="ha-tooltiptext">
|
||||
Original verschollen
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
Orig
|
||||
</div>
|
||||
<div class="ha-tooltiptext">
|
||||
Original vorhanden
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.isProofread != HaDocument.Models.OptionalBool.True) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span class="ha-cross">geprüft</span>
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Noch nicht textkritisch geprüft
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
geprüft
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Textkritisch geprüft
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.ZH != null && Model.Letter.Meta.ZH.dateChanged) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
neu datiert
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap" style="margin-left: -165px;">
|
||||
Der Brief wurde gegenüber der Ausgabe ZH neu datiert
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.HasMarginals) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
Komm
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Mit Stellenkommentar
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@if (!Model.Compact) {
|
||||
@await Html.PartialAsync("/Views/Shared/_Pills.cshtml", (Model.Letter, Model.ShowZHData))
|
||||
}
|
||||
</div>
|
||||
<div class="ha-metadatapersons">
|
||||
|
||||
82
HaWeb/Views/Shared/_Pills.cshtml
Normal file
82
HaWeb/Views/Shared/_Pills.cshtml
Normal file
@@ -0,0 +1,82 @@
|
||||
@model (BriefeMetaViewModel Letter, bool ShowZHData)
|
||||
|
||||
@if (Model.Letter.HasText) {
|
||||
@if (Model.Letter.ParsedZHString != null && Model.ShowZHData) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span>@Html.Raw(Model.Letter.ParsedZHString)</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else if (Model.Letter.ParsedZHString == null) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill ha-newpill">
|
||||
<span>Neu</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.hasOriginal != HaDocument.Models.OptionalBool.True) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span class="ha-cross">Orig</span>
|
||||
</div>
|
||||
<div class="ha-tooltiptext">
|
||||
Original verschollen
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
Orig
|
||||
</div>
|
||||
<div class="ha-tooltiptext">
|
||||
Original vorhanden
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.isProofread != HaDocument.Models.OptionalBool.True) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
<span class="ha-cross">geprüft</span>
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Noch nicht textkritisch geprüft
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
geprüft
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Textkritisch geprüft
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.Meta.ZH != null && Model.Letter.Meta.ZH.dateChanged) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
neu datiert
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap" style="margin-left: -165px;">
|
||||
Der Brief wurde gegenüber der Ausgabe ZH neu datiert
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (Model.Letter.HasMarginals) {
|
||||
<div class="ha-tooltip">
|
||||
<div class="ha-pill">
|
||||
Komm
|
||||
</div>
|
||||
<div class="ha-tooltiptext whitespace-nowrap">
|
||||
Mit Stellenkommentar
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@@ -34,19 +34,36 @@
|
||||
|
||||
<div class="ha-searchbody">
|
||||
<div class="ha-letterlist">
|
||||
|
||||
@* Letter Loop *@
|
||||
@foreach (var year in Model.Letters) {
|
||||
foreach (var letter in year.LetterList) {
|
||||
<a class="ha-letterlistentry" asp-controller="Briefe" asp-action="Index" asp-route-id="@letter.Meta.Autopsic">
|
||||
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (letter, true))
|
||||
</a>
|
||||
@if (Model.SearchResults != null && Model.SearchResults.ContainsKey(letter.Meta.Index)) {
|
||||
@foreach (var item in Model.SearchResults[letter.Meta.Index])
|
||||
<div class="ha-letterlistentry">
|
||||
<a asp-controller="Briefe" asp-action="Index" asp-route-id="@letter.Meta.Autopsic">
|
||||
<div class="ha-letterlistentryheader">
|
||||
<div class="ha-letterlistautopsic">@letter.Meta.Autopsic</div>
|
||||
<div class="ha-letterlistpills">@await Html.PartialAsync("/Views/Shared/_Pills.cshtml", (letter, true))</div>
|
||||
</div>
|
||||
<div class="ha-letterlistletterdata">
|
||||
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (letter, true, true))
|
||||
</div>
|
||||
</a>
|
||||
|
||||
@if (Model.SearchResults != null && Model.SearchResults.ContainsKey(letter.Meta.Index)) {
|
||||
<div class="ha-letterlistsearchresults">
|
||||
@foreach (var sr in Model.SearchResults[letter.Meta.Index])
|
||||
{
|
||||
<p>@item.Page / @item.Line: @item.Preview</p>
|
||||
<div class="ha-letterlistsearchresult">
|
||||
<div class="ha-searchresultlocation">
|
||||
@sr.Page/@sr.Line
|
||||
</div>
|
||||
<div class="ha-searchresultpreview">
|
||||
@sr.Preview
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
@@ -153,8 +170,8 @@
|
||||
<a class="ha-reversefilter" asp-controller="Suche" asp-action="index">← Auswahl aufheben</a>
|
||||
}
|
||||
</div>
|
||||
<form class="ha-searchform" id="ha-searchform">
|
||||
<input id="ha-searchformtext" type="text" placeholder="Suchbegriff" value="@Model.ActiveSearch"/>
|
||||
<form class="ha-searchform" id="ha-searchform" asp-controller="Suche" asp-action="Index" method="get">
|
||||
<input id="ha-searchformtext" name="search" type="text" placeholder="Suchbegriff" value="@Model.ActiveSearch"/>
|
||||
<button id="ha-searchformsubmit" type="submit">Suchen</button>
|
||||
</form>
|
||||
</div>
|
||||
@@ -168,21 +185,12 @@
|
||||
button.disabled = false;
|
||||
}
|
||||
|
||||
const SUBMITSEARCH = function(filter) {
|
||||
let f = filter.value;
|
||||
window.location.href = "/Suche?search=" + f;
|
||||
}
|
||||
|
||||
window.addEventListener("load", () => {
|
||||
let searchfilter = document.getElementById("ha-searchformtext");
|
||||
let searchsubmitbtn = document.getElementById("ha-searchformsubmit");
|
||||
let searchform = document.getElementById("ha-searchform");
|
||||
ACTIVATESEARCHFILTER(searchfilter, searchsubmitbtn);
|
||||
searchfilter.addEventListener("input", () => ACTIVATESEARCHFILTER(searchfilter, searchsubmitbtn));
|
||||
searchform.addEventListener("submit", (ev) => {
|
||||
ev.preventDefault();
|
||||
SUBMITSEARCH(searchfilter);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user