From 025e48aae091f4e0144c2a3018cf30c0c323dc40 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 2 Jun 2021 20:49:41 +0200 Subject: [PATCH] Bugfixes for asset picker --- .../components/librecms/assetPicker.xhtml | 22 +- .../librecms/assetPickerButton.xhtml | 14 +- .../assets/edit-contactable.xhtml | 275 +++++++++--------- .../assets/person/edit-person.xhtml | 2 +- .../ui/MvcAssetStepsBundle.properties | 5 + .../ui/MvcAssetStepsBundle_de.properties | 5 + 6 files changed, 176 insertions(+), 147 deletions(-) diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml index 0762705c6..54ac85f63 100644 --- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml +++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml @@ -1,14 +1,14 @@ -]> + - - - - - - + + - diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPickerButton.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPickerButton.xhtml index bd41bcc7e..6a58a033e 100644 --- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPickerButton.xhtml +++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPickerButton.xhtml @@ -10,12 +10,24 @@ required="true" shortDescription="ID of the asset picker" type="String" /> + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml index dcebc1ee3..7ae200825 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml @@ -70,158 +70,168 @@ - - - - - - - - - - - - - - - + + + +
#{CmsAssetsStepsDefaultMessagesBundle['contactable.contactentries.cols.key']}#{CmsAssetsStepsDefaultMessagesBundle['contactable.contactentries.cols.value']}#{CmsAssetsStepsDefaultMessagesBundle['contactable.contactentries.cols.actions']}
#{entry.entryKeyLabel}#{entry.value} - -
+ + +

#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.title']}

+ - +

#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.none']}

 - + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml index 66d9d3e9e..1b9c8ce73 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml @@ -33,7 +33,7 @@ tabindex="-1" >
-
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties index c218e5a19..7d9a28f46 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties @@ -268,3 +268,8 @@ person.description=Contact information of a person person.createform.title=Create new Person person.personnames.col.actions=Actions person.personnames.none=No person names yet. +contactable.contactentries.none=No contact entries yet. +contactable.postaladdress.set=Set postal address +person.personname.givenname.label=Given name +person.personname.add.dialog.close=Cancel +person.personname.add.dialog.submit=Add person name diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties index 69fd08297..9308444e0 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties @@ -268,3 +268,8 @@ person.description=Kontaktinformationen einer Person person.createform.title=Neue Person anlegen person.personnames.col.actions=Aktionen person.personnames.none=Noch keine Personennamen vorhanden. +contactable.contactentries.none=Es wurden noch keine Kontaktdaten-Eintr\u00e4ge angelegt. +contactable.postaladdress.set=Postanschrift setzen +person.personname.givenname.label=Vorname +person.personname.add.dialog.close=Abbrechen +person.personname.add.dialog.submit=Personenamen hinzuf\u00fcgen