From 1144a8dea8a2db57af8fc682199d1f7e7d8a3f9c Mon Sep 17 00:00:00 2001 From: Fabian Pichler Date: Sun, 2 Aug 2026 06:16:36 +0200 Subject: [PATCH 1/2] CELDEV-1332 move structured editor messages to fragments --- .../main/webapp/templates/celAjax/Messages.vm | 4 ++-- .../celMacros/StructEditorMessages.vm | 20 ------------------- .../general/structured-data-editor.vm | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm create mode 100644 web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm diff --git a/web-module/src/main/webapp/templates/celAjax/Messages.vm b/web-module/src/main/webapp/templates/celAjax/Messages.vm index 9d22bf72..32e483ce 100644 --- a/web-module/src/main/webapp/templates/celAjax/Messages.vm +++ b/web-module/src/main/webapp/templates/celAjax/Messages.vm @@ -1,6 +1,6 @@ #set($jsonBuilder = $services.celementsweb.getNewJSONBuilder()) $jsonBuilder.openDictionary() -#parse('celMacros/CelMessages.vm') -#parse('celMacros/StructEditorMessages.vm') +#parse('celMessages/general/celements.vm') +#parse('celMessages/general/structured-data-editor.vm') $jsonBuilder.closeDictionary() $jsonBuilder.getJSON() diff --git a/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm b/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm deleted file mode 100644 index 7b42059c..00000000 --- a/web-module/src/main/webapp/templates/celMacros/StructEditorMessages.vm +++ /dev/null @@ -1,20 +0,0 @@ -$jsonBuilder.openDictionary('structEditor') - - $jsonBuilder.addStringProperty('unsavedChangesOnCloseMessage', "$!adminMsg.get('cel_tm_unsavedChangesOnCloseMessage')") - $jsonBuilder.addStringProperty('savingDialogWarningHeader', "$!adminMsg.get('cel_tm_saving_dialog_warning_header')") - $jsonBuilder.addStringProperty('savingDialogMessage', "$!adminMsg.get('cel_tm_saving_dialog_unsaved_changes')") - $jsonBuilder.addStringProperty('savingDialogButtonCancel', "$!adminMsg.get('cel_cancel')") - $jsonBuilder.addStringProperty('savingDialogButtonSave', "$!adminMsg.get('cel_tm_saving_dialog_button_save')") - $jsonBuilder.addStringProperty('savingDialogButtonDoNotSave', "$!adminMsg.get('cel_tm_saving_dialog_button_donotsave')") - $jsonBuilder.addStringProperty('savingDialogHeader', "$!adminMsg.get('cel_tm_saving_dialog_header')") - $jsonBuilder.addStringProperty('savingFailed', "$!adminMsg.get('cel_tm_saving_failed')") - $jsonBuilder.addStringProperty('savingFailedDialogHeader', "$!adminMsg.get('cel_tm_saving_failed_dialog_header')") - $jsonBuilder.addStringProperty('savingFailedDialogText', "$!adminMsg.get('cel_tm_saving_failed_dialog_text')") - $jsonBuilder.addStringProperty('objectRemoveConfirm', "$!adminMsg.get('cel_objectedit_removeobject')?") - - $jsonBuilder.openDictionary('autocomplete') - $jsonBuilder.addStringProperty('placeholder_default', "$!adminMsg.cel_struct_autocomplete_placeholder_default") - $jsonBuilder.addStringProperty('UrlToNewElementEditorButtonText_default', "$!adminMsg.cel_struct_autocomplete_UrlToNewElementEditorButtonText_default") - $jsonBuilder.closeDictionary() - -$jsonBuilder.closeDictionary() diff --git a/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm b/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm new file mode 100644 index 00000000..8e55a518 --- /dev/null +++ b/web-module/src/main/webapp/templates/celMessages/general/structured-data-editor.vm @@ -0,0 +1,20 @@ +$jsonBuilder.openDictionary('structEditor') + + $jsonBuilder.addProperty('unsavedChangesOnCloseMessage', "$!adminMsg.get('cel_tm_unsavedChangesOnCloseMessage')") + $jsonBuilder.addProperty('savingDialogWarningHeader', "$!adminMsg.get('cel_tm_saving_dialog_warning_header')") + $jsonBuilder.addProperty('savingDialogMessage', "$!adminMsg.get('cel_tm_saving_dialog_unsaved_changes')") + $jsonBuilder.addProperty('savingDialogButtonCancel', "$!adminMsg.get('cel_cancel')") + $jsonBuilder.addProperty('savingDialogButtonSave', "$!adminMsg.get('cel_tm_saving_dialog_button_save')") + $jsonBuilder.addProperty('savingDialogButtonDoNotSave', "$!adminMsg.get('cel_tm_saving_dialog_button_donotsave')") + $jsonBuilder.addProperty('savingDialogHeader', "$!adminMsg.get('cel_tm_saving_dialog_header')") + $jsonBuilder.addProperty('savingFailed', "$!adminMsg.get('cel_tm_saving_failed')") + $jsonBuilder.addProperty('savingFailedDialogHeader', "$!adminMsg.get('cel_tm_saving_failed_dialog_header')") + $jsonBuilder.addProperty('savingFailedDialogText', "$!adminMsg.get('cel_tm_saving_failed_dialog_text')") + $jsonBuilder.addProperty('objectRemoveConfirm', "$!adminMsg.get('cel_objectedit_removeobject')?") + + $jsonBuilder.openDictionary('autocomplete') + $jsonBuilder.addProperty('placeholder_default', "$!adminMsg.cel_struct_autocomplete_placeholder_default") + $jsonBuilder.addProperty('UrlToNewElementEditorButtonText_default', "$!adminMsg.cel_struct_autocomplete_UrlToNewElementEditorButtonText_default") + $jsonBuilder.closeDictionary() + +$jsonBuilder.closeDictionary() From 2bb4e1a710bf190f47d47ee90ce2111d7a2d6dfa Mon Sep 17 00:00:00 2001 From: Fabian Pichler Date: Sun, 2 Aug 2026 07:31:47 +0200 Subject: [PATCH 2/2] CELDEV-1332 Remove structured message adapter overlay --- web-module/src/main/webapp/templates/celAjax/Messages.vm | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 web-module/src/main/webapp/templates/celAjax/Messages.vm diff --git a/web-module/src/main/webapp/templates/celAjax/Messages.vm b/web-module/src/main/webapp/templates/celAjax/Messages.vm deleted file mode 100644 index 32e483ce..00000000 --- a/web-module/src/main/webapp/templates/celAjax/Messages.vm +++ /dev/null @@ -1,6 +0,0 @@ -#set($jsonBuilder = $services.celementsweb.getNewJSONBuilder()) -$jsonBuilder.openDictionary() -#parse('celMessages/general/celements.vm') -#parse('celMessages/general/structured-data-editor.vm') -$jsonBuilder.closeDictionary() -$jsonBuilder.getJSON()