From 1a969256166f4ec88d4356d5ba6c76fe8cd387af Mon Sep 17 00:00:00 2001 From: Simon Sendler Date: Wed, 10 Jul 2024 11:14:13 +0200 Subject: [PATCH 001/271] fix: provide disabled state for badges in fieldSet --- .../uii/templatePG/css/src/components/_forms-custom.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss index 226777f49..1577df75d 100644 --- a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss +++ b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss @@ -153,6 +153,11 @@ body { border-width: 0 !important; } +fieldSet:disabled .badge { + opacity: var(--bs-btn-disabled-opacity); + pointer-events: none; +} + // re-implementation of forms in non-combinatory classes .form-row { border-block-end: 1px solid var(--clr-neutral-300); From cb5328c5ec385092a348237f609877fabb0437fc Mon Sep 17 00:00:00 2001 From: Simon Sendler Date: Wed, 10 Jul 2024 11:22:53 +0200 Subject: [PATCH 002/271] fix: also disable links in badges --- .../uii/templatePG/css/src/components/_forms-custom.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss index 1577df75d..735c6ceff 100644 --- a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss +++ b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss @@ -153,7 +153,8 @@ body { border-width: 0 !important; } -fieldSet:disabled .badge { +fieldSet:disabled .badge, +fieldSet:disabled .badge > a { opacity: var(--bs-btn-disabled-opacity); pointer-events: none; } From 5f98c736e9b80cd27186ac293e3c5e8ba8c08396 Mon Sep 17 00:00:00 2001 From: Release-Tool Date: Wed, 10 Jul 2024 11:51:56 +0200 Subject: [PATCH 003/271] Change project version to 24.07-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad0aa93ba..88c77ea55 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.goobi.workflow workflow-base - 24.06 + 24.07-SNAPSHOT workflow-core From 6798197a41b3637c2f138222e1dad5c0c56320de Mon Sep 17 00:00:00 2001 From: Steffen Hankiewicz Date: Thu, 11 Jul 2024 21:34:50 +0200 Subject: [PATCH 004/271] renamed liechtenstein import in messages --- src/main/resources/messages_de.properties | 2 +- src/main/resources/messages_en.properties | 2 +- src/main/resources/messages_es.properties | 2 +- src/main/resources/messages_fr.properties | 2 +- src/main/resources/messages_it.properties | 2 +- src/main/resources/messages_iw.properties | 7 ++++++- src/main/resources/messages_nl.properties | 2 +- src/main/resources/messages_pt.properties | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index 6df2c3d4e..25d71dafe 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin intranda_workflow_fileUploadProcessCreation=Dateiupload zur Vorgangserzeugung intranda_workflow_hu_importer=Import f\u00FCr das Sammlungsportal intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt intranda_workflow_massupload=Massenupload Plugin intranda_workflow_metadata-enrichment=Aktualisierung von Vokabularverlinkungen +intranda_workflow_newspaper_pages_importer=Zeitungsimport f\u00FCr Einzelseiten intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Projektexport invalidCharacter=Der Name enth\u00E4lt ung\u00FCltige Zeichen diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 8281cfcc6..d11830d03 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin intranda_workflow_fileUploadProcessCreation=File upload for process creation intranda_workflow_hu_importer=Import for the collection portal intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Mass upload plugin intranda_workflow_metadata-enrichment=Updating vocabulary links zzz +intranda_workflow_newspaper_pages_importer=Newspaper import for single pages zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export invalidCharacter=The name contains invalid characters diff --git a/src/main/resources/messages_es.properties b/src/main/resources/messages_es.properties index 34c9f908d..245095bc8 100644 --- a/src/main/resources/messages_es.properties +++ b/src/main/resources/messages_es.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin intranda_workflow_fileUploadProcessCreation=Carga de archivos para la generaci\u00F3n de operaciones zzz intranda_workflow_hu_importer=Importaci\u00F3n para el portal de recogida zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Plugin para carga de archivos en masa intranda_workflow_metadata-enrichment=Actualizaci\u00F3n de enlaces de vocabulario zzz +intranda_workflow_newspaper_pages_importer=Importaci\u00F3n de peri\u00F3dicos de una sola p\u00E1gina zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=El nombre contiene caracteres no v\u00E1lidos diff --git a/src/main/resources/messages_fr.properties b/src/main/resources/messages_fr.properties index 23ffde99a..e12c16bd8 100644 --- a/src/main/resources/messages_fr.properties +++ b/src/main/resources/messages_fr.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin zzz intranda_workflow_fileUploadProcessCreation=T\u00E9l\u00E9chargement de fichiers pour la g\u00E9n\u00E9ration d'op\u00E9rations zzz intranda_workflow_hu_importer=Importation pour le portail des collections zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Mass upload plugin zzz intranda_workflow_metadata-enrichment=Mise \u00E0 jour des liens de vocabulaire zzz +intranda_workflow_newspaper_pages_importer=Importation de journaux pour des pages individuelles zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=The name contains invalid characters zzz diff --git a/src/main/resources/messages_it.properties b/src/main/resources/messages_it.properties index c0dd050fb..afae60145 100644 --- a/src/main/resources/messages_it.properties +++ b/src/main/resources/messages_it.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Plugin per il caricamento di Yerusha zzz intranda_workflow_fileUploadProcessCreation=Caricamento di file per la generazione di operazioni zzz intranda_workflow_hu_importer=Importazione per il portale di raccolta zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Plugin per l'upload di massa zzz intranda_workflow_metadata-enrichment=Aggiornamento dei link al vocabolario zzz +intranda_workflow_newspaper_pages_importer=Importazione di giornali per pagine singole zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=Il nome contiene caratteri non validi zzz diff --git a/src/main/resources/messages_iw.properties b/src/main/resources/messages_iw.properties index 905b070d5..d806a13e4 100644 --- a/src/main/resources/messages_iw.properties +++ b/src/main/resources/messages_iw.properties @@ -1299,6 +1299,7 @@ intranda_administration_showconfigfiles=Show config files zzz intranda_administration_snippetCreator=Snippet Creator intranda_administration_vocabularies=zzz intranda_metadata_changeType=zzz +intranda_metadata_createStructureElements=zzz intranda_quartz_herisJob=zzz intranda_statistics_allStepsPerProject=\u05E9\u05DC\u05D1\u05D9 \u05DE\u05D4\u05DC\u05DA-\u05E2\u05D1\u05D5\u05D3\u05D4 \u05E4\u05E8 \u05E4\u05E8\u05D5\u05D9\u05D9\u05E7\u05D8 intranda_statistics_file_count=Determine number of files zzz @@ -1330,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin intranda_workflow_fileUploadProcessCreation=File upload for process creation zzz intranda_workflow_hu_importer=Import for the collection portal zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=\u05D4\u05E6\u05D8\u05D1\u05E8\u05D5\u05EA \u05D4\u05E2\u05DC\u05D0\u05EA \u05E4\u05DC\u05D0\u05D2-\u05D0\u05D9\u05DF intranda_workflow_metadata-enrichment=Updating vocabulary links zzz +intranda_workflow_newspaper_pages_importer=Newspaper import for single pages zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=\u05EA\u05D5 \u05DC\u05D0 \u05D7\u05D5\u05E7\u05D9 @@ -2873,6 +2874,10 @@ plugin_massupload_use_home_directory=\u05D8\u05E2\u05DF \u05EA\u05DE\u05D5\u05E0 plugin_metadata_changeTemplate_changeTemplate=zzz plugin_metadata_changeTemplate_description=zzz plugin_metadata_changeTemplate_selectTemplate=zzz +plugin_metadata_createElements_generateElements=zzz +plugin_metadata_createElements_generateTitle=zzz +plugin_metadata_createElements_numberOfImages=zzz +plugin_metadata_createElements_selectType=zzz plugin_newspaperRecognizer_applyEveryIssue=Apply every issue zzz plugin_newspaperRecognizer_applyEverySecondIssue=Apply every second issue zzz plugin_newspaperRecognizer_applyEveryThirdIssue=Apply every third issue zzz diff --git a/src/main/resources/messages_nl.properties b/src/main/resources/messages_nl.properties index 81a4261d7..c143ad29f 100644 --- a/src/main/resources/messages_nl.properties +++ b/src/main/resources/messages_nl.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin zzz intranda_workflow_fileUploadProcessCreation=Bestand uploaden voor operatie generatie zzz intranda_workflow_hu_importer=Invoer voor het inzamelportaal zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Massa upload plugin zzz intranda_workflow_metadata-enrichment=Bijwerken van vocabulaire links zzz +intranda_workflow_newspaper_pages_importer=Kranten importeren voor afzonderlijke pagina's zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=De naam bevat ongeldige tekens zzz diff --git a/src/main/resources/messages_pt.properties b/src/main/resources/messages_pt.properties index 2280817d5..b74919ee3 100644 --- a/src/main/resources/messages_pt.properties +++ b/src/main/resources/messages_pt.properties @@ -1331,9 +1331,9 @@ intranda_workflow_excelimport=Yerusha Upload Plugin zzz intranda_workflow_fileUploadProcessCreation=Carregamento de ficheiros para gera\u00E7\u00E3o de opera\u00E7\u00F5es zzz intranda_workflow_hu_importer=Importa\u00E7\u00E3o para o portal de recolha zzz intranda_workflow_khm_importer=KHM Importer -intranda_workflow_liechtenstein_volksblatt_importer=Zeitungsimport Liechtensteiner Volksblatt zzz intranda_workflow_massupload=Plugin de carregamento em massa zzz intranda_workflow_metadata-enrichment=Actualizar as liga\u00E7\u00F5es dos voc\u00E1bulos zzz +intranda_workflow_newspaper_pages_importer=Importa\u00E7\u00E3o de jornais para p\u00E1ginas individuais zzz intranda_workflow_oepma_importer=\u00D6PMA Importer intranda_workflow_projectexport=Project export zzz invalidCharacter=O nome cont\u00E9m caracteres inv\u00E1lidos zzz From 28737de5d40526871f0e344ac6724fcc5c1f8bef Mon Sep 17 00:00:00 2001 From: Robert Sehr Date: Mon, 15 Jul 2024 10:08:10 +0200 Subject: [PATCH 005/271] new messages for archive management --- src/main/resources/messages_de.properties | 9 +++++++++ src/main/resources/messages_en.properties | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index 25d71dafe..cd6e3f234 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -2282,6 +2282,12 @@ plugin_admin_vocabulary_noVocabularyLoaded=Es ist kein Vokabular geladen. Bitte plugin_admin_vocabulary_select=Ausw\u00E4hlbare Werte plugin_admin_vocabulary_type=Typ plugin_admin_vocabulary_validation=Validierungsausdruck +plugin_administration_archive_AcquisitionAgent=Akquisiteur +plugin_administration_archive_AcquisitionMethod=Erwerbsmethode +plugin_administration_archive_AcquisitionNotes=Anmerkungen zum Erwerb +plugin_administration_archive_ArchivistNote=Information des Bearbeiters +plugin_administration_archive_Conventions=Konventionen +plugin_administration_archive_DescriptionDates=Datum oder Zeitraum der Verzeichnung plugin_administration_archive_Number=Archiv Nummer plugin_administration_archive_Shelfmark=Signatur(en) plugin_administration_archive_accessrestrict=Zugangsbestimmungen @@ -2289,6 +2295,7 @@ plugin_administration_archive_accruals=Neuzug\u00E4nge plugin_administration_archive_accruals_head=\u00DCberschrift plugin_administration_archive_accruals_p=Beschreibung plugin_administration_archive_acqinfo=Abgebende Stelle +plugin_administration_archive_addMultipleNodes=Mehrere Unterknoten an dieser Stelle einf\u00FCgen plugin_administration_archive_advancedSearch=Erweiterte Suche plugin_administration_archive_agencycode=Agency code plugin_administration_archive_altformavail=Kopien bzw. Reproduktionen @@ -2380,6 +2387,7 @@ plugin_administration_archive_scopecontent=Form und Inhalt plugin_administration_archive_selectionHeading=Auswahl des Archivbestands plugin_administration_archive_selectionText=Bitte w\u00E4hlen Sie zun\u00E4chst den Archivbestand aus, mit dem Sie arbeiten m\u00F6chten\: plugin_administration_archive_separatedmaterial=Verwandte Verzeichnungseinheiten +plugin_administration_archive_showAllFields=Alle Felder anzeigen plugin_administration_archive_show_details=Details einblenden plugin_administration_archive_suffix=Suffix plugin_administration_archive_titleproper=Titel des Findbuches @@ -2552,6 +2560,7 @@ plugin_administration_licences_name=Name plugin_administration_licences_ordernumber=Bestellnummer plugin_administration_licences_type=Typ plugin_administration_licences_usage=Verbrauch +plugin_administration_linkNodeModalDesciption=W\u00E4hlen Sie den Knoten aus, zu dem eine Verkn\u00FCpfung erstellt werden soll. plugin_administration_missingPermission=Um diese Seite anzuzeigen, ben\u00F6tigen Sie die folgende Berechtigung\: plugin_administration_nli_daily_press_cancelMessageMultipleImport=Der Import von mehreren Datens\u00E4tzen wurde abgebrochen. plugin_administration_nli_daily_press_cancelMessageSingleImport=Der Import eines einzelnen Datensatzes wurde abgebrochen. diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index d11830d03..5a7c96752 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -2282,6 +2282,12 @@ plugin_admin_vocabulary_noVocabularyLoaded=Currently, there is no vocabulary loa plugin_admin_vocabulary_select=Selectable values plugin_admin_vocabulary_type=Type plugin_admin_vocabulary_validation=Validation expression +plugin_administration_archive_AcquisitionAgent=Acquisition agentzzz +plugin_administration_archive_AcquisitionMethod=Acquisition methodzzz +plugin_administration_archive_AcquisitionNotes=Notes on the acquisitionzzz +plugin_administration_archive_ArchivistNote=Archivist's notezzz +plugin_administration_archive_Conventions=Conventionszzz +plugin_administration_archive_DescriptionDates=Date(s) of descriptionszzz plugin_administration_archive_Number=Archive Number plugin_administration_archive_Shelfmark=Reference code(s) plugin_administration_archive_accessrestrict=Conditions governing access @@ -2289,6 +2295,8 @@ plugin_administration_archive_accruals=Accruals plugin_administration_archive_accruals_head=Headingzzz plugin_administration_archive_accruals_p=Descriptionzzz plugin_administration_archive_acqinfo=Immediate source of acquisition or transfer +plugin_administration_archive_addMultipleNodes=Insert multiple subnodes at this positionzzz +plugin_administration_archive_advancedSearch=Advanced searchzzz plugin_administration_archive_advancedSearch=Advanced searchzzz plugin_administration_archive_agencycode=Agency code plugin_administration_archive_altformavail=Existence and location of copies @@ -2306,6 +2314,7 @@ plugin_administration_archive_arrangement=System of arrangement plugin_administration_archive_bibliography=Publication note plugin_administration_archive_bioghist=Administrative | Biographical history plugin_administration_archive_c=The database file cannot be loaded. +plugin_administration_archive_clear=Clear entrieszzz plugin_administration_archive_clear=Clear inputszzz plugin_administration_archive_conventiondeclaration=Rules or Conventions plugin_administration_archive_createNewArchive=Create new record group @@ -2324,7 +2333,7 @@ plugin_administration_archive_deleteNode=Delete node plugin_administration_archive_descriptionLevel=Level of description plugin_administration_archive_didnote=Note plugin_administration_archive_download=Download as EAD file -plugin_administration_archive_duplicateEadFile=Create a copy of the filezzz +plugin_administration_archive_duplicateEadFile=Create a copy of the inventoryzzz plugin_administration_archive_duplicateNode=Duplicate nodezzz plugin_administration_archive_eadid=EAD ID plugin_administration_archive_editorName=Editor zzz @@ -2380,6 +2389,7 @@ plugin_administration_archive_scopecontent=Scope and content plugin_administration_archive_selectionHeading=Selection of the record group plugin_administration_archive_selectionText=Please first select the record group you would like to work with\: plugin_administration_archive_separatedmaterial=Related units of description +plugin_administration_archive_showAllFields=Show all fieldszzz plugin_administration_archive_show_details=Show details plugin_administration_archive_suffix=Suffixzzz plugin_administration_archive_titleproper=Title of the Finding Aidzzz @@ -2552,6 +2562,7 @@ plugin_administration_licences_name=Name plugin_administration_licences_ordernumber=Order number plugin_administration_licences_type=Type plugin_administration_licences_usage=Usage +plugin_administration_linkNodeModalDesciption=Select the node to which a reference is to be created.zzz plugin_administration_missingPermission=To view this page, you need the following permission\: plugin_administration_nli_daily_press_cancelMessageMultipleImport=The import of multiple records was cancelled. plugin_administration_nli_daily_press_cancelMessageSingleImport=The import of a single record was cancelled. From fe912d2fd883c7786de121116f22e07ef8705ccd Mon Sep 17 00:00:00 2001 From: Robert Sehr Date: Wed, 17 Jul 2024 11:36:25 +0200 Subject: [PATCH 006/271] new messages for archive management --- src/main/resources/messages_de.properties | 2 ++ src/main/resources/messages_en.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index cd6e3f234..2ff1f6c12 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -2333,6 +2333,8 @@ plugin_administration_archive_didnote=Allgemeine Anmerkungen plugin_administration_archive_download=Download als EAD-Datei plugin_administration_archive_duplicateEadFile=Kopie des Bestands erstellen plugin_administration_archive_duplicateNode=Knoten duplizieren +plugin_administration_archive_eadExport=Viewer export +plugin_administration_archive_eadExportNotConfigured=Export ist nicht konfiguriert plugin_administration_archive_eadid=EAD ID plugin_administration_archive_editorName=Bearbeiter plugin_administration_archive_extref=Beschreibung des Links diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 5a7c96752..419012087 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -2297,7 +2297,6 @@ plugin_administration_archive_accruals_p=Descriptionzzz plugin_administration_archive_acqinfo=Immediate source of acquisition or transfer plugin_administration_archive_addMultipleNodes=Insert multiple subnodes at this positionzzz plugin_administration_archive_advancedSearch=Advanced searchzzz -plugin_administration_archive_advancedSearch=Advanced searchzzz plugin_administration_archive_agencycode=Agency code plugin_administration_archive_altformavail=Existence and location of copies plugin_administration_archive_altformavail_head=Headingzzz @@ -2314,7 +2313,6 @@ plugin_administration_archive_arrangement=System of arrangement plugin_administration_archive_bibliography=Publication note plugin_administration_archive_bioghist=Administrative | Biographical history plugin_administration_archive_c=The database file cannot be loaded. -plugin_administration_archive_clear=Clear entrieszzz plugin_administration_archive_clear=Clear inputszzz plugin_administration_archive_conventiondeclaration=Rules or Conventions plugin_administration_archive_createNewArchive=Create new record group @@ -2335,6 +2333,8 @@ plugin_administration_archive_didnote=Note plugin_administration_archive_download=Download as EAD file plugin_administration_archive_duplicateEadFile=Create a copy of the inventoryzzz plugin_administration_archive_duplicateNode=Duplicate nodezzz +plugin_administration_archive_eadExport=Viewer exportzzz +plugin_administration_archive_eadExportNotConfigured=Export is not configuredzzz plugin_administration_archive_eadid=EAD ID plugin_administration_archive_editorName=Editor zzz plugin_administration_archive_extref=Link descriptionzzz From 2bf94d45ee27bebd5411e0c32b4e17a947a543ca Mon Sep 17 00:00:00 2001 From: Florian Alpers Date: Fri, 19 Jul 2024 10:05:03 +0200 Subject: [PATCH 007/271] Use correct authority urls in alto editor sort auhtority entitites alphabetically in alto editor selection dropdown --- src/main/java/de/sub/goobi/metadaten/Metadaten.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/sub/goobi/metadaten/Metadaten.java b/src/main/java/de/sub/goobi/metadaten/Metadaten.java index f201577f0..4a3f24ba3 100644 --- a/src/main/java/de/sub/goobi/metadaten/Metadaten.java +++ b/src/main/java/de/sub/goobi/metadaten/Metadaten.java @@ -5207,18 +5207,25 @@ public String getAuthorityMetadataJSON() { List authorityList = new ArrayList<>(); for (Person person : persons) { - AuthorityData data = new AuthorityData(person.getDisplayname(), person.getAuthorityURI() + person.getAuthorityValue()); + AuthorityData data = + new AuthorityData(person.getDisplayname(), + URI.create(Optional.ofNullable(person.getAuthorityURI()).orElse("")).resolve(person.getAuthorityValue()).toString()); authorityList.add(data); } for (Corporate corporate : corporates) { - AuthorityData data = new AuthorityData(corporate.getMainName(), corporate.getAuthorityURI() + corporate.getAuthorityValue()); + AuthorityData data = new AuthorityData(corporate.getMainName(), + URI.create(Optional.ofNullable(corporate.getAuthorityURI()).orElse("")).resolve(corporate.getAuthorityValue()).toString()); authorityList.add(data); } for (Metadata md : metadata) { - AuthorityData data = new AuthorityData(md.getValue(), md.getAuthorityURI() + md.getAuthorityValue()); + AuthorityData data = new AuthorityData(md.getValue(), + URI.create(Optional.ofNullable(md.getAuthorityURI()).orElse("")).resolve(md.getAuthorityValue()).toString()); authorityList.add(data); } + Collections.sort(authorityList, + (a, b) -> Optional.ofNullable(a.getValue()).orElse("").compareTo(Optional.ofNullable(b.getValue()).orElse(""))); + return new Gson().toJson(authorityList); } } From 699cea1566976908a4c384ae7193df79a510a8e1 Mon Sep 17 00:00:00 2001 From: Simon Sendler Date: Tue, 23 Jul 2024 14:36:48 +0200 Subject: [PATCH 008/271] fix: provide style updates for modals and implement some utility classes --- .../uii/templatePG/css/src/components/_forms-custom.scss | 6 +++++- .../webapp/uii/templatePG/css/src/components/_modals.scss | 8 ++++++++ src/main/webapp/uii/templatePG/css/src/main.scss | 4 +++- .../webapp/uii/templatePG/css/src/utility/_highlight.scss | 3 +++ .../webapp/uii/templatePG/css/src/utility/_resets.scss | 3 +++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/uii/templatePG/css/src/components/_modals.scss create mode 100644 src/main/webapp/uii/templatePG/css/src/utility/_highlight.scss create mode 100644 src/main/webapp/uii/templatePG/css/src/utility/_resets.scss diff --git a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss index 735c6ceff..f99a795c0 100644 --- a/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss +++ b/src/main/webapp/uii/templatePG/css/src/components/_forms-custom.scss @@ -175,10 +175,14 @@ fieldSet:disabled .badge > a { min-height: 2.8125rem; width: 100%; } + > .form-row { + border: 0; + padding: 0; + } > .form-label { background: var(--clr-neutral-200); border-inline-end: 1px solid var(--clr-neutral-300); - > .btn { + > .btn:first-of-type { margin-inline-start: auto; } } diff --git a/src/main/webapp/uii/templatePG/css/src/components/_modals.scss b/src/main/webapp/uii/templatePG/css/src/components/_modals.scss new file mode 100644 index 000000000..b33d9e5ab --- /dev/null +++ b/src/main/webapp/uii/templatePG/css/src/components/_modals.scss @@ -0,0 +1,8 @@ +.modal { + --bs-modal-border-radius: var(--border-radius); + --bs-modal-inner-border-radius: 0; + --bs-modal-header-padding: 1em; + .modal-header { + justify-content: space-between; + } +} \ No newline at end of file diff --git a/src/main/webapp/uii/templatePG/css/src/main.scss b/src/main/webapp/uii/templatePG/css/src/main.scss index 1b8483767..a3aba6d42 100644 --- a/src/main/webapp/uii/templatePG/css/src/main.scss +++ b/src/main/webapp/uii/templatePG/css/src/main.scss @@ -23,6 +23,7 @@ @use "components/progress-custom"; @use "components/buttons"; @use "components/journal"; +@use "components/modals"; @use "components/toasts-custom"; @use "components/tooltip-custom"; @use "components/file-upload"; @@ -42,7 +43,8 @@ @use "pages/process-edit"; @use "utility/flex"; -@use "utility/scroll-container.scss"; +@use "utility/highlight"; +@use "utility/resets"; // plugins @use "plugins/dashboard"; \ No newline at end of file diff --git a/src/main/webapp/uii/templatePG/css/src/utility/_highlight.scss b/src/main/webapp/uii/templatePG/css/src/utility/_highlight.scss new file mode 100644 index 000000000..7e847903c --- /dev/null +++ b/src/main/webapp/uii/templatePG/css/src/utility/_highlight.scss @@ -0,0 +1,3 @@ +.tree-highlight { + font-weight: bold; +} \ No newline at end of file diff --git a/src/main/webapp/uii/templatePG/css/src/utility/_resets.scss b/src/main/webapp/uii/templatePG/css/src/utility/_resets.scss new file mode 100644 index 000000000..d6667bb32 --- /dev/null +++ b/src/main/webapp/uii/templatePG/css/src/utility/_resets.scss @@ -0,0 +1,3 @@ +.min-height-reset { + min-height: 0 !important; +} \ No newline at end of file From f69f646b736eb9a47af51907e1d683bbfcd101b8 Mon Sep 17 00:00:00 2001 From: Simon Sendler Date: Tue, 23 Jul 2024 15:08:13 +0200 Subject: [PATCH 009/271] fix: fix styling for norm data inputs --- .../compositesPG/formInputGeonamesAjax.xhtml | 22 +- .../compositesPG/formInputGndAjax.xhtml | 27 +- .../compositesPG/formInputViafAjax.xhtml | 331 ++++++++---------- 3 files changed, 170 insertions(+), 210 deletions(-) diff --git a/src/main/webapp/resources/compositesPG/formInputGeonamesAjax.xhtml b/src/main/webapp/resources/compositesPG/formInputGeonamesAjax.xhtml index 060a1559f..e18a98913 100644 --- a/src/main/webapp/resources/compositesPG/formInputGeonamesAjax.xhtml +++ b/src/main/webapp/resources/compositesPG/formInputGeonamesAjax.xhtml @@ -120,6 +120,7 @@ aria-labelledby="geonamesSearchBox" aria-hidden="true">
-
+

