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 01:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Simon Martens
2022-11-27 17:40:55 +01:00
parent 06e228a5a2
commit ec16c4b02e
8 changed files with 39 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HaWeb/README.md
View File

@@ -96,5 +96,4 @@ KOmmentare verschobem 202 Anhang
935 leeren lettertext löschen
doppel- empfänder sender 876
Evtl finetuning von note
Button für forschungbibliografie
Evtl finetuning von note

29
HaWeb/Views/HKB/Dynamic/Register.cshtml
View File

@@ -24,39 +24,36 @@
: "ha-bibel";
}
<script defer src="/js/register.js" asp-append-version="true"></script>
<script defer src="/js/search.js" asp-append-version="true"></script>
<div class="ha-register">
<div class="@commentClass">
<div class="ha-register-head">
<h1>@Model.Title</h1>
@if (Model.AllowSendIn) {
<div class="ha-register-add">
<a href="mailto:post@hamann-ausgabe.de?subject=Publikation%28en%29%20beitragen">
<div class="ha-register-add-plusbutton">+</div>
<div class="ha-register-add-text">Publikation(en) beitragen</div>
</a>
</div>
}
@if (Model.AllowSearch) {
@if (Model.Category == "neuzeit") {
<form class="ha-searchform" id="ha-searchform" asp-controller="Suche" asp-action="Register" method="get">
<input id="ha-searchformtext" name="search" type="text" placeholder="Suchbegriff"/>
<input type="hidden" name="page" type="text" value="@(Model.Category == "forschung" ? "1" : "0")"/>
<button id="ha-searchformsubmit" type="submit">Durchsuchen</button>
<button id="ha-searchformsubmit" type="submit">Suchen</button>
</form>
} else {
<form class="ha-searchform" id="ha-searchform" asp-controller="Suche" asp-action="Science" method="get">
<input id="ha-searchformtext" name="search" type="text" placeholder="Suchbegriff"/>
<input type="hidden" name="page" type="text" value="@(Model.Category == "forschung" ? "1" : "0")"/>
<button id="ha-searchformsubmit" type="submit">Durchsuchen</button>
<button id="ha-searchformsubmit" type="submit">Suchen</button>
</form>
}
@* <form asp-controller="Suche" asp-action="Index" method="GET" >
<input type="text" name="search" placeholder="Suchbegriff" />
<button type="submit">Suchen</button>
</form> *@
}
@if (Model.AllowSendIn) {
<div class="ha-register-add">
<a href="mailto:post@hamann-ausgabe.de?subject=Publikation%28en%29%20beitragen">
<div class="ha-register-add-plusbutton">
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bookmark"><path d="M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z"></path></svg>
</div>
<div class="ha-register-add-text">Publikation(en) beitragen</div>
</a>
</div>
}
<div class="ha-register-nav" id="ha-register-nav">
<div class="ha-register-left-nav">

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

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html class="h-full w-full" lang="de" id="top">
<html class="h-full w-full overflow-hidden" lang="de" id="top">
<head>
@await Html.PartialAsync("/Views/Shared/_Head.cshtml")

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

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html class="h-full w-full" lang="de" id="top">
<html class="h-full w-full overflow-hidden" lang="de" id="top">
<head>
@await Html.PartialAsync("/Views/Shared/_Head.cshtml")
@@ -7,13 +7,13 @@
<body class="h-full w-full">
<div class="flex flex-col h-full">
@await Html.PartialAsync("/Views/Shared/_HKWMenu.cshtml")
<main role="main" class="mb-6 w-full desktop:max-w-screen-desktop mx-auto grow">
@RenderBody()
</main>
<div class="w-full">
@await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
</div>
@await Html.PartialAsync("/Views/Shared/_HKWMenu.cshtml")
<main role="main" class="mb-6 w-full desktop:max-w-screen-desktop mx-auto grow">
@RenderBody()
</main>
<div class="w-full">
@await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
</div>
</div>
@await Html.PartialAsync("/Views/Shared/_ScrollButton.cshtml")
@await RenderSectionAsync("JavaScript", false)

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

@@ -3,7 +3,9 @@
@if (Model.Letter.HasText) {
@if (Model.Letter.ParsedZHString != null && Model.ShowZHData) {
<div class="ha-tooltip">
<div class="ha-pill">
<div class="ha-pill pr-1.5">
@* <svg class="inline-block mr-1" xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" class="feather feather-book-open"><path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"></path><path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"></path></svg> *@
<svg class="mx-0.5 w-3 h-3 inline relative bottom-[0.1rem] text-slate-500" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"></path></svg>
<span>@Html.Raw(Model.Letter.ParsedZHString)</span>
</div>
</div>

2
HaWeb/wwwroot/css/output.css
View File

File diff suppressed because one or more lines are too long

39
HaWeb/wwwroot/css/register.css
View File

@@ -9,22 +9,6 @@
@apply border-b-2 border-slate-200
}
.ha-register .ha-register-head .ha-register-add a {
@apply rounded border border-hamannSlate-50 hover:shadow-md hover:border-hamannSlate-300
}
.ha-register .ha-register-head .ha-register-add a .ha-register-add-plusbutton {
@apply rounded-l bg-slate-200 border-r border-hamannSlate-50
}
.ha-register .ha-register-head .ha-register-add a:hover .ha-register-add-plusbutton {
@apply border-hamannSlate-300 text-hamannSlate-700
}
.ha-register .ha-register-head .ha-register-add a .ha-register-add-text {
@apply ml-1
}
.ha-register .ha-register-head .ha-register-nav a {
@apply text-slate-700 hover:text-slate-900 dark:text-white dark:hover:text-gray-300
}
@@ -82,20 +66,21 @@
@apply font-bold text-2xl desktop:font-normal desktop:text-5xl mb-6 inline-block
}
.ha-register .ha-register-head .ha-register-add a .ha-register-add-text {
@apply underline decoration-dotted hover:decoration-solid
}
.ha-register .ha-register-head .ha-register-add {
@apply inline-block relative bottom-[0.33rem] ml-2
}
.ha-register .ha-register-head .ha-register-add a {
@apply -mt-4 mb-6 flex flex-row w-fit text-sm font-sans
@apply flex flex-row w-fit text-sm font-sans
}
.ha-register .ha-register-head .ha-register-add a .ha-register-add-plusbutton {
@apply px-2 leading-none text-xl font-bold pb-0.5
}
.ha-register .ha-register-head .ha-register-add a:hover .ha-register-add-plusbutton {
@apply leading-none py-1 font-bold
}
.ha-register .ha-register-head .ha-register-add a .ha-register-add-text {
@@ -103,19 +88,19 @@
}
.ha-register .ha-register-head form {
@apply -mt-1 mb-6 font-sans
@apply -mt-1 mb-1 font-sans py-1 flex flex-row gap-x-2
}
.ha-register .ha-register-head form input {
@apply px-1 border
@apply px-1 border grow-0 min-w-0
}
.ha-register .ha-register-head form button {
@apply px-1 border
@apply px-1 border border-slate-200 hover:border-black disabled:bg-gray-200 disabled:hover:border-slate-200 disabled:text-gray-600
}
.ha-register .ha-register-head .ha-register-nav {
@apply font-sans
@apply font-sans mt-6
}
.ha-register .ha-register-head .ha-register-nav a {

14
HaWeb/wwwroot/js/register.js
View File

@@ -1,14 +0,0 @@
const ACTIVATESEARCHFILTER = function(filter, button) {
let f = filter.value;
if (f === "") {
button.disabled = true;
return;
}
button.disabled = false;
}
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));