Update release

docs/_config.yml

@@ -36,8 +36,8 @@ masthead_title           : "" # overrides the website title displayed in the mas
 breadcrumbs              : # true, false (default)
 words_per_minute         : 200
 enable_copy_code_button  : # true, false (default)
-copyright                : # "copyright" name, defaults to site.title
-copyright_url            : # "copyright" URL, defaults to site.url
+copyright                : "Epigraf Team"# "copyright" name, defaults to site.title
+copyright_url            : "https://epigraf.uni-muenster.de/pages/team"# "copyright" URL, defaults to site.url
 comments:
   provider               : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "giscus", "custom"
   disqus:
@@ -72,7 +72,7 @@ reCaptcha:
   secret                 :
 atom_feed:
   path                   : # blank (default) uses feed.xml
-  hide                   : # true, false (default)
+  hide                   : true # true, false (default)
 search                   : # true, false (default)
 search_full_content      : # true, false (default)
 search_provider          : # lunr (default), algolia, google

docs/_includes/footer.html

@@ -0,0 +1,21 @@
+<div class="page__footer-follow">
+    <ul class="social-icons">
+        {% if site.data.ui-text[site.locale].follow_label and false %} <!-- don't show RSS feed -->
+        <li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
+        {% endif %}
+
+        {% if site.footer.links %}
+        {% for link in site.footer.links %}
+        {% if link.label and link.url %}
+        <li><a href="{{ link.url }}" rel="nofollow noopener noreferrer"><i class="{{ link.icon | default: 'fas fa-link' }}" aria-hidden="true"></i> {{ link.label }}</a></li>
+        {% endif %}
+        {% endfor %}
+        {% endif %}
+
+        {% unless site.atom_feed.hide %}
+        <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | relative_url }}{% endif %}"><i class="fas fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
+        {% endunless %}
+    </ul>
+</div>
+
+<div class="page__footer-copyright">&copy; {{ site.time | date: '%Y' }} <a href="{{ site.copyright_url | default: site.url }}">{{ site.copyright | default: site.title }}</a>. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} <a href="https://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/jekyll-themes/minimal-mistakes/" rel="nofollow">Minimal Mistakes</a>.</div>

docs/assets/css/main.scss

@@ -1,12 +1,21 @@
 ---
+# Only the main Sass file needs front matter (the dashes are enough)
+search: false
 ---
 
-@import "{{ site.theme }}";
+@charset "utf-8";
+
+$h-size-1: 1.6em;
+$h-size-2: 1.25em;
+$h-size-3: 1.25em;
+$h-size-4: 1.25em;
+$h-size-5: 1.25em;
+$h-size-6: 1.25em;
+
+
+@import "minimal-mistakes/skins/{{ site.minimal_mistakes_skin | default: 'default' }}"; // skin
+@import "minimal-mistakes"; // main partials
 
 body {
     font-size: 0.75em;
 }
-
-h1, h2, h3, h4, h5, h6 {
-    font-size: 1.25em;
-}

docs/credits.md

@@ -25,33 +25,34 @@ collegues from Die Deutschen Inschriften and the Mainz Academy.
 Thanks to all of you who contribute to the Epigraf ecosystem.
 
 ## Third-party Components
