diff --git a/HaWeb/Controllers/RegisterController.cs b/HaWeb/Controllers/RegisterController.cs index 517a1e2..52d798f 100644 --- a/HaWeb/Controllers/RegisterController.cs +++ b/HaWeb/Controllers/RegisterController.cs @@ -114,7 +114,6 @@ public class RegisterController : Controller { var title = "Forschungsbibliographie"; ViewData["Title"] = "Forschungsbibliographie"; ViewData["SEODescription"] = "Johann Georg Hamann: Kommentierte Briefausgabe. Forschungsbibliographie."; - ViewData["Mark"] = "He"; // Normalisation and Validation if (String.IsNullOrWhiteSpace(id)) return Redirect(url + defaultLetter); diff --git a/HaWeb/Views/Admin/Dynamic/Upload.cshtml b/HaWeb/Views/Admin/Dynamic/Upload.cshtml index c17db4c..c5fde79 100644 --- a/HaWeb/Views/Admin/Dynamic/Upload.cshtml +++ b/HaWeb/Views/Admin/Dynamic/Upload.cshtml @@ -5,6 +5,8 @@ ViewData["showCredits"] = "false"; } + +
@foreach (var item in Model.AvailableRoots!.OrderBy(x => x.Type)) { @@ -95,33 +97,4 @@
} - - - - + \ No newline at end of file diff --git a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml index 88c2484..78fcd3e 100644 --- a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml @@ -7,10 +7,8 @@ if (Model.MinWidthTrad) minwidthtrads = "ha-minwidth"; } -@* No JavaScript Settings *@ - + +
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", (Model.MetaData, false, false)) @@ -154,12 +152,4 @@
} - - - -@* - *@ \ No newline at end of file + \ No newline at end of file diff --git a/HaWeb/Views/HKB/Dynamic/Index.cshtml b/HaWeb/Views/HKB/Dynamic/Index.cshtml index 8600574..26d03a5 100644 --- a/HaWeb/Views/HKB/Dynamic/Index.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Index.cshtml @@ -5,6 +5,8 @@ ViewData["showCredits"] = "true"; } + +
@if (Model.Letters != null) { @@ -49,41 +51,14 @@ @* Go To Letter *@
H K B
-
+
Briefnummer
- +
- @* ZH Loopkup *@ @if (Model.AvailablePages != null) { @@ -99,47 +74,17 @@
Z H Band - @foreach (var volume in Model.AvailablePages) { } / - +
- + } @* Full-Text-Search *@ @@ -153,24 +98,6 @@ - @* Person Filter *@ @if(Model.AvailablePersons != null) { diff --git a/HaWeb/Views/HKB/Dynamic/Register.cshtml b/HaWeb/Views/HKB/Dynamic/Register.cshtml index 8d4f913..98d76c2 100644 --- a/HaWeb/Views/HKB/Dynamic/Register.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Register.cshtml @@ -24,6 +24,8 @@ : "ha-bibel"; } + +
@@ -51,25 +53,6 @@ } - - @*
diff --git a/HaWeb/Views/HKB/Dynamic/Suche.cshtml b/HaWeb/Views/HKB/Dynamic/Suche.cshtml index dc004d8..2d7c86f 100644 --- a/HaWeb/Views/HKB/Dynamic/Suche.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Suche.cshtml @@ -5,6 +5,7 @@ ViewData["showCredits"] = "false"; ViewData["Mark"] = Model.ActiveSearch; } + -
@if (Model.AvailablePages != null && Model.AvailablePages.Any() && Model.AvailablePages.Count > 1) { @@ -112,7 +95,7 @@
diff --git a/HaWeb/Views/Shared/_FileListForm.cshtml b/HaWeb/Views/Shared/_FileListForm.cshtml index bf5b6ee..ec36104 100644 --- a/HaWeb/Views/Shared/_FileListForm.cshtml +++ b/HaWeb/Views/Shared/_FileListForm.cshtml @@ -1,5 +1,8 @@ @model (List? files, string title, string aspcontrolller, string aspaction, string id, string downloadprefix, bool multipleallowed); + + +
@Model.title @if(Model.files != null && Model.files.Any()) { @@ -47,37 +50,4 @@ else {
Keine Dateien gefunden! Es wird eine fallback-Datei verwendet!
} -
- - \ No newline at end of file + \ No newline at end of file diff --git a/HaWeb/Views/Shared/_Footer.cshtml b/HaWeb/Views/Shared/_Footer.cshtml index 17d309d..23056a1 100644 --- a/HaWeb/Views/Shared/_Footer.cshtml +++ b/HaWeb/Views/Shared/_Footer.cshtml @@ -20,6 +20,4 @@
-
- -@await Html.PartialAsync("/Views/Shared/_Javascript.cshtml") \ No newline at end of file +
\ No newline at end of file diff --git a/HaWeb/Views/Shared/_Head.cshtml b/HaWeb/Views/Shared/_Head.cshtml index 6cedffb..130c19f 100644 --- a/HaWeb/Views/Shared/_Head.cshtml +++ b/HaWeb/Views/Shared/_Head.cshtml @@ -9,12 +9,16 @@ --> - + +@* Resources *@ - +@* Styles *@ + +@* JavaScript *@ +@await Html.PartialAsync("/Views/Shared/_JavaScript.cshtml") \ No newline at end of file diff --git a/HaWeb/Views/Shared/_Javascript.cshtml b/HaWeb/Views/Shared/_Javascript.cshtml index 3cd3a53..d94238f 100644 --- a/HaWeb/Views/Shared/_Javascript.cshtml +++ b/HaWeb/Views/Shared/_Javascript.cshtml @@ -1,490 +1,25 @@ -@* Javascript gets inlined because it ain't much (but it's honest work) *@ -@* Mark searched term *@ -@if (ViewData.ContainsKey("Mark")) -{ - +@* Global Scripts -- These are not inside .cshtml to not loose deferred execution posibility *@ + + + + + + + +@if (ViewData.ContainsKey("Mark")) { + + @* This uses Razor Syntax so it is inlined into this razor file *@ } -@* Mark anchor *@ - - -@* Mark links active *@ - - -@* Menu view for mobile / small screen users *@ - - -@* Scrolling Button *@ - - -@* Letter View: Tabs - TODO: Generalize, Integrate mobile-friendly version *@ - - -@* Theme reading & switching *@ - - -@* Functions for collapsing marginals, and adding a button next to those*@ - diff --git a/HaWeb/Views/Shared/_PublishForm.cshtml b/HaWeb/Views/Shared/_PublishForm.cshtml index d165f51..d031580 100644 --- a/HaWeb/Views/Shared/_PublishForm.cshtml +++ b/HaWeb/Views/Shared/_PublishForm.cshtml @@ -1,4 +1,6 @@ @model UploadViewModel; + + @if (Model.UsedFiles != null && Model.UsedFiles.Any()) {
Aktuell geladene Dateien
@@ -30,46 +32,4 @@ -} - - \ No newline at end of file +} \ No newline at end of file diff --git a/HaWeb/Views/Shared/_UploadForm.cshtml b/HaWeb/Views/Shared/_UploadForm.cshtml index daf3442..e6e2443 100644 --- a/HaWeb/Views/Shared/_UploadForm.cshtml +++ b/HaWeb/Views/Shared/_UploadForm.cshtml @@ -1,5 +1,7 @@ @model UploadViewModel; + +