Did a lot of styling on letter & register view; introduced a new accent color. Added scroll and submit vutton, TODO style submit button

HaWeb/Views/Admin/Upload/Index.cshtml

@@ -25,17 +25,7 @@
   }
 
   <div class="ha-uploadpublishforms">
-    <form class="ha-uploadform" id="uploadForm" asp-controller="API" asp-action="Upload" method="post" enctype="multipart/form-data">
-        <label class="ha-uploadfilelabel" id="dropzone">
-          <input class="hidden" id="file" type="file" accept=".xml" name="file" />
-          <div class="ha-uploadtext">Upload</div>
-          <div class="ha-lds-ellipsis" id="ha-lds-ellipsis"><div></div><div></div><div></div><div></div></div>
-        </label>
-        <div class="ha-uploadmessage" id="ha-uploadmessage">
-          Fehler!<br/>
-          <output form="uploadForm" name="upload-result"></output>
-        </div>
-    </form>
+    @await Html.PartialAsync("/Views/Shared/_UploadForm.cshtml", Model)
 
     <a class="ha-publishbutton" asp-controller="Upload" asp-action="Index" asp-route-id="@string.Empty">
       <div class="ha-publishtext">Veröffentlichen</div>
@@ -43,62 +33,64 @@
   </div>
 </div>
 
+
 <div class="ha-uploadheader">
   <h1 class="ha-uploadtitle">@Model.ActiveTitle</h1>
 </div>
 
+
 <div class="ha-uploadcontainer">
