Theodor-Springmann-Stiftung/hamann-ausgabe-core
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/hamann-ausgabe-core.git synced 2025-10-29 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Font, Refactor of Layout, Expanded <link> Tags on search

Browse Source
This commit is contained in:
Simon Martens
2022-11-10 01:56:00 +01:00
parent e97103e7d9
commit 4f3581ee6a
36 changed files with 185 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
HaWeb/Views/HKB/Dynamic/Suche.cshtml
View File

@@ -15,14 +15,19 @@
@if (Model.ActiveSearch != null) {
<div class="ha-activefilterinfo">
@if (Model.SearchType == "letters") {
<span>Biefe, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
<span><span class="">Briefe</span>, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
}
@if (Model.SearchType == "register") {
<span>Registereinträge, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
<a class="ha-reversefilter" asp-controller="Register" asp-action="Allgemein">← Registerübersicht</a><span> / </span>
@if (Model.ActivePage == 0) {
<span><span class="">Registereinträge</span>, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
<a class="ha-reversefilter" asp-controller="Register" asp-action="Allgemein">← Registerübersicht</a><span> / </span>
} else {
<span><span class="">Bibliografische Einträge</span>, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
<a class="ha-reversefilter" asp-controller="Register" asp-action="Forschung">← Forschungsbibliographie</a><span> / </span>
}
}
@if (Model.SearchType == "marginals") {
<span>Stellenkommentare, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
<span><span class="">Stellenkommentare</span>, die »@Model.ActiveSearch« enthalten.&emsp;</span><br>
}
<a class="ha-reversefilter" asp-controller="Index" asp-action="Index">← Briefübersicht</a>
</div>
@@ -130,5 +135,16 @@
</div>
}
@if (Model.SearchResultType == SearchResultType.NotFound) {
<div class="ha-commentlist">
Keine Treffer für »@Model.ActiveSearch«.
</div>
}
@if (Model.SearchResultType == SearchResultType.InvalidSearchTerm) {
<div class="ha-commentlist">
»@Model.ActiveSearch« ist ein ungültiger Suchbegriff. Die Suche darf nicht leer sein und nicht ausschließlich aus Spatien bestehen.
</div>
}
</div>
</div>

4
HaWeb/Views/Shared/_FileListForm.cshtml
View File

@@ -49,6 +49,7 @@
}
</fieldset>
@section JavaScript {
<script>
const USESubmit = async function (oFormElement, file = null) {
let fd = new FormData(oFormElement);
@@ -80,4 +81,5 @@
document.getElementById("ha-filelistoutput").textContent = e;
})
}
</script>
</script>
}

36
HaWeb/Views/Shared/_HKBLayout.cshtml
View File

@@ -2,28 +2,7 @@
<html lang="de" id="top">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="@ViewData["SEODescription"]">
<title>@ViewData["Title"]</title>
<!-- crossorigin is a workaround to prevent double downloading bugs in chrome -->
<!-- also, the graphite versions of the font are available for use:
<link rel="preload" href="/fonts/LinLibertine_R_G.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinBiolinum_R_G.ttf" as="font" crossorigin/>
-->
<link rel="preload" href="/css/output.css" as="style" asp-append-version="true"/>
<link rel="preload" href="/img/subtlenet2.png" as="image" />
<link rel="preload" href="/fonts/LinBiolinum_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RI.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RB.woff" as="font" crossorigin/>
<link rel="stylesheet" href="/css/output.css" asp-append-version="true" />
<script src="~/js/site.js" asp-append-version="true"></script>
@await Html.PartialAsync("/Views/Shared/_Head.cshtml")
</head>
<body class="w-full ">
@@ -38,17 +17,8 @@
@await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
</div>
</div>
<a class="ha-scrollbutton" id="ha-scrollbutton">
<svg class="ha-scrollbuttonarrow" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" stroke-width="2" d="M5 11l7-7 7 7M5 19l7-7 7 7" />
</svg>
</a>
@await Html.PartialAsync("/Views/Shared/_ScrollButton.cshtml")
</div>
@RenderSection("Scripts", required: false)
<environment exclude="Development">
@await Html.PartialAsync("/Views/Shared/_Javascript.cshtml")
</environment>
@await RenderSectionAsync("JavaScript", false)
</body>
</html>

7
HaWeb/Views/Shared/_HKBMenu.cshtml
View File

@@ -1,6 +1,7 @@
@{
var showCredits = ViewData["showCredits"] == "true" ? true : false;
}
<header class="sticky w-100 font-serif mb-6">
<nav class="flex flex-row w-100 bg-slate-50 border-t-[5px] border-gray-300 dark:shadow-xl dark:border-gray-900 py-3 px-3 desktop:px-8 flex-wrap">
<a asp-controller="Index" asp-action="Index" class="text-xl xl:text-3xl grow-0 shrink-0 text-black hover:text-black">
@@ -30,7 +31,7 @@
</button>
</div>
<div class="ha-topnav " id="ha-topnav">
<a asp-controller="Index" asp-action="Index">
<a class="ha-active-default" asp-controller="Index" asp-action="Index">
Suche & Briefauswahl
</a>
<a asp-controller="Briefe" asp-action="Index">
@@ -60,10 +61,10 @@
</div>
</div>
</nav>
@if(showCredits)
@* @if(showCredits)
{
<div class="desktop:block hidden w-100 bg-slate-50 dark:pt-2 dark:pb-2 dark:bg-slate-800 pb-3 px-3 desktop:px-8 overflow-hidden whitespace-nowrap text-ellipsis">
<a href="/Edition/Mitwirkende">Hg. v. Leonard Keidel und Janina Reibold, auf Grundlage der Vorarbeiten Arthur Henkels, unter Mitarbeit von G. Babelotzky, K. Bucher, Ch. Großmann, C.F. Haak, L. Klopfer, J. Knüchel, I. Langkabel und S. Martens (Heidelberg 2020ff.)</a>
</div>
}
} *@
</header>

