Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
dersmon committed Sep 28, 2023
2 parents 95b1b7f + 4fcd4d2 commit d852f8d
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 23 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/config/pages/dai-news.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@
"type": "news",
"show": 20,
"articles": [
{
"date": "13.09.2023",
"category": "",
"headline": "Field Desktop 3.3 release",
"teaser": {
"content": "<p>A new minor version 3.3.0 of Field Desktop has been released</p><p>The release introduces new composite input fields and reworks several spatial relations.</p><p>Additionally, in an effort to improve community participation and to streamline the application's localization, a Weblate instance has been setup. Any researcher interested in helping can create an account and start translating into one or more preferred languages at <a href='https://weblate.dainst.org' target='_blank'>weblate.dainst.org</a>. For more information see also our Wiki on <a href='https://github.com/dainst/idai-field/wiki/Translating-Field-Desktop'>Github</a>.",
"image": {
"src": "/assets/images/content/news/2023/field-3-3-0_weblate_screenshot.png",
"title": "Weblate screenshot",
"caption": "Screenshot of Weblate's project overview"
}
},
"more": {
"content_html": "config/pages/news/2023-09-13_field-3-3-0.html"
}
},
{
"date": "24.03.2023",
"category": "",
Expand Down Expand Up @@ -69,6 +85,22 @@
"content_html": "config/pages/news/2022-11-14-idaifield-3-1-0.html"
}
},
{
"date": "22.04.2022",
"category": "",
"headline": "iDAI.field web release: <a href='https://field.idai.world/project/bourgou-online'>Henchir Bourgou</a>",
"teaser": {
"content": "<p>Henchir Bourgou is an ancient settlement of about 20 ha in the north-eastern hinterland of the island of Djerba. The <a href='https://field.idai.world/project/bourgou-online'>release</a> serves as a supplement to the publication in <a href='https://doi.org/10.34780/f05j-59fd'>Archäologischer Anzeiger 2021/2</a>.</p><p>This was the first time that a publication in Archäologischer Anzeiger has been linked to iDAI.field web. This ability to publish research data quickly, extensively and in detail online, and supplementary to a journal or monography, is a great advantage in using iDAI.field.</p><p>Another considerable benefit of direct online publication in iDAI.world is the possibility of providing type catalogues. In the case of Bourgou, the local <a href='https://field.idai.world/type/bourgou-online/1f3b1879-0c5a-47c2-8129-45548743e390'>type catalogue</a> could thus be made available publically available in a timely manner, which is especially helpful for researchers in the region. The evaluation and publication of the Bourgou project data within the framework of iDAI.world worked well and served as a basis for further publications in an interactive and online accessible research environment.</p>",
"image": {
"src": "/assets/images/content/news/2022/idai_news_bourgou.jpg",
"title": "Henchir Bourgou. Planum Schnitt 3–5",
"caption": "Henchir Bourgou. Planum Schnitt 3–5<br/><small>Source: Silvio Reichmuth, DAI. All rights reserved</small>"
}
},
"more": {
"content_html": "config/pages/news/2022-04-22-bourgou.html"
}
},
{
"date": "14.04.2022",
"category": "",
Expand Down
42 changes: 19 additions & 23 deletions src/config/pages/home/home-top.html
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,15 @@ <h2>

<!-- /.head_and_more -->


<div class="col-md-4 decoration-bg-gray">
<article class="article">
<div class="article__inner">
<div class="article__image-container">
<a href="news?item=1"
><div
class="article__image"
style="background-image: url(assets/images/content/news/2023/field-3-2-0-amh-logo.svg);"
style="background-image: url(assets/images/content/news/2023/field-3-3-0_weblate_screenshot.png);"
></div
></a>
<!-- /.article__image -->
Expand All @@ -263,16 +264,16 @@ <h2>

<div class="article__content">
<p class="article__date">
24.03.2023
13.09.2023
</p>
<!-- /.article__date -->

<h5 class="article_title">
<a href="news?item=1">Field Desktop 3.2 release</a>
<a href="news?item=1">Field Desktop 3.3 release</a>
</h5>
<!-- /.article__title -->

<p class="article__entry">This version marks the first official release created in cooperation with the <a href='https://amh.de/'>Archäologisches Museum Hamburg und Stadtmuseum Harburg (AMH).</a></p></p>
<p class="article__entry">The release introduces new composite input fields and reworks several spatial relations. We also setup a <a href="https://weblate.dainst.org" target="_blank">Weblate instance</a> to help localization.</p></p>
<!-- /.article__entry -->

<a href="news?item=1">read more></a>
Expand All @@ -285,16 +286,14 @@ <h5 class="article_title">
</div>




<div class="col-md-4 decoration-lighter-gray">
<div class="col-md-4 decoration-bg-gray">
<article class="article">
<div class="article__inner">
<div class="article__image-container">
<a href="news?item=2"
<a href="news?item=1"
><div
class="article__image"
style="background-image: url(assets/images/content/news/2023/fieldhub-issues.png);"
style="background-image: url(assets/images/content/news/2023/field-3-2-0-amh-logo.svg);"
></div
></a>
<!-- /.article__image -->
Expand All @@ -303,19 +302,19 @@ <h5 class="article_title">

<div class="article__content">
<p class="article__date">
21.03.2023
24.03.2023
</p>
<!-- /.article__date -->

<h5 class="article_title">
<a href="news?item=2">Issue monitoring in FieldHub</a>
<a href="news?item=1">Field Desktop 3.2 release</a>
</h5>
<!-- /.article__title -->

<p class="article__entry">A new version of FieldHub adds a project overview and issue monitoring.</p>
<p class="article__entry">This version marks the first official release created in cooperation with the <a href='https://amh.de/'>Archäologisches Museum Hamburg und Stadtmuseum Harburg (AMH).</a></p></p>
<!-- /.article__entry -->

<a href="news?item=2">read more></a>
<a href="news?item=1">read more></a>
</div>
<!-- /.article__content -->
</div>
Expand All @@ -325,15 +324,14 @@ <h5 class="article_title">
</div>



<div class="col-md-4 decoration-bg-gray">
<div class="col-md-4 decoration-lighter-gray">
<article class="article">
<div class="article__inner">
<div class="article__image-container">
<a href="news?item=3"
<a href="news?item=2"
><div
class="article__image"
style="background-image: url(assets/images/content/news/2022/screenshot-publications-3-3-0.png);"
style="background-image: url(assets/images/content/news/2023/fieldhub-issues.png);"
></div
></a>
<!-- /.article__image -->
Expand All @@ -342,28 +340,26 @@ <h5 class="article_title">

<div class="article__content">
<p class="article__date">
09.12.2022
21.03.2023
</p>
<!-- /.article__date -->

<h5 class="article_title">
<a href="news?item=3">iDAI.publications update and redesign</a>
<a href="news?item=2">Issue monitoring in FieldHub</a>
</h5>
<!-- /.article__title -->

<p class="article__entry">In parallel to a version upgrade to the underlying software components <a href='https://pkp.sfu.ca/software/ojs/' target='_blank'>OJS</a> and <a href='https://pkp.sfu.ca/software/omp/' target='_blank'>OMP</a>, a new shared theme is now live.</p>
<p class="article__entry">A new version of FieldHub adds a project overview and issue monitoring.</p>
<!-- /.article__entry -->

<a href="news?item=3">read more></a>
<a href="news?item=2">read more></a>
</div>
<!-- /.article__content -->
</div>
<!-- /.article__inner -->
</article>
<!-- /.article -->
</div>


<!-- /.news_articles -->

</div>
Expand Down
6 changes: 6 additions & 0 deletions src/config/pages/news/2022-04-22-bourgou.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<p>
The ancient name of the settlement is still unknown, although there are various references to the oppidum Phoar/Thoar mentioned by Pliny. Despite significant finds from surface surveys and the stately remains of a Hellenistic Mausoleum, which indicate a significant role for Henchir Bourgou in pre-Roman times, the ancient site was not initially listed as an official historical site. This was finally achieved in 2017, when a considerable part of the ancient area was threatened by the construction of a shopping mall. In response to an urgent request for assistance from the <a href="https://inp.rnrt.tn/" target="_blank">Institut National du Patrimoine</a> (INP/Tunisia), the Scientific Department of the <a href="https://www.dainst.org/">DAI</a> Head Office and the <a href="https://www.lmu.de/" target="_blank">Ludwig-Maximilians-University</a> of Munich carried out a magnetometer survey, covering around half of the ancient settlement area, revealing an enormous density of ancient buildings. Excavation carried out by the Tunisian archaeologists in the summer of 2018, and the processing of the finds by an international team the following year, showed a stratigraphy whose layers can be dated from the 8th century BCE to the 2nd century CE.
</p>
<p>
As part of these research activities, iDAI.field2 was employed. In order to be compatible with earlier datasets and to ensure later data comparability, an existing data collection table (xlsx-File) based on a system by French colleagues established in Tunisia for ceramic processing was compared with the data structure in iDAI.field2 and could be mapped to the fields (detailed report see: <a href="https://doi.org/10.34780/1m14-8g1p">Vom Feld in die Datenbank und zurück. iDAI.field als digitale Datenbank für die Verwaltung von alten und neuen Daten – ein Arbeitsbericht</a>). The (especially linguistic) adaptation on the basis of the same fields and the same/similar value lists enables homogeneous data collection and allows long-term comparison of data from different projects.
</p>
13 changes: 13 additions & 0 deletions src/config/pages/news/2023-09-13_field-3-3-0.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<section>
<ul>
<li>New input type "Composite field".</li>
<li>New dropdown input field with extended search support for valuelist fields and relations.</li>
<li>New spatial relations "abuts", "isAbuttedBy" and "bondsWith" are now available for stratigraphic units.</li>
<li>Spatial relations "fills", "isFilledBy", "abuts", "isAbuttedBy" and "bondsWith" are now reflected in matrix view.</li>
<li>Small info graphics are now shown for stratigraphical relations indicating how the respective relation is reflected in matrix view.</li>
</ul>

<hr>
The application download and a full list of changes can be found on <a
href="https://github.com/dainst/idai-field/releases/tag/v3.3.0" target="_blank">Github</a>.
</section>

0 comments on commit d852f8d

Please sign in to comment.