Merge branch 'main' of github.com:Theodor-Springmann-Stiftung/musenalm

views/routes/beitrag/head.gohtml

@@ -3,8 +3,8 @@
 		Musenalm – {{ .result.Entry.PreferredTitle }},
 		{{ if .result.Content.TitleStmt -}}
 			{{ .result.Content.TitleStmt }}
-		{{ else if .result.Content.Incipit -}}
-			{{ .result.Content.Incipit }}
+		{{ else if .result.Content.IncipitStmt -}}
+			{{ .result.Content.IncipitStmt }}
 		{{ else -}}
 			Nr.
 			{{ .result.Content.MusenalmID }}
@@ -15,8 +15,8 @@
 		content="Almanach: {{ .result.Entry.PreferredTitle }},
 		{{ if .result.Content.TitleStmt -}}
 			{{ .result.Content.TitleStmt }}
-		{{ else if .result.Content.Incipit -}}
-			{{ .result.Content.Incipit }}
+		{{ else if .result.Content.IncipitStmt -}}
+			{{ .result.Content.IncipitStmt }}
 		{{ else -}}
 			Nr.
 			{{ .result.Content.MusenalmID }}

views/routes/body.gohtml

@@ -1,5 +1,5 @@
 {{- $model := . -}}
-<div id="intropageroot">
+<div id="intropageroot" class="!mb-12">
 	<image-reel class="hidden lg:block max-w-full my-8 mx-12 relative" id="imagecontainer">
 		<div class="overflow-hidden flex flex-row justify-between">
 			{{- range $i, $img := $model.bilder -}}
@@ -22,8 +22,8 @@
 		</div>
 	</image-reel>
 
-	<div class="w-full min-h-full mt-8">
-		<div class="text-center relative max-w-screen-xl mx-auto" data-="">
+	<div class="w-full min-h-full mt-8 mb-12">
+		<div class="text-center relative max-w-screen-xl mx-auto">
 			<img
 				src="/assets/musen.png"
 				class="max-w-[28rem] mx-auto lg:absolute left-2/3 top-2"
@@ -43,7 +43,7 @@
 					{{- Safe $model.texte.Abs2 -}}
 				</div>
 			</div>
-			<div class="text-center mt-8 startlinks font-serif text-xl" data-="">
+			<div class="text-center mt-8 startlinks font-serif text-xl">
 				<a href="/redaktion/einfuehrung" class="">Einleitung</a>
 				<div class="inline px-1">|</div>
 				<a href="/reihen" class="font-bold">Alle Bände<i class="ri-arrow-right-double-line"></i></a>

views/routes/personen/components/searchbox.gohtml

@@ -15,7 +15,7 @@
 				placeholder="Suchbegriff"
 				x-model="search"
 				hx-get=""
-				hx-trigger="input[if: this.value.length >= 3] delay:3000ms, keyup[enter, if: this.value.length >= 2]"
+				hx-trigger="input delay:1000ms, keyup[enter]"
 				hx-select="#searchresults"
 				hx-target="#searchresults"
 				hx-swap="outerHTML"

views/routes/redaktion/literatur/body.gohtml

@@ -5,7 +5,7 @@
 	<div class="text ">
 		{{ if .record.Title }}<h1 class="mb-12">{{ .record.Title }}</h1>{{ end }}
 		<div class="flex flex-row gap-x-6 justify-between ">
-			<div class="grow shrink-0 text indented">
+			<div class="grow shrink-0 text indented jumptext">
 				{{ Safe .record.Text }}
 			</div>
 			<div>

views/routes/reihen/components/alphabet.gohtml

@@ -11,12 +11,16 @@
 					:class="search ? 'inactive' : 'active'"
 					href="?letter={{ $r }}"
 					{{ if eq $model.active $r }}aria-current="page"{{ end }}
+					hx-indicator="body"
 					hx-select="main"
 					hx-target="main"
-					hx-swap="outerHTML scroll:#pageheading:top"
+					hx-swap="outerHTML show:none"
 					>{{ $r }}</a
 				>
 			{{ end }}
+
+
+			<i class="ml-2 pb-1 ri-hourglass-2-fill request-indicator spinning"></i>
 		</div>
 
 		<div class="flex-grow"></div>

views/routes/suche/baende/body.gohtml

@@ -75,6 +75,7 @@
 			id="simplesearchform"
 			class="w-full font-serif"
 			method="get"
+			hx-indicator="body"
 			action="/suche/baende"
 			autocomplete="off">
 			{{- if not $model.parameters.Extended -}}
