- Reihentitel
+ Reihen
+
{{ $s.Title }}
diff --git a/views/routes/components/_content.gohtml b/views/routes/components/_content.gohtml
index 120fd6a..2a64749 100644
--- a/views/routes/components/_content.gohtml
+++ b/views/routes/components/_content.gohtml
@@ -22,8 +22,10 @@
{{- end -}}
-
- {{- if not $singleView -}}
+
+ {{- if and (not $singleView) (not $entrySubView) -}}
{{- if $content.Extent -}}
@@ -126,16 +128,27 @@
{{- end -}}
-
+
{{ end }}
{{ end }}
-
diff --git a/views/routes/components/_reiherelations.gohtml b/views/routes/components/_reiherelations.gohtml
index e93f74e..a7e48d1 100644
--- a/views/routes/components/_reiherelations.gohtml
+++ b/views/routes/components/_reiherelations.gohtml
@@ -19,6 +19,23 @@
{{- else -}}
[o.J.]
{{- end -}}
+
+ {{- if not $bd.TitleStmt -}}
+
+
+
+ {{- else if eq $bd.EditState "Edited" -}}
+
+
+
+ {{- else -}}
+
+
+
+ {{- end -}}
{{- if not (eq $rel.Type "Bevorzugter Reihentitel") -}}
NR
{{ $content.MusenalmID -}}
-
+ {{- if $entrySubView -}}
+ {{- if $content.MusenalmType -}}
+
diff --git a/views/routes/components/_reihe.gohtml b/views/routes/components/_reihe.gohtml
index 4fae78b..039a9dc 100644
--- a/views/routes/components/_reihe.gohtml
+++ b/views/routes/components/_reihe.gohtml
@@ -27,9 +27,9 @@
+ {{- range $_, $t := $content.MusenalmType -}}
+
+ {{- end -}}
+ {{- end -}}
+
+ {{- $t -}}
+
+ {{- end -}}
+ Keine nähere Erfassung
+ Mit erfassten Beiträgen
+ Mit genaueren Titelangaben
+
diff --git a/views/routes/person/body.gohtml b/views/routes/person/body.gohtml
index 6de41d5..63d46e9 100644
--- a/views/routes/person/body.gohtml
+++ b/views/routes/person/body.gohtml
@@ -20,7 +20,9 @@
- Personen und Körperschaften Einzelansicht
+ Personen & Körperschaften
{{ $model.result.Agent.Name }}
@@ -72,21 +74,34 @@
{{- if .result.BResult -}}
-
-
- {{ if eq $model.result.LenEntries 1 }}
- Ein Band
- {{- else }}
- {{- $model.result.LenEntries }}
- Bände
- {{- end }}
- in
- {{- if eq $model.result.LenSeries 1 }}
- einer Reihe
- {{- else }}
- {{ $model.result.LenSeries }} Reihen
- {{- end }}
- gefunden:
+
-
- {{ if eq $model.result.LenEntries 1 }}
- Ein Band
- {{- else }}
- {{- $model.result.LenEntries }}
- Bände
- {{- end }}
- in
- {{- if eq $model.result.LenSeries 1 }}
- einer Reihe
- {{- else }}
- {{ $model.result.LenSeries }} Reihen
- {{- end }}
- gefunden:
+
+
+
+ {{ if eq $model.result.LenEntries 1 }}
+ Ein Band
+ {{- else }}
+ {{- $model.result.LenEntries }}
+ Bände
+ {{- end }}
+ in
+ {{- if eq $model.result.LenSeries 1 }}
+ einer Reihe
+ {{- else }}
+ {{ $model.result.LenSeries }} Reihen
+ {{- end }}
+
+
+ {{- if len $model.result.CResult -}}
+
+ Zu den Beiträgen
+
+ {{- $model.result.LenContents -}}
+
+
+
+ {{- end -}}
{{ range $id, $r := .result.BResult }}
@@ -110,18 +125,47 @@
{{ end }}
{{- if len $model.result.CResult -}}
-
+
+
+
+ {{ if eq $model.result.LenContents 1 }}
+ Ein Beitrag
+ {{- else }}
+ {{- $model.result.LenContents }}
+ Beiträge
+ {{- end }}
+ in
+ {{- if eq (len $model.result.CResult) 1 }}
+ einem Band
+ {{- else }}
+ {{ len $model.result.CResult }} Bänden
+ {{- end }}
+
- {{- range $_, $e := $model.result.CResult -}}
- {{ $e.PreferredTitle }}
- {{- $contents := index $model.result.Contents $e.Id -}}
-
- {{- range $i, $c := $contents -}}
- {{- $rels := index $model.result.ContentsAgents $c.Id -}}
- {{- template "_content" Arr $c $e $rels $model.result.Agents false true -}}
- {{- end -}}
-
- {{- end -}}
+
+ {{- range $_, $e := $model.result.CResult -}}
+ {{- $contents := index $model.result.Contents $e.Id -}}
+
+
+ {{ $e.PreferredTitle }}
+
+
+
+
+ {{- len $contents -}}
+
+
+
+ {{- end -}}
+
{{- end -}}
diff --git a/views/routes/personen/body.gohtml b/views/routes/personen/body.gohtml
index 210888c..eaf4cb1 100644
--- a/views/routes/personen/body.gohtml
+++ b/views/routes/personen/body.gohtml
@@ -77,12 +77,18 @@
{{- if (index $model.bcount $agent.Id) -}}
- {{ index $model.bcount $agent.Id }}
+
+ {{ index $model.bcount $agent.Id }}
+ Bände
+
{{- end -}}
{{- if index $model.ccount $agent.Id -}}
- {{ index $model.ccount $agent.Id }}
+
+ {{ index $model.ccount $agent.Id }}
+ Beiträge
+
{{- end -}}
diff --git a/views/routes/reihe/body.gohtml b/views/routes/reihe/body.gohtml
index cb57fb4..1d90847 100644
--- a/views/routes/reihe/body.gohtml
+++ b/views/routes/reihe/body.gohtml
@@ -5,7 +5,7 @@
- Reihen Einzelansicht
+ Reihen
{{ $r.Title }}
{{- end -}}
{{- end -}}
+
+
+
diff --git a/views/routes/suche/beitraege/body.gohtml b/views/routes/suche/beitraege/body.gohtml
index b9d424d..fae86d8 100644
--- a/views/routes/suche/beitraege/body.gohtml
+++ b/views/routes/suche/beitraege/body.gohtml
@@ -4,7 +4,6 @@
{{- template "_heading" $model.parameters -}}
- {{- if not $model.parameters.Extended -}}
+
+
+
+
{{ template "_infotextsimple" true }}
diff --git a/views/routes/suche/components/_searchboxsimple.gohtml b/views/routes/suche/components/_searchboxsimple.gohtml
index e621bae..0b808d5 100644
--- a/views/routes/suche/components/_searchboxsimple.gohtml
+++ b/views/routes/suche/components/_searchboxsimple.gohtml
@@ -22,26 +22,3 @@
Erweiterte Suche
{{ end }}
-
-
-
diff --git a/views/transform/main.js b/views/transform/main.js
index cded9f3..c6508eb 100644
--- a/views/transform/main.js
+++ b/views/transform/main.js
@@ -16,6 +16,7 @@ const TOOLTIP_ELEMENT = "tool-tip";
const ABBREV_TOOLTIPS_ELEMENT = "abbrev-tooltips";
const INT_LINK_ELEMENT = "int-link";
const POPUP_IMAGE_ELEMENT = "popup-image";
+const TABLIST_ELEMENT = "tab-list";
class XSLTParseProcess {
#processors;
@@ -612,14 +613,20 @@ class PopupImage extends HTMLElement {
this.overlay.innerHTML = `
-
+
@@ -650,6 +657,119 @@ class PopupImage extends HTMLElement {
}
}
+class Tablist extends HTMLElement {
+ static get observedAttributes() {}
+
+ constructor() {
+ super();
+ this.shown = -1;
+ this._headings = [];
+ this._contents = [];
+ }
+
+ connectedCallback() {
+ this._headings = Array.from(this.querySelectorAll(".tab-list-head"));
+ this._contents = Array.from(this.querySelectorAll(".tab-list-panel"));
+ for (let heading of this._headings) {
+ heading.addEventListener("click", this.handleTabClick.bind(this));
+ heading.classList.add("cursor-pointer");
+ heading.classList.add("select-none");
+ heading.setAttribute("role", "button");
+ heading.setAttribute("aria-pressed", "false");
+ heading.setAttribute("tabindex", "0");
+ }
+
+ this.hideDependent();
+
+ if (this._headings.length === 1) {
+ this.expand(0);
+ }
+ }
+
+ expand(index) {
+ if (index < 0 || index >= this._headings.length) {
+ return;
+ }
+
+ this.shown = index;
+
+ this._contents.forEach((content, i) => {
+ if (i === index) {
+ content.classList.remove("hidden");
+ this._headings[i].setAttribute("aria-pressed", "true");
+ } else {
+ content.classList.add("hidden");
+ this._headings[i].setAttribute("aria-pressed", "false");
+ }
+ });
+ }
+
+ hideDependent() {
+ if (this.shown < 0) {
+ for (const el of this._headings) {
+ this._hideAllDep(el, false);
+ }
+ } else {
+ this._headings.forEach((el, i) => {
+ this._hideAllDep(el, i === this.shown);
+ });
+ }
+ }
+
+ _hideAllDep(element, opened) {
+ const el = element.querySelectorAll(".show-closed");
+ for (let e of el) {
+ if (opened) {
+ e.classList.add("hidden");
+ } else {
+ e.classList.remove("hidden");
+ }
+ }
+ const oel = Array.from(element.querySelectorAll(".show-opened"));
+ for (let e of oel) {
+ if (opened) {
+ e.classList.remove("hidden");
+ } else {
+ e.classList.add("hidden");
+ }
+ }
+ }
+
+ handleTabClick(event) {
+ if (!event.target) {
+ console.warn("Invalid event target");
+ return;
+ }
+
+ const parent = this.findParentWithClass(event.target, "tab-list-head");
+ if (!parent) {
+ console.warn("No parent found with class 'tab-list-head'");
+ return;
+ }
+
+ const index = this._headings.indexOf(parent);
+ if (index === this.shown) {
+ this._contents[index].classList.toggle("hidden");
+ this._headings[index].setAttribute("aria-pressed", "false");
+ this.shown = -1;
+ } else {
+ this.expand(index);
+ }
+
+ this.hideDependent();
+ }
+
+ findParentWithClass(element, className) {
+ while (element) {
+ if (element.classList && element.classList.contains(className)) {
+ return element;
+ }
+ element = element.parentElement;
+ }
+ return null;
+ }
+}
+
class AbbreviationTooltips extends HTMLElement {
static get observedAttributes() {
return ["data-text", "data-abbrevmap"];
@@ -855,6 +975,7 @@ customElements.define(ABBREV_TOOLTIPS_ELEMENT, AbbreviationTooltips);
customElements.define(FILTER_LIST_ELEMENT, FilterList);
customElements.define(SCROLL_BUTTON_ELEMENT, ScrollButton);
customElements.define(TOOLTIP_ELEMENT, ToolTip);
-customElements.define("popup-image", PopupImage);
+customElements.define(POPUP_IMAGE_ELEMENT, PopupImage);
+customElements.define(TABLIST_ELEMENT, Tablist);
export { XSLTParseProcess, FilterList, ScrollButton, AbbreviationTooltips };
diff --git a/views/transform/site.css b/views/transform/site.css
index 34e4c4a..5f5f027 100644
--- a/views/transform/site.css
+++ b/views/transform/site.css
@@ -70,7 +70,7 @@
}
a {
- @apply hyphens-none underline decoration-dotted hover:decoration-solid text-slate-700 hover:text-slate-900;
+ @apply hyphens-none underline decoration-dotted hover:decoration-solid text-slate-700 hover:text-slate-900 underline-offset-3;
}
ul {
diff --git a/xmlmodels/xmldata.go b/xmlmodels/xmldata.go
index c1cd071..4fd4bcd 100644
--- a/xmlmodels/xmldata.go
+++ b/xmlmodels/xmldata.go
@@ -2,7 +2,7 @@ package xmlmodels
const (
BESCHREIBUNGEN_FN = "beschreibungen.txt"
- STATIC_IMG_PATH = "Static-Bilder/"
- DATA_PATH = "data/"
- IMG_PATH = "Almanach-Bilder/"
+ STATIC_IMG_PATH = "import/Static-Bilder/"
+ DATA_PATH = "import/data/"
+ IMG_PATH = "import/Almanach-Bilder/"
)
+
+ {{ if eq $model.result.LenEntries 1 }}
+ Ein Band
+ {{- else }}
+ {{- $model.result.LenEntries }}
+ Bände
+ {{- end }}
+ in
+ {{- if eq $model.result.LenSeries 1 }}
+ einer Reihe
+ {{- else }}
+ {{ $model.result.LenSeries }} Reihen
+ {{- end }}
+
+
+ {{- if len $model.result.CResult -}}
+
+ Zu den Beiträgen
+
+ {{- end -}}
+ {{- $model.result.LenContents -}}
+
+
+
+
+
{{- end -}}
diff --git a/views/routes/personen/body.gohtml b/views/routes/personen/body.gohtml
index 210888c..eaf4cb1 100644
--- a/views/routes/personen/body.gohtml
+++ b/views/routes/personen/body.gohtml
@@ -77,12 +77,18 @@
+
+ {{ if eq $model.result.LenContents 1 }}
+ Ein Beitrag
+ {{- else }}
+ {{- $model.result.LenContents }}
+ Beiträge
+ {{- end }}
+ in
+ {{- if eq (len $model.result.CResult) 1 }}
+ einem Band
+ {{- else }}
+ {{ len $model.result.CResult }} Bänden
+ {{- end }}
+
- {{- range $_, $e := $model.result.CResult -}}
-
+ {{- range $_, $e := $model.result.CResult -}}
+ {{- $contents := index $model.result.Contents $e.Id -}}
+
{{ $e.PreferredTitle }}
- {{- $contents := index $model.result.Contents $e.Id -}}
-
- {{- range $i, $c := $contents -}}
- {{- $rels := index $model.result.ContentsAgents $c.Id -}}
- {{- template "_content" Arr $c $e $rels $model.result.Agents false true -}}
- {{- end -}}
-
- {{- end -}}
+
+
+
+ {{- end -}}
+
+ {{ $e.PreferredTitle }}
+
+
+
+
+ {{- len $contents -}}
+
+
{{- if (index $model.bcount $agent.Id) -}}
diff --git a/views/routes/reihe/body.gohtml b/views/routes/reihe/body.gohtml
index cb57fb4..1d90847 100644
--- a/views/routes/reihe/body.gohtml
+++ b/views/routes/reihe/body.gohtml
@@ -5,7 +5,7 @@
- {{ index $model.bcount $agent.Id }}
+
+ {{ index $model.bcount $agent.Id }}
+
{{- end -}}
{{- if index $model.ccount $agent.Id -}}
Bände
+
- {{ index $model.ccount $agent.Id }}
+
+ {{ index $model.ccount $agent.Id }}
+
{{- end -}}
Beiträge
+
- Reihen Einzelansicht
+ Reihen
{{ $r.Title }}
{{- end -}}
{{- end -}}
+
+
+
diff --git a/views/routes/suche/beitraege/body.gohtml b/views/routes/suche/beitraege/body.gohtml
index b9d424d..fae86d8 100644
--- a/views/routes/suche/beitraege/body.gohtml
+++ b/views/routes/suche/beitraege/body.gohtml
@@ -4,7 +4,6 @@
{{- template "_heading" $model.parameters -}}
diff --git a/views/routes/suche/components/_searchboxsimple.gohtml b/views/routes/suche/components/_searchboxsimple.gohtml
index e621bae..0b808d5 100644
--- a/views/routes/suche/components/_searchboxsimple.gohtml
+++ b/views/routes/suche/components/_searchboxsimple.gohtml
@@ -22,26 +22,3 @@
Erweiterte Suche
{{ end }}
-
-
-
diff --git a/views/transform/main.js b/views/transform/main.js
index cded9f3..c6508eb 100644
--- a/views/transform/main.js
+++ b/views/transform/main.js
@@ -16,6 +16,7 @@ const TOOLTIP_ELEMENT = "tool-tip";
const ABBREV_TOOLTIPS_ELEMENT = "abbrev-tooltips";
const INT_LINK_ELEMENT = "int-link";
const POPUP_IMAGE_ELEMENT = "popup-image";
+const TABLIST_ELEMENT = "tab-list";
class XSLTParseProcess {
#processors;
@@ -612,14 +613,20 @@ class PopupImage extends HTMLElement {
this.overlay.innerHTML = `
- {{- if not $model.parameters.Extended -}}
+
+
+
+
{{ template "_infotextsimple" true }}
-
+
@@ -650,6 +657,119 @@ class PopupImage extends HTMLElement {
}
}
+class Tablist extends HTMLElement {
+ static get observedAttributes() {}
+
+ constructor() {
+ super();
+ this.shown = -1;
+ this._headings = [];
+ this._contents = [];
+ }
+
+ connectedCallback() {
+ this._headings = Array.from(this.querySelectorAll(".tab-list-head"));
+ this._contents = Array.from(this.querySelectorAll(".tab-list-panel"));
+ for (let heading of this._headings) {
+ heading.addEventListener("click", this.handleTabClick.bind(this));
+ heading.classList.add("cursor-pointer");
+ heading.classList.add("select-none");
+ heading.setAttribute("role", "button");
+ heading.setAttribute("aria-pressed", "false");
+ heading.setAttribute("tabindex", "0");
+ }
+
+ this.hideDependent();
+
+ if (this._headings.length === 1) {
+ this.expand(0);
+ }
+ }
+
+ expand(index) {
+ if (index < 0 || index >= this._headings.length) {
+ return;
+ }
+
+ this.shown = index;
+
+ this._contents.forEach((content, i) => {
+ if (i === index) {
+ content.classList.remove("hidden");
+ this._headings[i].setAttribute("aria-pressed", "true");
+ } else {
+ content.classList.add("hidden");
+ this._headings[i].setAttribute("aria-pressed", "false");
+ }
+ });
+ }
+
+ hideDependent() {
+ if (this.shown < 0) {
+ for (const el of this._headings) {
+ this._hideAllDep(el, false);
+ }
+ } else {
+ this._headings.forEach((el, i) => {
+ this._hideAllDep(el, i === this.shown);
+ });
+ }
+ }
+
+ _hideAllDep(element, opened) {
+ const el = element.querySelectorAll(".show-closed");
+ for (let e of el) {
+ if (opened) {
+ e.classList.add("hidden");
+ } else {
+ e.classList.remove("hidden");
+ }
+ }
+ const oel = Array.from(element.querySelectorAll(".show-opened"));
+ for (let e of oel) {
+ if (opened) {
+ e.classList.remove("hidden");
+ } else {
+ e.classList.add("hidden");
+ }
+ }
+ }
+
+ handleTabClick(event) {
+ if (!event.target) {
+ console.warn("Invalid event target");
+ return;
+ }
+
+ const parent = this.findParentWithClass(event.target, "tab-list-head");
+ if (!parent) {
+ console.warn("No parent found with class 'tab-list-head'");
+ return;
+ }
+
+ const index = this._headings.indexOf(parent);
+ if (index === this.shown) {
+ this._contents[index].classList.toggle("hidden");
+ this._headings[index].setAttribute("aria-pressed", "false");
+ this.shown = -1;
+ } else {
+ this.expand(index);
+ }
+
+ this.hideDependent();
+ }
+
+ findParentWithClass(element, className) {
+ while (element) {
+ if (element.classList && element.classList.contains(className)) {
+ return element;
+ }
+ element = element.parentElement;
+ }
+ return null;
+ }
+}
+
class AbbreviationTooltips extends HTMLElement {
static get observedAttributes() {
return ["data-text", "data-abbrevmap"];
@@ -855,6 +975,7 @@ customElements.define(ABBREV_TOOLTIPS_ELEMENT, AbbreviationTooltips);
customElements.define(FILTER_LIST_ELEMENT, FilterList);
customElements.define(SCROLL_BUTTON_ELEMENT, ScrollButton);
customElements.define(TOOLTIP_ELEMENT, ToolTip);
-customElements.define("popup-image", PopupImage);
+customElements.define(POPUP_IMAGE_ELEMENT, PopupImage);
+customElements.define(TABLIST_ELEMENT, Tablist);
export { XSLTParseProcess, FilterList, ScrollButton, AbbreviationTooltips };
diff --git a/views/transform/site.css b/views/transform/site.css
index 34e4c4a..5f5f027 100644
--- a/views/transform/site.css
+++ b/views/transform/site.css
@@ -70,7 +70,7 @@
}
a {
- @apply hyphens-none underline decoration-dotted hover:decoration-solid text-slate-700 hover:text-slate-900;
+ @apply hyphens-none underline decoration-dotted hover:decoration-solid text-slate-700 hover:text-slate-900 underline-offset-3;
}
ul {
diff --git a/xmlmodels/xmldata.go b/xmlmodels/xmldata.go
index c1cd071..4fd4bcd 100644
--- a/xmlmodels/xmldata.go
+++ b/xmlmodels/xmldata.go
@@ -2,7 +2,7 @@ package xmlmodels
const (
BESCHREIBUNGEN_FN = "beschreibungen.txt"
- STATIC_IMG_PATH = "Static-Bilder/"
- DATA_PATH = "data/"
- IMG_PATH = "Almanach-Bilder/"
+ STATIC_IMG_PATH = "import/Static-Bilder/"
+ DATA_PATH = "import/data/"
+ IMG_PATH = "import/Almanach-Bilder/"
)