#{msgs.NORM_geonamesSearch}

+ class="modal-title h6">#{msgs.NORM_geonamesSearch}
- -
-
-
diff --git a/src/main/webapp/resources/compositesPG/formInputGndAjax.xhtml b/src/main/webapp/resources/compositesPG/formInputGndAjax.xhtml index 463300d47..29b55b4ab 100644 --- a/src/main/webapp/resources/compositesPG/formInputGndAjax.xhtml +++ b/src/main/webapp/resources/compositesPG/formInputGndAjax.xhtml @@ -122,10 +122,9 @@ styleClass="modal-content" layout="block" id="gndSearchBoxContent"> -
+

#{msgs.NORM_gndSearch}

+ class="modal-title h6">#{msgs.NORM_gndSearch}
-
-
-
+
+
-
+
-
-
+
+
-
- + diff --git a/src/main/webapp/resources/compositesPG/formInputViafAjax.xhtml b/src/main/webapp/resources/compositesPG/formInputViafAjax.xhtml index d080b270a..80098df69 100644 --- a/src/main/webapp/resources/compositesPG/formInputViafAjax.xhtml +++ b/src/main/webapp/resources/compositesPG/formInputViafAjax.xhtml @@ -31,39 +31,6 @@ - + @@ -148,9 +234,11 @@ - + - + + + diff --git a/src/main/webapp/resources/compositesPG/vocabularyRecordListEntry.xhtml b/src/main/webapp/resources/compositesPG/vocabularyRecordListEntry.xhtml index 9628077fe..361f47418 100644 --- a/src/main/webapp/resources/compositesPG/vocabularyRecordListEntry.xhtml +++ b/src/main/webapp/resources/compositesPG/vocabularyRecordListEntry.xhtml @@ -15,7 +15,19 @@ - + + + + + + + + + From 6fd0367064bfc588ca6edd7fa3c208ae43cc2fc4 Mon Sep 17 00:00:00 2001 From: Dominick Leppich Date: Mon, 6 May 2024 10:35:08 +0200 Subject: [PATCH 050/271] task: hierarchical child adding --- .../api/vocabulary/VocabularyRecordAPI.java | 17 +++++++++++------ .../managedbeans/VocabularyRecordsBean.java | 3 ++- .../compositesPG/vocabularyRecordList.xhtml | 2 +- .../vocabularyRecordListEntry.xhtml | 14 +++++++------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/goobi/workflow/api/vocabulary/VocabularyRecordAPI.java b/src/main/java/io/goobi/workflow/api/vocabulary/VocabularyRecordAPI.java index efa5b6eed..0fdde17bc 100644 --- a/src/main/java/io/goobi/workflow/api/vocabulary/VocabularyRecordAPI.java +++ b/src/main/java/io/goobi/workflow/api/vocabulary/VocabularyRecordAPI.java @@ -42,15 +42,20 @@ public VocabularyRecord get(long id) { } public VocabularyRecord create(VocabularyRecord vocabularyRecord) { + long vocabularyId = vocabularyRecord.getVocabularyId(); + vocabularyRecord.setVocabularyId(null); + VocabularyRecord newRecord; if (vocabularyRecord.getParentId() == null) { - long vocabularyId = vocabularyRecord.getVocabularyId(); - vocabularyRecord.setVocabularyId(null); - VocabularyRecord newRecord = restApi.post(IN_VOCABULARY_RECORDS_ENDPOINT, VocabularyRecord.class, vocabularyRecord, vocabularyId); - vocabularyRecord.setId(vocabularyId); - return newRecord; + newRecord = restApi.post(IN_VOCABULARY_RECORDS_ENDPOINT, VocabularyRecord.class, vocabularyRecord, vocabularyId); + } else { - return restApi.post(INSTANCE_ENDPOINT, VocabularyRecord.class, vocabularyRecord, vocabularyRecord.getParentId()); + long parentId = vocabularyRecord.getParentId(); + vocabularyRecord.setParentId(null); + newRecord = restApi.post(INSTANCE_ENDPOINT, VocabularyRecord.class, vocabularyRecord, parentId); + vocabularyRecord.setParentId(parentId); } + vocabularyRecord.setId(vocabularyId); + return newRecord; } public VocabularyRecord change(VocabularyRecord vocabularyRecord) { diff --git a/src/main/java/org/goobi/managedbeans/VocabularyRecordsBean.java b/src/main/java/org/goobi/managedbeans/VocabularyRecordsBean.java index 308d9cb81..a8f4df4f0 100644 --- a/src/main/java/org/goobi/managedbeans/VocabularyRecordsBean.java +++ b/src/main/java/org/goobi/managedbeans/VocabularyRecordsBean.java @@ -101,9 +101,10 @@ public void edit(JSFVocabularyRecord record) { prepareEmptyFieldsForEditing(record); } - public void createEmpty() { + public void createEmpty(Long parent) { JSFVocabularyRecord record = new JSFVocabularyRecord(); record.setVocabularyId(vocabulary.getId()); + record.setParentId(parent); record.setFields(new HashSet<>()); loadRecord(record); this.currentRecord = record; diff --git a/src/main/webapp/resources/compositesPG/vocabularyRecordList.xhtml b/src/main/webapp/resources/compositesPG/vocabularyRecordList.xhtml index b9fb6a491..4f0dadeb4 100644 --- a/src/main/webapp/resources/compositesPG/vocabularyRecordList.xhtml +++ b/src/main/webapp/resources/compositesPG/vocabularyRecordList.xhtml @@ -249,7 +249,7 @@
-