36
HaWeb/Views/Shared/_HKWLayout.cshtml
View File

@@ -2,28 +2,7 @@
<html lang="de" id="top">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="@ViewData["SEODescription"]">
<title>@ViewData["Title"]</title>
<!-- crossorigin is a workaround to prevent double downloading bugs in chrome -->
<!-- also, the graphite versions of the font are available for use:
<link rel="preload" href="/fonts/LinLibertine_R_G.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinBiolinum_R_G.ttf" as="font" crossorigin/>
-->
<link rel="preload" href="/css/output.css" as="style" asp-append-version="true"/>
<link rel="preload" href="/img/subtlenet2.png" as="image" />
<link rel="preload" href="/fonts/LinBiolinum_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RI.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RB.woff" as="font" crossorigin/>
<link rel="stylesheet" href="/css/output.css" asp-append-version="true" />
<script src="~/js/site.js" asp-append-version="true"></script>
@await Html.PartialAsync("/Views/Shared/_Head.cshtml")
</head>
<body class="w-full ">
@@ -38,17 +17,8 @@
@await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
</div>
</div>
<a class="ha-scrollbutton" id="ha-scrollbutton">
<svg class="ha-scrollbuttonarrow" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" stroke-width="2" d="M5 11l7-7 7 7M5 19l7-7 7 7" />
</svg>
</a>
@await Html.PartialAsync("/Views/Shared/_ScrollButton.cshtml")
</div>
@RenderSection("Scripts", required: false)
<environment exclude="Development">
@await Html.PartialAsync("/Views/Shared/_Javascript.cshtml")
</environment>
@await RenderSectionAsync("JavaScript", false)
</body>
</html>

26
HaWeb/Views/Shared/_Head.cshtml Normal file
View File

@@ -0,0 +1,26 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="@ViewData["SEODescription"]">
<title>@ViewData["Title"]</title>
<!-- crossorigin is a workaround to prevent double downloading bugs in chrome -->
<!-- also, the graphite versions of the font are available for use:
<link rel="preload" href="/fonts/LinLibertine_R_G.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinBiolinum_R_G.ttf" as="font" crossorigin/>
-->
<link rel="preload" href="/css/output.css" as="style" asp-append-version="true"/>
<link rel="preload" href="/img/subtlenet2.png" as="image" />
<link rel="preload" href="/fonts/LinBiolinum_Rah.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_Rah.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RIah.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RBah.ttf" as="font" crossorigin/>
<link rel="stylesheet" href="/css/output.css" asp-append-version="true" />
<script src="~/js/site.js" asp-append-version="true"></script>
<environment exclude="Development">
@await Html.PartialAsync("/Views/Shared/_Javascript.cshtml")
</environment>

38
HaWeb/Views/Shared/_HomeLayout.cshtml
View File

@@ -1,29 +1,8 @@
<!DOCTYPE html>
<html lang="de" id="top">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@* TODO: Description für die Startseite *@
<meta name="description" content="">
<title>@ViewData["Title"]</title>
<!-- crossorigin is a workaround to prevent double downloading bugs in chrome -->
<!-- also, the graphite versions of the font are available for use:
<link rel="preload" href="/fonts/LinLibertine_R_G.ttf" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinBiolinum_R_G.ttf" as="font" crossorigin/>
-->
<link rel="preload" href="/css/output.css" as="style" asp-append-version="true"/>
<link rel="preload" href="/img/subtlenet2.png" as="image" />
<link rel="preload" href="/fonts/LinBiolinum_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_R.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RI.woff" as="font" crossorigin/>
<link rel="preload" href="/fonts/LinLibertine_RB.woff" as="font" crossorigin/>
<link rel="stylesheet" href="/css/output.css" asp-append-version="true" />
<script src="~/js/site.js" asp-append-version="true"></script>
@await Html.PartialAsync("/Views/Shared/_Head.cshtml")
</head>
<body class="w-full ">
@@ -50,17 +29,8 @@
@await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
</div>
</div>
<a class="ha-scrollbutton" id="ha-scrollbutton">
<svg class="ha-scrollbuttonarrow" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" stroke-width="2" d="M5 11l7-7 7 7M5 19l7-7 7 7" />
</svg>
</a>
@await Html.PartialAsync("/Views/Shared/_ScrollButton.cshtml")
</div>
@RenderSection("Scripts", required: false)
<environment exclude="Development">
@await Html.PartialAsync("/Views/Shared/_Javascript.cshtml")
</environment>
@await RenderSectionAsync("JavaScript", false)
</body>
</html>

5
HaWeb/Views/Shared/_ScrollButton.cshtml Normal file
View File

@@ -0,0 +1,5 @@
<a class="ha-scrollbutton" id="ha-scrollbutton">
<svg class="ha-scrollbuttonarrow" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" stroke-width="2" d="M5 11l7-7 7 7M5 19l7-7 7 7" />
</svg>
</a>