-@* File Category Page File List *@
-@if (Model.AvailableFiles != null && Model.AvailableFiles.Any()) {
-  <div class="ha-filesheader">
-    <div class="ha-availablefiles" id="ha-availablefiles">
-      <div class="ha-availablefilestitle">Datei(en)</div>
-        @if(Model.UsedFiles != null && Model.UsedFiles.ContainsKey(Model.Prefix)) {
-          <div class="ha-usedfilelist">
-          @foreach (var item in Model.UsedFiles[Model.Prefix]!)
-          {
-            if(item == Model.UsedFiles[Model.Prefix]!.Last()) {
-              <span class="ha-usedfile">@item.FileName</span>
-            }
-            else {
-              <span class="ha-usedfile">@item.FileName,</span>
+  @* File Category Page File List *@
+  @if (Model.AvailableFiles != null && Model.AvailableFiles.Any()) {
+    <div class="ha-filesheader">
+      <div class="ha-availablefiles" id="ha-availablefiles">
+        <div class="ha-availablefilestitle">Datei(en)</div>
+          @if(Model.UsedFiles != null && Model.UsedFiles.ContainsKey(Model.Prefix)) {
+            <div class="ha-usedfilelist">
+            @foreach (var item in Model.UsedFiles[Model.Prefix]!)
+            {
+              if(item == Model.UsedFiles[Model.Prefix]!.Last()) {
+                <span class="ha-usedfile">@item.FileName</span>
+              }
+              else {
+                <span class="ha-usedfile">@item.FileName,</span>
+              }
             }
+            </div>
           }
-          </div>
-        }
+      </div>
+      <div class="ha-availablefileslist hidden" id="ha-availablefileslist">
+          @await Html.PartialAsync("/Views/Shared/_FileListForm.cshtml", (Model.AvailableFiles, "Verfügbare Dateien", "API", "SetUsed", Model.Prefix, "/Download/XML/" + Model.Prefix + "/", true))
+      </div>
     </div>
-    <div class="ha-availablefileslist hidden" id="ha-availablefileslist">
-        @await Html.PartialAsync("/Views/Shared/_FileList.cshtml", (Model.AvailableFiles, "Verfügbare Dateien:", "API", "SetUsed", Model.Prefix, "/Download/XML/" + Model.Prefix + "/", true))
-    </div>
-  </div>
-}
-
-@* Start Page File List *@
-else {
-  <div class="ha-publishfilelist">
-    @await Html.PartialAsync("/Views/Shared/_PublishForm.cshtml", Model)
-  </div>
-
-  <div class="ha-hamannfilechooser">
-    @await Html.PartialAsync("/Views/Shared/_FileList.cshtml", (Model.HamannFiles, "Verfügbare Hamann-Dateien", "API", "SetUsedHamann", string.Empty, "/Download/XML/", false))
-  </div>
-}
-
-@* File Category Page Syntax Check *@
-@if (Model.UsedFiles != null && Model.Prefix != null && Model.UsedFiles.ContainsKey(Model.Prefix)) {
-  <div class="ha-errorswarnings">
-    <div class="ha-criticalerrors">
-
-    </div>
-    <div class="ha-warnings">
-      
-    </div>
-  </div>
-
-  <div class="ha-crossfilechecking">
     
-  </div>
-}
+    @if (Model.UsedFiles != null && Model.Prefix != null && Model.UsedFiles.ContainsKey(Model.Prefix)) {
+      <div class="ha-errorswarnings">
+        <div class="ha-criticalerrors">
+
+        </div>
+        <div class="ha-warnings">
+          
+        </div>
+      </div>
+
+      <div class="ha-crossfilechecking">
+        
+      </div>
+    }
+  }
+
+
+  @* Start Page File List *@
+  else {
+    <div class="ha-publishfilelist">
+      @await Html.PartialAsync("/Views/Shared/_PublishForm.cshtml", Model)
+    </div>
+
+    <div class="ha-hamannfilechooser">
+      @await Html.PartialAsync("/Views/Shared/_FileListForm.cshtml", (Model.HamannFiles, "Verfügbare Hamann-Dateien", "API", "SetUsedHamann", string.Empty, "/Download/XML/", false))
+    </div>
+  }
 
 </div>
 
@@ -118,71 +110,6 @@ else {
       }
     }
 
-    const dropHandler = function (formelement, ev, dropzone) {
-      ev.preventDefault();
-      if (ev.dataTransfer.items) {
-        if (ev.dataTransfer.items[0].kind === 'file') {
-          var file = ev.dataTransfer.items[0].getAsFile();
-          UPLOADSubmit(formelement, file);
-        } else {
-          var file = ev.dataTransfer.files[0];
-          UPLOADSubmit(formelement, file);
-        }
-      }
-    }
-
-    const dragOverHandler = function (ev, dropzone) {
-      ev.preventDefault();
-    }
-
-    const dragLeaveHander = function (ev, dropzone) {
-      ev.preventDefault();
-    }
-
-    const dragEnterHandler = function (ev, dropzone) {
-      ev.preventDefault();
-    }
-
-    const UPLOADSubmit = async function (oFormElement, file = null) {
-      var fd = new FormData();
-      if (file !== null) fd.append("file", file);
-      else fd = new FormData(oFormElement);
-      document.getElementById("dropzone").style.pointerEvents = "none";
-      document.getElementById("ha-lds-ellipsis").style.display = "inline-block";
-      document.getElementById("ha-uploadmessage").style.opacity = "0";
-      await fetch(oFormElement.action, {
-          method: 'POST',
-          headers: {
-            'RequestVerificationToken': getCookie('RequestVerificationToken')
-          },
-          body: fd
-        })
-        .then(response => response.json())
-        .then(json => {
-          if ("Error" in json) {
-            document.getElementById("dropzone").style.pointerEvents = "auto";
-            document.getElementById("ha-lds-ellipsis").style.display = "none";
-            document.getElementById("ha-uploadmessage").style.opacity = "1";
-            oFormElement.elements.namedItem("upload-result").value = json.Error;
-          } else {
-            document.getElementById("dropzone").style.pointerEvents = "auto";
-            document.getElementById("ha-lds-ellipsis").style.display = "none";
-            oFormElement.elements.namedItem("upload-result").value = "Erfolg!";
-            if ("Prefix" in json[0]) {
-              document.getElementById("dropzone").style.pointerEvents = "auto";
-              document.getElementById("ha-lds-ellipsis").style.display = "none";
-              window.location.replace("/Admin/Upload/" + json[0].Prefix);
-            }
-          }
-        })
-        .catch ((e) => { 
-          document.getElementById("dropzone").style.pointerEvents = "auto";
-          document.getElementById("ha-lds-ellipsis").style.display = "none";
-          document.getElementById("ha-uploadmessage").style.opacity = "1";
-          oFormElement.elements.namedItem("upload-result").value = "Keine Antwort. Bitte Seite neu laden!";
-        })
-    }
-
     function getCookie(name) {
       var value = "; " + document.cookie;
       var parts = value.split("; " + name + "=");
@@ -190,19 +117,9 @@ else {
     }
 
     window.addEventListener("load", function () {
-      var submitelement = document.getElementById("file");
-      var formelement = document.getElementById("uploadForm");
-      var dropzone = document.getElementById("dropzone");
-      
       var filesbutton = document.getElementById("ha-availablefiles");
       if (filesbutton !== null)
         filesbutton.addEventListener("click", () => hideshowfiles());
-      
-      submitelement.addEventListener("change", () => UPLOADSubmit(formelement));
-      dropzone.addEventListener("drop", (ev) => dropHandler(formelement, ev, dropzone));
-      dropzone.addEventListener("dragover", (ev) => dragOverHandler(ev, dropzone));
-      dropzone.addEventListener("dragleave", (ev) => dragLeaveHander(ev, dropzone));
-      dropzone.addEventListener("dragenter", (ev) => dragEnterHandler(ev, dropzone));
     });
 
     

HaWeb/Views/Briefe/Index.cshtml

@@ -51,20 +51,11 @@
 
 <div class="ha-letterbody " id="ha-letterbody">
     <div class="ha-lettertext @minwidth" id="ha-lettertext">
+        @if (Model.MetaData.ParsedZHString != null) {
         <div class="ha-linecount ha-firstline">
-            @if (Model.MetaData.ParsedZHString != null)
-            {
-                <span>@Html.Raw(Model.MetaData.ParsedZHString)</span>
-            }
-            else
-            {
-                <div class="ha-tooltip">
-                    <div class="ha-pill">
-                        <span>Neu</span>
-                    </div>
-                </div>
-            }
+            <span>@Html.Raw(Model.MetaData.ParsedZHString)</span>
         </div>
+        }
         @Html.Raw(@Model.ParsedText)
         @* It's not beautiful but it's a hack to keep the last comment within parent element boundaries: *@
         <br>

HaWeb/Views/Edition/Richtlinien.cshtml

@@ -36,7 +36,12 @@
                 <td>Durchstreichung</td>
                 <td>in spitzen Klammern ⟨...⟩</td>
                 <td><span class="ha-del">Durchstreichung</span> (einfache bis doppelte)</td>
-            </tr>	
+            </tr>
+            <tr>
+                <td>Einfügung</td>
+                <td></td>
+                <td>&#x2E02;Einfügung&#x2E03; (lediglich in Einzelfällen)</td>
+            </tr>
             <tr>
                 <td>Nicht entzifferbare Stelle / Unsichere Lesung</td>
                 <td>unterschiedlich gehandhabt</td>

HaWeb/Views/Register/Index.cshtml

@@ -28,6 +28,14 @@
     <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>
+            }
             <div class="ha-register-nav" id="ha-register-nav">
                 <div class="ha-register-left-nav">
                     @if (Model.AvailableCategories != null) {
@@ -60,15 +68,3 @@
         </div>
     </div>
 </div>
-
-    <script type="text/javascript">
-    (function() {
-        var ga = document.createElement('script');
-        ga.src = 'https://www.bibleserver.com/api/parser.js?key=262ea61e694b0d300608a52ef3f4585a10b47ff4&lang=de';
-        ga.setAttribute('async', 'true');
-        document.documentElement.firstChild.appendChild(ga);
-    })();
- 
-    var bsQuery = '.ha-lemma'; // CSS-Selektor für Wrapper der Suche (optional)
-    var bsTrl   = 'LUT';      // Verlinkte Übersetzung (optional)
-    </script>

HaWeb/Views/Shared/_FileListForm.cshtml

@@ -37,7 +37,11 @@
             </div>
         }
         </div>
-        <output id ="ha-filelistoutput"></output><input class="btn ha-filelistbutton" type="submit" value="Laden" />
+        <output id ="ha-filelistoutput"></output>
+        <button type="submit" class="ha-filelistbutton" id="ha-filelistbutton" >
+            Laden
+            <div class="ha-lds-ellipsis-load" id="ha-lds-ellipsis-load"><div></div><div></div><div></div><div></div></div>
+        </button>
         </form>
     }
     else {
@@ -48,6 +52,8 @@
 <script>
     const USESubmit = async function (oFormElement, file = null) {
       let fd = new FormData(oFormElement);
+      document.getElementById("ha-filelistbutton").style.pointerEvents = "none";
+      document.getElementById("ha-lds-ellipsis-load").style.display = "inline-block";
       await fetch(oFormElement.action, {
           method: 'POST',
           headers: {
@@ -58,16 +64,20 @@
         .then(response => response.json())
         .then(json => {
           if ("Error" in json) {
+              document.getElementById("ha-filelistbutton").style.pointerEvents = "auto";
+              document.getElementById("ha-lds-ellipsis-load").style.display = "none";
             document.getElementById("ha-filelistoutput").textContent = json.Error;
           } 
           else {
+              document.getElementById("ha-filelistbutton").style.pointerEvents = "auto";
+              document.getElementById("ha-lds-ellipsis-load").style.display = "none";
             location.reload(); 
           }
         })
-        .catch ((e) => { 
+        .catch ((e) => {
+            document.getElementById("ha-filelistbutton").style.pointerEvents = "auto";
+            document.getElementById("ha-lds-ellipsis-load").style.display = "none";
             document.getElementById("ha-filelistoutput").textContent = e;
         })
     }
-
-    
 </script>

HaWeb/Views/Shared/_Layout.cshtml

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="de">
+<html lang="de" id="top">
 
 <head>
     <meta charset="utf-8" />
@@ -42,10 +42,17 @@
         @await Html.PartialAsync("/Views/Shared/_Footer.cshtml")
         </div>
     </div>
+
     <environment exclude="Development">
         @await Html.PartialAsync("/Views/Shared/_Javascript.cshtml")
     </environment>
 
+    <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>
+    </div>
+
     @RenderSection("Scripts", required: false)
 </body>
 

HaWeb/Views/Shared/_LetterHead.cshtml

@@ -20,9 +20,9 @@
                         </div>
                     </div>
                 }
-                else if (Model.ParsedZHString == null && Model.ShowZHData) {
+                else if (Model.ParsedZHString == null) {
                     <div class="ha-tooltip">
-                        <div class="ha-pill">
+                        <div class="ha-pill ha-newpill">
                             <span>Neu</span>
                         </div>
                     </div>

HaWeb/Views/Shared/_PublishForm.cshtml

@@ -24,10 +24,9 @@
         <form class="ha-publishform" id="ha-publishform" asp-controller="API" asp-action="LocalPublish" method="post" enctype="multipart/form-data">
           <label class="ha-publishfilelabel" id="ha-publishfilelabel">
             <div class="ha-publishtext">Dateien Veröffentlichen</div>
-            <div class="ha-lds-ellipsis" id="ha-lds-ellipsis-publish"><div></div><div></div><div></div><div></div></div>
+            <div class="ha-lds-ellipsis-publish" id="ha-lds-ellipsis-publish"><div></div><div></div><div></div><div></div></div>
           </label>
           <div class="ha-publishmessage" id="ha-publishmessage">
-            @* Fehler!<br/> *@
             <output form="uploadForm" name="publish-result" id="publish-result"></output>
           </div>
       </form>

HaWeb/Views/Shared/_UploadForm.cshtml

@@ -0,0 +1,91 @@
+@model UploadViewModel;
+
+<form class="ha-uploadform" id="uploadForm" asp-controller="API" asp-action="Upload" method="post" enctype="multipart/form-data">
+    <label class="ha-uploadfilelabel" id="dropzone">
+        <input class="hidden" id="file" type="file" accept=".xml" name="file" />
+        <div class="ha-uploadtext">Upload</div>
+        <div class="ha-lds-ellipsis" id="ha-lds-ellipsis-upload"><div></div><div></div><div></div><div></div></div>
+    </label>
+    <div class="ha-uploadmessage" id="ha-uploadmessage">
+        Fehler!<br/>
+        <output form="uploadForm" name="upload-result"></output>
+    </div>
+</form>
+
+<script>
+    const dropHandler = function (formelement, ev, dropzone) {
+      ev.preventDefault();
+      if (ev.dataTransfer.items) {
+        if (ev.dataTransfer.items[0].kind === 'file') {
+          var file = ev.dataTransfer.items[0].getAsFile();
+          UPLOADSubmit(formelement, file);
+        } else {
+          var file = ev.dataTransfer.files[0];
+          UPLOADSubmit(formelement, file);
+        }
+      }
+    }
+
+    const dragOverHandler = function (ev, dropzone) {
+      ev.preventDefault();
+    }
+
+    const dragLeaveHander = function (ev, dropzone) {
+      ev.preventDefault();
+    }
+
+    const dragEnterHandler = function (ev, dropzone) {
+      ev.preventDefault();
+    }
+
+    const UPLOADSubmit = async function (oFormElement, file = null) {
+      var fd = new FormData();
+      if (file !== null) fd.append("file", file);
+      else fd = new FormData(oFormElement);
+      document.getElementById("dropzone").style.pointerEvents = "none";
+      document.getElementById("ha-lds-ellipsis-upload").style.display = "inline-block";
+      document.getElementById("ha-uploadmessage").style.opacity = "0";
+      await fetch(oFormElement.action, {
+          method: 'POST',
+          headers: {
+            'RequestVerificationToken': getCookie('RequestVerificationToken')
+          },
+          body: fd
+        })
+        .then(response => response.json())
+        .then(json => {
+          if ("Error" in json) {
+            document.getElementById("dropzone").style.pointerEvents = "auto";
+            document.getElementById("ha-lds-ellipsis-upload").style.display = "none";
+            document.getElementById("ha-uploadmessage").style.opacity = "1";
+            oFormElement.elements.namedItem("upload-result").value = json.Error;
+          } else {
+            document.getElementById("dropzone").style.pointerEvents = "auto";
+            document.getElementById("ha-lds-ellipsis-upload").style.display = "none";
+            oFormElement.elements.namedItem("upload-result").value = "Erfolg!";
+            if ("Prefix" in json[0]) {
+              document.getElementById("dropzone").style.pointerEvents = "auto";
+              document.getElementById("ha-lds-ellipsis-upload").style.display = "none";
+              window.location.replace("/Admin/Upload/" + json[0].Prefix);
+            }
+          }
+        })
+        .catch ((e) => { 
+          document.getElementById("dropzone").style.pointerEvents = "auto";
+          document.getElementById("ha-lds-ellipsis-upload").style.display = "none";
+          document.getElementById("ha-uploadmessage").style.opacity = "1";
+          oFormElement.elements.namedItem("upload-result").value = "Keine Antwort. Bitte Seite neu laden!";
+        })
+    }
+
+    window.addEventListener("load", () => {
+        var submitelement = document.getElementById("file");
+        var formelement = document.getElementById("uploadForm");
+        var dropzone = document.getElementById("dropzone");
+        submitelement.addEventListener("change", () => UPLOADSubmit(formelement));
+        dropzone.addEventListener("drop", (ev) => dropHandler(formelement, ev, dropzone));
+        dropzone.addEventListener("dragover", (ev) => dragOverHandler(ev, dropzone));
+        dropzone.addEventListener("dragleave", (ev) => dragLeaveHander(ev, dropzone));
+        dropzone.addEventListener("dragenter", (ev) => dragEnterHandler(ev, dropzone));
+    });
+</script>