-Epigraf is developed using third-party software under open source licences.
+Epigraf is developed using third-party software under open source licenses.
 
 - [Ace editor](https://ace.c9.io/), BSD License
-- [CakePHP](https://cakephp.org/), MIT Licence
+- [CakePHP](https://cakephp.org/), MIT License
 - [CKEditor](https://ckeditor.com/), GNU General Public License 2 or later
 - [Codeception](https://codeception.com/), MIT License
 - [dropzone.js](https://www.dropzone.dev/), MIT License
 - [ExifTool](https://exiftool.org/), GNU General Public License 1 or later
 - [Font Awesome](https://fontawesome.com/), SIL OFL 1.1 License
-- [Jeykyll](https://jekyllrb.com/), MIT Licence
-- [jQuery](https://jquery.com/), MIT Licence
-- [jQueryUI](https://jqueryui.com/), MIT Licence
-- [jsDoc](https://jsdoc.app/), Apache Licence, Version 2.0
+- [Jeykyll](https://jekyllrb.com/), MIT License
+- [jQuery](https://jquery.com/), MIT License
+- [jQueryUI](https://jqueryui.com/), MIT License
+- [jsDoc](https://jsdoc.app/), Apache License, Version 2.0
 - [Leaflet](https://leafletjs.com/), BSD 2-Clause "Simplified" License
-- [Leaflet Marker Cluster](https://github.com/Leaflet/Leaflet.markercluster), MIT Licence
-- [Leaflet Easy Button](https://github.com/CliffCloud/Leaflet.EasyButton), MIT Licence
-- [Leaflet Gesture Handling](https://github.com/elmarquis/Leaflet.GestureHandling), MIT Licence
-- [Leaflet Path Drag](https://github.com/w8r/Leaflet.Path.Drag), MIT Licence
+- [Leaflet Marker Cluster](https://github.com/Leaflet/Leaflet.markercluster), MIT License
+- [Leaflet Easy Button](https://github.com/CliffCloud/Leaflet.EasyButton), MIT License
+- [Leaflet Gesture Handling](https://github.com/elmarquis/Leaflet.GestureHandling), MIT License
+- [Leaflet Path Drag](https://github.com/w8r/Leaflet.Path.Drag), MIT License
 - [Lingui](https://lingui.dev/), MIT License
 - [mark.js](https://markjs.io/), MIT License
+- [Minimal Mistakes](https://mmistakes.github.io/minimal-mistakes/), MIT License
 - [npm](https://npmjs.com/), Artistic License 2.0,
-- [phpDocumentor](https://phpdoc.org/), MIT Licence
+- [phpDocumentor](https://phpdoc.org/), MIT License
 - [PHPUnit](https://phpunit.de/index.html), BSD 3-Clause License
-- [Plotly.js](https://github.com/plotly/plotly.js/), MIT Licence
-- [Poedit](https://poedit.net/), MIT Licence
+- [Plotly.js](https://github.com/plotly/plotly.js/), MIT License
+- [Poedit](https://poedit.net/), MIT License
 - [Saxon parser](https://www.saxonica.com/), Mozilla Public License version 2.0
 - [Source Sans 3](https://github.com/adobe-fonts/source-sans/),  SIL OFL 1.1 License
-- [Webpack](https://webpack.js.org/), MIT Licence
+- [Webpack](https://webpack.js.org/), MIT License
 
 A big "Thank you!" to all those projects!

docs/frontend/index.md

@@ -1,6 +1,7 @@
 ---
 title: Frontend
 permalink: '/frontend/'
+toc: false
 ---
 
 The frontend of Epigraf consists of HTML pages rendered by the CakePHP template system and styled with CSS.
@@ -12,4 +13,4 @@ For interactive trees, tables and other widgets, Epigraf implements an own EpiWi
 Bundling JavaScript files, CSS files, language resources and images is done using Webpack.
 All bundles can be generated at once by calling `npm run build`.
 
-![Edit with Epigraf](../assets/img/epigraf-editor.png)
+![Epigraf Editor](../assets/img/epigraf-editor.png)

docs/index.md

@@ -6,13 +6,11 @@
 # @license    https://www.gnu.org/licenses/old-licenses/gpl-2.0.html GPL 2.0
 #
 # To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
 title: Introduction
 permalink: /
 ---
 
 Epigraf is a research platform for collecting, annotating, linking and publishing multimodal text data.
-
 The data model supports research databases ranging from epistolary editions to social media corpora.
 Epigraf is currently used primarily for editing epigraphic data - inscriptions in connection with the objects to which they are attached.
 It includes a publication system for various document formats such as Word or TEI, structured JSON, XML and CSV data, and triples in TTL, JSON-LD and RDF/XML.

docs/tast/acceptance.md

@@ -1,6 +1,7 @@
 ---
 title: Acceptance Tests
 permalink: '/tests/acceptance/'
+toc: false
 ---
 
 Acceptance testing is primarily used to prevent unintended changes to the frontend.

docs/tast/index.md

@@ -1,6 +1,7 @@
 ---
 title: Tests
 permalink: '/tests/'
+toc: false
 ---
 
 Throughout the development process, Epigraf code is tested in two ways:

htdocs/js/jqueryui/LICENSE.txt

@@ -0,0 +1,34 @@
+
+License
+
+Note: For the purposes of this document, the term "Project" will refer to any OpenJS Foundation project
+using the MIT license AND referencing this document in the header of the distributed Project code or Project website source code.
+
+Source Code
+
+Projects referencing this document are released under the terms of the MIT license.
+
+The MIT License is simple and easy to understand and it places almost no restrictions on what you can do with the Project.
+
+You are free to use the Project in any other project (even commercial projects) as long as the copyright header is left intact.
+
+Sample Code
+
+All demos and examples, whether in a Project's repository or displayed on a Project site,
+are released under the terms of the license as specified in the relevant repository.
+Many Projects choose to release their sample code under the terms of CC0.
+
+CC0 is even more permissive than the MIT license, allowing you to use the code in any manner you want,
+without any copyright headers, notices, or other attribution.
+
+Web Sites
+
+The content on a Project web site referencing this document in its header is released under the terms of the license
+specified in the website's repository or if not specified, under the MIT license.
+
+The design, layout, and look-and-feel of a Project website is not licensed for use and may not be used on any site,
+personal or commercial, without prior written consent from the OpenJS Foundation.
+
+For information regarding OpenJS Foundation trademarks, please see Trademark Policy and Trademark List.
+
+Source: https://jquery.com/license/

plugins/Epi/src/Model/Entity/Article.php

@@ -1007,7 +1007,14 @@ public function addSection($sectionKey, $import = true)
      */
     public function numberSections()
     {
+        $numbers = [];
+
         foreach ($this->sections as $key => $section) {
+            $numbers[$section->parent_id ?? ''] = $numbers[$section->parent_id ?? ''] ?? [];
+            $currentNumber = ($numbers[$section->parent_id ?? ''][$section->sectiontype ?? ''] ?? 0) + 1;
+            $numbers[$section->parent_id ?? ''][$section->sectiontype ?? ''] = $currentNumber;
+            $section->number = $currentNumber;
+
             $section->sortno = $key + 1;
         }
     }