Skip to content

Commit

Permalink
Merge branch 'feature/pb-login-multiple-groups' of github.com:dalibor…
Browse files Browse the repository at this point in the history
…is/tei-publisher-components into feature/pb-login-multiple-groups
  • Loading branch information
daliboris committed Dec 2, 2023
2 parents 95457af + 909e2cf commit e139162
Show file tree
Hide file tree
Showing 19 changed files with 542 additions and 132 deletions.
113 changes: 113 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,116 @@
## [2.15.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.15.0...v2.15.1) (2023-11-22)


### Bug Fixes

* **pb-authority-lookup:** pass register type in events ([0d26d6a](https://github.com/eeditiones/tei-publisher-components/commit/0d26d6ab529378bb4c8f5f0b5278efbc667dca7d))

# [2.15.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.6...v2.15.0) (2023-11-22)


### Bug Fixes

* **i18n:** corrects preposition ([0f702ae](https://github.com/eeditiones/tei-publisher-components/commit/0f702aeabdd81e152503a410b048e7dc15af3229))
* **i18n:** minor correction in es translation ([811ff02](https://github.com/eeditiones/tei-publisher-components/commit/811ff02b91aa461d885933fdba66b6f318e575d4))


### Features

* **i18n:** adds missing translations in spanish ([4c231ab](https://github.com/eeditiones/tei-publisher-components/commit/4c231ab9dbdfcbed6429480d637dc676cb7b8aa1))

## [2.14.6](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.5...v2.14.6) (2023-11-21)


### Bug Fixes

* **pb-authority-lookup:** add missing i18n labels ([cdf33cb](https://github.com/eeditiones/tei-publisher-components/commit/cdf33cbe6194a4165f308f9e9f94af310def8b7f))
* **pb-authority-lookup:** fix undefined error ([d549209](https://github.com/eeditiones/tei-publisher-components/commit/d5492091c4b9a02ee6c345e61ad424ee554a70fe))
* **pb-authority-lookup,custom:** add property to info event details if authority is editable ([fd2e388](https://github.com/eeditiones/tei-publisher-components/commit/fd2e3885402e2cde219be1c3f9db4c162bdfd336))
* **pb-view-annotate:** add callback function to pb-annotation-detail event; refreshes popover position when called ([b76bf9f](https://github.com/eeditiones/tei-publisher-components/commit/b76bf9fd0cd7df30d5dc89f180dcb313e7ea836c))

## [2.14.5](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.4...v2.14.5) (2023-11-17)


### Bug Fixes

* **pb-authority,custom:** select method should not reject promise if no record is found in external authorities: the entry may only exist in the local register ([2c7ec1e](https://github.com/eeditiones/tei-publisher-components/commit/2c7ec1efa393084abcae570c790902d6912f26fd))

## [2.14.4](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.3...v2.14.4) (2023-11-16)


### Bug Fixes

* **pb-view-annotate:** suppress pb-selection-changed event if annotation is deleted ([c5cb4d9](https://github.com/eeditiones/tei-publisher-components/commit/c5cb4d992c1fc9ee34167f3a942715ac55b8232a))

## [2.14.3](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.2...v2.14.3) (2023-11-16)


### Bug Fixes

* **pb-authority-lookup,custom:** trigger pb-authority-error if saving to local registry fails ([66edabc](https://github.com/eeditiones/tei-publisher-components/commit/66edabc50913c38bcf20a9094d995800f8c17271))

## [2.14.2](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.1...v2.14.2) (2023-11-15)


### Bug Fixes

* **pb-authority-lookup:** emit event if user clicks add entity ([58e63a4](https://github.com/eeditiones/tei-publisher-components/commit/58e63a47a9c11ca35a6f53620aec5cfc0e52be96))

## [2.14.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.14.0...v2.14.1) (2023-11-12)


### Bug Fixes

* **pb-tify:** instead of using a custom property, link to the transcription page is now specified in a "rendering" property on the canvas ([c092878](https://github.com/eeditiones/tei-publisher-components/commit/c0928785ce31db2a95e765fde203e0c1e7443ec5))

# [2.14.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.13.2...v2.14.0) (2023-11-03)


### Bug Fixes

* **pb-select-feature:** determine initial state on load ([2a80ce0](https://github.com/eeditiones/tei-publisher-components/commit/2a80ce0f362025c6c09c205fddfb0e79c7514711))
* **pb-toggle-feature:** if selector specified, emit event on load ([7d3ff92](https://github.com/eeditiones/tei-publisher-components/commit/7d3ff9284f2e9afbf7d381654928bd3371f38060))


### Features

* **pb-toggle-feature:** add attribute "global": if set, toggles any matching selectors below the surrounding pb-page (i.e. not just in connected pb-view/pb-load) ([18ee228](https://github.com/eeditiones/tei-publisher-components/commit/18ee22805550e5f663b89c7a1c4d51442e36cde3))

## [2.13.2](https://github.com/eeditiones/tei-publisher-components/compare/v2.13.1...v2.13.2) (2023-10-26)


### Bug Fixes

* **pb-authority-lookup,airtable:** avoid javascript console error, report missing record for key ([c483125](https://github.com/eeditiones/tei-publisher-components/commit/c4831252602062685b03f3f3fe3f1f51776ddc04))

## [2.13.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.13.0...v2.13.1) (2023-10-24)


### Bug Fixes

* **pb-authority-lookup:** fix issue with authority entry list display ([427ac63](https://github.com/eeditiones/tei-publisher-components/commit/427ac63039cd9b572a0d2a57306964cb02bf7d45))

# [2.13.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.12.10...v2.13.0) (2023-10-24)


### Features

* **pb-authority-lookup:** custom connector can now have an edit button (used by future versions of annotation tool) ([1240172](https://github.com/eeditiones/tei-publisher-components/commit/124017238557f1d6bfe93c6a4da91e6caece6f31))

## [2.12.10](https://github.com/eeditiones/tei-publisher-components/compare/v2.12.9...v2.12.10) (2023-10-23)


### Bug Fixes

* **pb-load:** add property 'plain' to prevent pb-load injecting internal parameters like 'start' or 'language' ([a9b7b8f](https://github.com/eeditiones/tei-publisher-components/commit/a9b7b8f08fa61d55ea61f409ebdd7fbcf93acf40))

## [2.12.9](https://github.com/eeditiones/tei-publisher-components/compare/v2.12.8...v2.12.9) (2023-10-23)


### Bug Fixes

* **pb-combo-box:** drop change listener as this is leading to display issues ([73cf4be](https://github.com/eeditiones/tei-publisher-components/commit/73cf4be4171414479534e7c1f3bc56c870abfb17))

## [2.12.8](https://github.com/eeditiones/tei-publisher-components/compare/v2.12.7...v2.12.8) (2023-10-22)


Expand Down
68 changes: 68 additions & 0 deletions demo/pb-toggle-feature4.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<html>

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes" />

<title>pb-toggle-feature Demo</title>
<link rel="stylesheet" href="demo.css">
<!--scripts-->
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js" defer></script>
<script type="module" src="../node_modules/@polymer/iron-icons/iron-icons.js"></script>
<script type="module" src="../node_modules/@polymer/paper-icon-button/paper-icon-button.js"></script>
<script type="module" src="../src/docs/pb-demo-snippet.js"></script>
<script type="module" src="../src/pb-page.js"></script>
<script type="module" src="../src/pb-document.js"></script>
<script type="module" src="../src/pb-popover.js"></script>
<script type="module" src="../src/pb-highlight.js"></script>
<script type="module" src="../src/pb-toggle-feature.js"></script>
<script type="module" src="../src/pb-select-feature.js"></script>
<script type="module" src="../src/pb-view.js"></script>
<script type="module" src="../src/pb-load.js"></script>
<script type="module" src="../src/pb-navigation.js"></script>
<!--/scripts-->
</head>

<body>
<pb-demo-snippet>
<template>
<style>
.toolbar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px;
background-color: #E0E0E0;
}
h1.toggle {
color:chocolate;
}
.switch:not(.toggle), .select:not(.toggle) {
display: none;
}
</style>
<pb-page endpoint="http://localhost:8080/exist/apps/tei-publisher" url-path="query" version="1.0">
<pb-document id="document2" path="test/cortes_to_dantiscus.xml" odd="dantiscus"></pb-document>
<div class="toolbar">
<pb-toggle-feature name="mode" selector="main h1, .switch"
default="off" global="">Toggle </pb-toggle-feature>
<pb-select-feature name="select" label="Select" items='[
{"name": "Feature enabled", "selectors": [{"selector": ".select", "state": true, "global": true}]},
{"name": "Feature disabled", "selectors": [{"selector": ".select", "state": false, "global": true}]}
]'
></pb-select-feature>
</div>
<main>
<p class="switch">Feature 1 is enabled by pb-toggle-feature!</p>
<p class="select">Feature 2 is enabled by pb-select-feature!</p>
<h1>Toggle features outside pb-view/pb-load</h1>
<p>By specifying the "global" attribute, one can toggle features on any element
selected by the selector below the surrounding pb-page.
</p>
</main>
</pb-page>
</template>
</pb-demo-snippet>
</body>

</html>
71 changes: 47 additions & 24 deletions i18n/common/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@
},
"browse": {
"description": "Diese Anwendung dient vorrangig zum Experimentieren mit verschiedenen Dokumenten und deren Transformationen über das TEI Processing Model. Es können eigene Dateien hochgeladen und neue ODDs erstellt werden.",
"login": "zum Hochladen eigener Dateien oder Zugriff auf administrative Funktionen (Standardnutzer: 'tei-demo', Passwort: 'demo').",
"login": "zum Hochladen eigener Dateien oder Zugriff auf administrative Funktionen (Standardnutzer: 'tei', Passwort: 'simple').",
"login-1": "Anmelden als ",
"login-2": "mit Passwort",
"login-3": "um mit eigenen Dateien und ODDs zu experimentieren",
"sort": "Sortiere nach",
"filter": "Filtere nach",
"filterPlaceholder": "Filter",
Expand All @@ -60,6 +63,9 @@
"confirmDeletion": "Möchten Sie die Datei wirklich löschen?",
"confirmDeletion_plural": "Möchten Sie wirklich {{count}} Dateien löschen?",
"documents": "Dokumente",
"documents-removed": "Dokumente gelöscht",
"document-not-found": "Dokument nicht gefunden",
"document-remove-failed": "Löschen des Dokuments fehlgeschlagen",
"collections": "Lokale Sammlung",
"dts": "Distributed Text Services (experimentell)",
"test": {
Expand All @@ -78,6 +84,10 @@
"title": "Markdown-Beispiel",
"description": "Ein Beispiel zur Verwendung von Markdown für statische Inhalte."
},
"annotate": {
"title": "Annotierte Dokumente",
"description": "Beschreibbare Sammlung zum Annotieren von Dokumenten."
},
"up": "Übergeordnetes Verzeichnis"
},
"upload": {
Expand Down Expand Up @@ -111,11 +121,15 @@
"reset": "Zurücksetzen",
"placeholder": "Suche nach",
"sections": "Abschnitte durchsuchen",
"headings": "Überschriften durchsuchen"
"headings": "Überschriften durchsuchen",
"title": "Titel suchen",
"content": "Inhalte durchsuchen",
"scope": "Suchbereich"
},
"dts": {
"endpoint": "Server wählen",
"note": "Experimentell: Zugriff auf externe Editionen über DTS API"
"note": "Experimentell: Zugriff auf externe Editionen über DTS API",
"requires-login": "Anmeldung erforderlich"
},
"odd": {
"files": "ODD Dateien",
Expand Down Expand Up @@ -175,7 +189,10 @@
"facets": {
"show": "Zeige 50 häufigste",
"genre": "Genre",
"language": "Sprache"
"language": "Sprache",
"feature": "Feature",
"form": "Art der Quelle",
"period": "Zeitraum"
},
"appgen": {
"account": {
Expand Down Expand Up @@ -217,46 +234,52 @@
"success": "Deine App wurde erfolgreich generiert!"
},
"annotations": {
"abbreviation": "Abkürzung",
"delete": "Annotation löschen",
"edit": "Annotation ändern",
"delete": "Annotation löschen",
"save": "Änderungen ins TEI speichern",
"no-properties": "Keine Eigenschaften vorhanden.",
"occurrences": "Vorkommen im Text",
"organisation": "Organisation",
"person": "Person",
"organisation": "Organisation",
"place": "Ort",
"term": "Term",
"term": "Begriff",
"date": "Datum",
"apply": "Anwenden",
"reg": "Regularisierung",
"app": "Apparatus",
"hi": "Hervorhebung",
"ref": "Link (ref)",
"abbreviation": "Abkürzung",
"occurrences": "Vorkommen im Text",
"correction": "Korrektur",
"expansion": "Auflösung",
"reference": "Referenz",
"expansion": "Erweiterung",
"lookup": "Entität suchen",
"apply": "Anwenden",
"apply-all": "Alle selektieren und anwenden",
"changes": "Änderungen",
"reg": "Regularisierung",
"hi": "Hervorhebung",
"app": "Apparatus",
"download": "Ergebnis als lokale Datei speichern",
"restore": "Es wurden Annotationen für dieses Dokument aus einer früheren Sitzung gefunden. Möchtest Du diese wiederherstellen?",
"undo": "Letzten Arbeitsschritt rückgängig machen",
"lookup": "Entität suchen",
"download": "Ergebnis als lokale Datei speichern",
"reload": "Quelle neu laden",
"preview": "Voransicht erneuern",
"save": "Änderungen ins TEI speichern",
"confirm-restore-title": "Annotationen wiederherstellen",
"restore": "Es wurden Annotationen für dieses Dokument aus einer früheren Sitzung gefunden. Möchtest Du diese wiederherstellen?",
"confirm-reload-title": "Quelle neu laden",
"confirm-reload": "Annotationen verwerfen und Quelle neu laden?",
"confirm-reload-title": "Quelle neu laden?",
"confirm-restore-title": "Annotationen wiederherstellen?",
"ref": "Link (ref)",
"reload": "Quelle neu laden",
"modify": "Änderung am Text vornehmen",
"modify-info": "Achtung: dies ist keine Annotation. Die Änderung wird beim Merge auf den Transkriptionstext angewandt.",
"apply-all": "Alle selektieren und anwenden",
"permission": "Zugriff verweigert: keine Berechtigung zum Speichern von Annotationen.",
"ner": {
"title": "Automatische Entitätenerkennung",
"description": "Erkannte Entitäten werden als Annotationen markiert.",
"run": "Ausführen",
"model": "Wähle ein Modell",
"denied": "Ungespeicherte Änderungen gefunden: bitte zuerst speichern oder verwerfen."
}
},
"confirm-discard-title": "Verwerfen",
"confirm-discard": "Liste anderer Vorkommen verwerfen?",
"doc-count": "{{count}} von {{total}}",
"toggle": "Ein-/Ausblenden der Vorschau/Kontrollleiste",
"add-entity": "Entität hinzufügen",
"edit-entity": "Entität bearbeiten"
},
"ner": {
"title": "Trainiere ein Modell zur Entitätenerkennung",
Expand Down
5 changes: 4 additions & 1 deletion i18n/common/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,10 @@
},
"confirm-discard-title": "Discard",
"confirm-discard": "Discard the list of occurrences?",
"doc-count": "{{count}} von {{total}}"
"doc-count": "{{count}} von {{total}}",
"toggle": "Show/hide preview/control panel",
"add-entity": "Create entity",
"edit-entity": "Edit entity"
},
"ner": {
"title": "Train a Named Entity Recognition Model",
Expand Down
Loading

0 comments on commit e139162

Please sign in to comment.