@@ -212,6 +213,10 @@
 	<div class="container-normal" id="searchresults">
 		<div class="border-b border-zinc-300 flex flex-row justify-between">
 			<div>
+				<div class="inline-block">
+					<i class="ri-hourglass-2-fill request-indicator spinning"></i>
+				</div>
+				<div class="request-indicator">&middot;</div>
 				{{ if $model.parameters.Query -}}
 					Suche nach <b>»{{ $model.parameters.Query }}«</b> &middot;
 				{{- end -}}
@@ -247,6 +252,7 @@
 						name="sort"
 						id="sort"
 						hx-get="{{- $model.parameters.ToQueryParamsBaende -}}"
+						hx-indicator="body"
 						trigger="change"
 						hx-push-url="true"
 						hx-select="main"

views/routes/suche/beitraege/body.gohtml

@@ -76,6 +76,7 @@
 			id="simplesearchform"
 			class="w-full font-serif"
 			method="get"
+			hx-indicator="body"
 			action="/suche/beitraege"
 			autocomplete="off">
 			{{- if not $model.parameters.Extended -}}

views/routes/suche/beitraege/pagination.gohtml

@@ -4,6 +4,7 @@
 		{{ if gt $model.parameters.Page 1 -}}
 			<a
 				href="{{- $model.parameters.ToQueryParamsBeitraege -}}&page={{ $model.parameters.Prev }}"
+				hx-indicator="body"
 				class="mr-1.5 text-stone-500 hover:text-slate-900">
 				<i class="ri-arrow-left-long-line"></i>
 			</a>
@@ -13,6 +14,7 @@
 		{{ if lt $model.parameters.Page ($model.result.PagesCount) -}}
 			<a
 				href="{{- $model.parameters.ToQueryParamsBeitraege -}}&page={{ $model.parameters.Next }}"
+				hx-indicator="body"
 				class="ml-1.5 text-stone-500 hover:text-slate-900">
 				<i class="ri-arrow-right-long-line"></i>
 			</a>

views/routes/suche/beitraege/tablehead.gohtml

@@ -21,6 +21,8 @@
 
 <div class="border-b border-zinc-300 flex flex-row justify-between">
 	<div class="flex flex-row gap-x-2">
+		<div><i class="ri-hourglass-2-fill request-indicator spinning"></i></div>
+		<div class="request-indicator">&middot;</div>
 		{{ if $model.parameters.Query -}}
 			<div>Suche nach <b>»{{ $model.parameters.Query }}«</b></div>
 			<div>&middot;</div>
@@ -69,6 +71,7 @@
 				hx-select="#searchresults"
 				hx-target="#searchresults"
 				hx-swap="outerHTML"
+				hx-indicator="body"
 				{{ if $model.filters.OnlyScans -}}checked{{- end -}} />
 
 			<label
@@ -87,6 +90,7 @@
 				trigger="change"
 				hx-push-url="true"
 				hx-select="#subresults"
+				hx-indicator="body"
 				hx-target="#subresults"
 				hx-swap="outerHTML show:window:top">
 				<option

views/routes/suche/components/_infotextsimple.gohtml

@@ -1,11 +1,11 @@
 {{ $extendable :=  . }}
 
 
-<div class="col-span-6 flex flex-row text-stone-700 gap-x-2">
+<div class="flex flex-row text-stone-700 gap-x-2">
 	<div>
 		<i class="ri-information-2-fill"></i>
 	</div>
-	<div class="font-sans hyphens-auto text-sm pt-1">
+	<div class="font-sans hyphens-auto text-sm pt-1 max-w-[48rem]">
 		Die Suche durchsucht ganze Datensätze nach dem Vorkommen aller eingegebenen Suchbegriffe. Felder
 		können oben einzeln aus der Suche ausgeschlossen werden. Auch partielle Treffer in Worten werden
 		angezeigt. Wörter mit weniger als drei Zeichen, Sonderzeichen &ndash; auch Satzzeichen &ndash;

views/routes/suche/components/_searchboxsimple.gohtml

@@ -15,7 +15,9 @@
 			placeholder="Suchbegriff (min. 3 Zeichen)"
 			class="w-full grow
 			placeholder:italic font-serif placeholder:font-sans" />
-		<button id="submitbutton" type="submit" class="min-w-36" form="simplesearchform">Suchen</button>
+		<button id="submitbutton" type="submit" class="min-w-36" form="simplesearchform">
+			<i class="ri-hourglass-2-fill request-indicator spinning mr-1"></i>Suchen
+		</button>
 	</div>
 
 	{{ if $extendable }}