Merge branch 'master' into stable

dainst · May 31, 2024 · 4bf504f · 4bf504f
2 parents f528c34 + b4247f5
commit 4bf504f
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 1,568 deletions.
diff --git a/src/assets/images/content/how/iDAI.world_Systemnetzwerk1.png b/src/assets/images/content/how/iDAI.world_Systemnetzwerk1.png
diff --git a/src/assets/images/content/how/idai_idaiworldarchitecture_bookbrowser.jpg b/src/assets/images/content/how/idai_idaiworldarchitecture_bookbrowser.jpg
diff --git a/src/assets/images/content/how/idai_idaiworldarchitecture_repo.jpg b/src/assets/images/content/how/idai_idaiworldarchitecture_repo.jpg
diff --git a/...tent/what/archives/Idai_archive_rakob.jpg → ...tent/what/archives/idai_archive_rakob.jpg b/...tent/what/archives/Idai_archive_rakob.jpg → ...tent/what/archives/idai_archive_rakob.jpg
diff --git a/src/config/idai-nav.html b/src/config/idai-nav.html
@@ -1,64 +1,74 @@
 <html>
+
 <head>
-<style>
-body {
-  font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
-  font-size: 16px;
-}
-li {
-  list-style: none;
-  padding: 3px;
-}
-li.divider {
-  padding: 0;
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-a {
-  text-decoration: none;
-  color: #333;
-}
-a:hover {
-  text-decoration: underline;
-}
-</style>
+  <style>
+    body {
+      font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
+      font-size: 16px;
+    }
+
+    li {
+      list-style: none;
+      padding: 3px;
+    }
+
+    li.divider {
+      padding: 0;
+      height: 1px;
+      margin: 9px 0;
+      overflow: hidden;
+      background-color: #e5e5e5;
+    }
+
+    a {
+      text-decoration: none;
+      color: #333;
+    }
+
+    a:hover {
+      text-decoration: underline;
+    }
+  </style>
 </head>
+
 <body>
-<li>
-    <a href="https://idai.world" target="_blank">iDAI.world</a>
-</li>
-<li class="divider"></li>
-<li>
-    <a href="https://archives.dainst.org" target="_blank">iDAI.archives</a>
-</li>
-<li>
-    <a href="https://zenon.dainst.org" target="_blank">iDAI.bibliography&nbsp;/&nbsp;Zenon</a>
-</li>
-<li>
+  <li>
+    <a href="https://idai.world/" target="_blank">iDAI.world</a>
+  </li>
+  <li class="divider"></li>
+  <li>
+    <a href="https://archives.dainst.org/" target="_blank">iDAI.archives</a>
+  </li>
+  <li>
+    <a href="https://zenon.dainst.org/" target="_blank">iDAI.bibliography&nbsp;/&nbsp;Zenon</a>
+  </li>
+  <li>
     <a href="https://chronontology.dainst.org/" target="_blank">iDAI.chronontology</a>
-</li>
-<li>
-  <a href="https://field.idai.world/" target="_blank">iDAI.field</a>
-</li>
-<li>
+  </li>
+  <li>
+    <a href="https://field.idai.world/" target="_blank">iDAI.field</a>
+  </li>
+  <li>
     <a href="https://gazetteer.dainst.org/" target="_blank">iDAI.gazetteer</a>
-</li>
-<li>
+  </li>
+  <li>
     <a href="https://geoserver.dainst.org/" target="_blank">iDAI.geoserver</a>
-</li>
-<li>
+  </li>
+  <li>
     <a href="https://arachne.dainst.org/" target="_blank">iDAI.objects&nbsp;/&nbsp;Arachne</a>
-</li>
-<li>
-    <a href="https://publications.dainst.org" target="_blank">iDAI.publications</a>
-</li>
-<li>
-    <a href="http://thesauri.dainst.org" target="_blank">iDAI.thesaurus</a>
-</li>
-<li>
-    <a href="http://tutorials.idai.world" target="_blank">iDAI.tutorials</a>
-</li>
+  </li>
+  <li>
+    <a href="https://publications.dainst.org/" target="_blank">iDAI.publications</a>
+  </li>
+  <li>
+    <a href="http://repo.dainst.org/" target="_blank">iDAI.repo</a>
+  </li>
+  <li>
+    <a href="http://thesauri.dainst.org/" target="_blank">iDAI.thesauri</a>
+  </li>
+  <li>
+    <a href="http://tutorials.idai.world/" target="_blank">iDAI.tutorials</a>
+  </li>
 </body>
-</html>
+
+</html>
diff --git a/src/config/pages/dai-news.json_Afghanistan(turned off due to current events 24-08-21).json b/src/config/pages/dai-news.json_Afghanistan(turned off due to current events 24-08-21).json
diff --git a/src/config/pages/how/architecture2.html b/src/config/pages/how/architecture2.html
diff --git a/src/config/pages/how/architecture_img.html b/src/config/pages/how/architecture_img.html
@@ -0,0 +1,3 @@
+<div style="text-align: center;">
+    <img style="margin-left: auto; margin-right: auto; max-width: 750px;" src="assets/images/content/how/iDAI.world_Systemnetzwerk1.png">
+</div>
diff --git a/src/config/pages/how/idai-world-architecture copy.json b/src/config/pages/how/idai-world-architecture copy.json