Edit attachment list properties

ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java

@@ -326,6 +326,7 @@ public abstract class AbstractMvcAuthoringStep implements MvcAuthoringStep {
             );
         final String docPath = Optional
             .ofNullable(documentPath)
+            .map(path -> path.substring(1))
             .orElseThrow(
                 () -> new WebApplicationException(
                     String.format(

ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/AttachmentListDetailsModel.java

@@ -22,7 +22,9 @@ import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.l10n.LocalizedString;
 import org.librecms.contentsection.AttachmentList;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -55,6 +57,8 @@ public class AttachmentListDetailsModel {
     @Inject
     private GlobalizationHelper globalizationHelper;
 
+    private boolean canEdit;
+
     /**
      * UUID of the {@link AttachmentList} shown.
      */
@@ -100,82 +104,59 @@ public class AttachmentListDetailsModel {
         return uuid;
     }
 
+    public void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+
     public String getName() {
         return name;
     }
 
+    public void setName(final String name) {
+        this.name = name;
+    }
+
     public Map<String, String> getTitles() {
         return Collections.unmodifiableMap(titles);
     }
 
+    public void setTitles(final Map<String, String> titles) {
+        this.titles = new HashMap<>(titles);
+    }
+
     public Map<String, String> getDescriptions() {
         return Collections.unmodifiableMap(descriptions);
     }
 
+    public void setDescriptions(final Map<String, String> descriptions) {
+        this.descriptions = new HashMap<>(descriptions);
+    }
+
     public List<String> getUnusedTitleLocales() {
         return Collections.unmodifiableList(unusedTitleLocales);
     }
 
+    public void setUnusedTitleLocales(final List<String> unusedTitleLocales) {
+        this.unusedTitleLocales = new ArrayList<>(unusedTitleLocales);
+    }
+
     public List<String> getUnusedDescriptionLocales() {
         return Collections.unmodifiableList(unusedDescriptionLocales);
     }
 
-    /**
+    public void setUnusedDescriptionLocales(
-     * Used by
+        final List<String> unusedDescriptionLocales
-     * {@link RelatedInfoStep#showAttachmentListDetails(java.lang.String)} to
+    ) {
-     * provide the {@link AttachmentList} to show. This method takes care of
+        this.unusedDescriptionLocales
-     * process the relevant properties the {@link AttachmentList} to display for
+            = new ArrayList<>(unusedDescriptionLocales);
-     * the view. The result of the processing is stored in the properties of
+    }
-     * this model.
-     *
-     * @param list The {@link AttachmentList} to show in the details view.
-     */
-    protected void setAttachmentList(final AttachmentList list) {
-        Objects.requireNonNull(list);
-        uuid = list.getUuid();
-        name = list.getName();
-        titles = list
-            .getTitle()
-            .getValues()
-            .entrySet()
-            .stream()
-            .collect(
-                Collectors.toMap(
-                    entry -> entry.getKey().toString(),
-                    entry -> entry.getValue()
-                )
-            );
-        descriptions = list
-            .getDescription()
-            .getValues()
-            .entrySet()
-            .stream()
-            .collect(
-                Collectors.toMap(
-                    entry -> entry.getKey().toString(),
-                    entry -> entry.getValue()
-                )
-            );
 
-        final Set<Locale> titleLocales = list
+    public boolean getCanEdit() {
-            .getTitle()
+        return canEdit;
-            .getAvailableLocales();
+    }
-        unusedTitleLocales = globalizationHelper
-            .getAvailableLocales()
-            .stream()
-            .filter(locale -> !titleLocales.contains(locale))
-            .map(Locale::toString)
-            .collect(Collectors.toList());
 
-        final Set<Locale> descriptionLocales = list
+    public void setCanEdit(final boolean canEdit) {
-            .getDescription()
+        this.canEdit = canEdit;
-            .getAvailableLocales();
-        unusedDescriptionLocales = globalizationHelper
-            .getAvailableLocales()
-            .stream()
-            .filter(locale -> !descriptionLocales.contains(locale))
-            .map(Locale::toString)
-            .collect(Collectors.toList());
     }
 
 }

ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/RelatedInfoStep.java

@@ -57,6 +57,7 @@ import org.librecms.ui.contentsections.DocumentFolderRowModel;
 import org.librecms.ui.contentsections.DocumentFolderTree;
 import org.librecms.ui.contentsections.DocumentFolderTreeNode;
 import org.librecms.ui.contentsections.DocumentPermissions;
+import org.librecms.ui.contentsections.ItemPermissionChecker;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -72,7 +73,6 @@ import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.transaction.Transactional;
@@ -96,6 +96,8 @@ import org.librecms.ui.contentsections.documents.ItemAttachmentDto;
 import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
 import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
 
+import java.util.Set;
+
 /**
  * Authoring step for managing the {@link AttachmentList} and
  * {@link ItemAttachment}s assigned to a {@link ContentItem}.
@@ -246,6 +248,9 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
     @Inject
     private ItemAttachmentManager attachmentManager;
 
+    @Inject
+    private ItemPermissionChecker itemPermissionChecker;
+    
     /**
      * Used to provide data for the views without a named bean.
      */
@@ -731,7 +736,63 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
                 return showAttachmentListNotFound(listIdentifierParam);
             }
 
-            listDetailsModel.setAttachmentList(listResult.get());
+            final AttachmentList list = listResult.get();
+
+            listDetailsModel.setUuid(list.getUuid());
+            listDetailsModel.setName(list.getName());
+            listDetailsModel.setTitles(
+                list
+                    .getTitle()
+                    .getValues()
+                    .entrySet()
+                    .stream()
+                    .collect(
+                        Collectors.toMap(
+                            entry -> entry.getKey().toString(),
+                            entry -> entry.getValue()
+                        )
+                    )
+            );
+            listDetailsModel.setDescriptions(
+                list
+                    .getDescription()
+                    .getValues()
+                    .entrySet()
+                    .stream()
+                    .collect(
+                        Collectors.toMap(
+                            entry -> entry.getKey().toString(),
+                            entry -> entry.getValue()
+                        )
+                    )
+            );
+
+            final Set<Locale> titleLocales = list
+                .getTitle()
+                .getAvailableLocales();
+            listDetailsModel.setUnusedTitleLocales(globalizationHelper
+                .getAvailableLocales()
+                .stream()
+                .filter(locale -> !titleLocales.contains(locale))
+                .map(Locale::toString)
+                .collect(Collectors.toList())
+            );
+
+            final Set<Locale> descriptionLocales = list
+                .getDescription()
+                .getAvailableLocales();
+            listDetailsModel.setUnusedDescriptionLocales(
+                globalizationHelper
+                    .getAvailableLocales()
+                    .stream()
+                    .filter(locale -> !descriptionLocales.contains(locale))
+                    .map(Locale::toString)
+                    .collect(Collectors.toList())
+            );
+
+            listDetailsModel.setCanEdit(
+                itemPermissionChecker.canEditItem(getDocument())
+            );
             
             return "org/librecms/ui/contentsection/documents/relatedinfo-attachmentlist-details.xhtml";
         } else {
@@ -789,7 +850,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -906,7 +967,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -966,7 +1027,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1024,7 +1085,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1084,7 +1145,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1145,7 +1206,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1203,7 +1264,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listRepo.save(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1397,7 +1458,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
 
             attachmentManager.attachAsset(relatedLink, list);
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1561,7 +1622,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             assetRepo.save(link);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1644,7 +1705,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             assetRepo.save(link);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1727,7 +1788,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             assetRepo.save(link);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1808,7 +1869,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             assetRepo.save(link);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1886,7 +1947,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             }
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1940,7 +2001,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listManager.moveUp(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -1993,7 +2054,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             listManager.moveDown(list);
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -2061,7 +2122,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             }
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(
@@ -2129,7 +2190,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep {
             }
 
             return buildRedirectPathForStep(
-                String.format("/attachmentlists/%s", list.getName())
+                String.format("/attachmentlists/%s/@details", list.getName())
             );
         } else {
             return documentUi.showAccessDenied(

ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo-attachmentlist-details.xhtml

@@ -4,9 +4,9 @@
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-    <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/document.xhtml">
+    <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
-        <ui:param name="activePage" value="document" />
+        <!--        <ui:param name="activePage" value="document" />
                 <ui:param name="title" value="#{CmsDefaultStepsMessageBundle['contentsection.documents.relatedinfo.attachmentlist.details.title']}" />
         
                 <ui:define name="breadcrumb">
@@ -14,12 +14,19 @@
                     <li aria-current="page" class="breadcrumb-item">
         #{CmsDefaultStepsMessageBundle['contentsection.documents.relatedinfo.attachmentlist.details.title']}
     </li>
-        </ui:define>
+</ui:define>-->
 
         <ui:define name="authoringStep">
+            <div class="d-flex mb-3">
+                <a class="btn btn-secondary mr-3"
+                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo">
+                    <bootstrap:svgIcon icon="arrow-left-circle" />
+                    <span>#{CmsDefaultStepsMessageBundle['contentsection.documents.relatedinfo.attachmentlist.back']}</span>
+                </a>
                 <h3>
                     #{CmsDefaultStepsMessageBundle.getMessage('relatedinfo.attachmentlist.details.title', [CmsAttachmentListDetailsModel.name])}
                 </h3>
+            </div> 
 
             <p>
                 <span>#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name.label']}: </span>
@@ -28,7 +35,8 @@
                         data-toggle="modal"
                         data-target="#name-edit-dialog"
                         type="button">
-
+                    <bootstrap:svgIcon icon="pen" />
+                    <span class="sr-only">#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name.edit']}</span>
                 </button>
             </p>
             <div aria-hidden="true"
@@ -37,7 +45,7 @@
                  class="modal fade"
                  tabindex="-1">
                 <div class="modal-dialog">
-                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/@update"
+                    <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/@update"
                           class="modal-content"
                           method="post">
                         <div class="modal-header">
@@ -57,43 +65,85 @@
                                 inputId="name"
                                 label="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name_edit_dialog.name.label']}"
                                 name="listName"
-                                pattern="[A-Za-z0-9\-_]"
+                                pattern="[A-Za-z0-9\-_]*"
-                                required="true" />
+                                required="true" 
+                                value="#{CmsAttachmentListDetailsModel.name}" />
                         </div>
                         <div class="modal-footer">
                             <button class="btn btn-warning"
                                     data-dismiss="modal"
                                     type="button">
-                                #{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name_edit_dialog.close']}"
+                                #{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name_edit_dialog.close']}
                             </button>
                             <button class="btn btn-success"
                                     type="submit">
-                                #{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name_edit_dialog.save']}"
+                                #{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.name_edit_dialog.save']}
                             </button>
                         </div>
                     </form>
                 </div>
             </div>
 
-            <libreccm:localizedStringEditor addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/title/@add"
+            <libreccm:localizedStringEditor 
-                                            editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/title/@edit"
+                addButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add_button.label']}"
+                addDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.cancel']}"
+                addDialogLocaleSelectHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.locale.help']}"
+                addDialogLocaleSelectLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.locale.label']}"
+                addDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.submit']}"
+                addDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.title']}"
+                addDialogValueHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.value.help']}"
+                addDialogValueLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.add.value.label']}"
+                addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/title/@add"
+                editButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit_button.label']}"
+                editDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit.cancel']}"
+                editDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit.submit']}"
+                editDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit.title']}"
+                editDialogValueHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit.value.help']}"
+                editDialogValueLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.edit.value.label']}"
+                editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/title/@edit"
                 editorId="list-title-editor"
-                                            hasUnusedLocales="#{!CmsAttachmentListDetailsModel.unusedDescriptionLocales.isEmpty()}"
+                hasUnusedLocales="#{!CmsAttachmentListDetailsModel.unusedTitleLocales.isEmpty()}"
                 objectIdentifier="#{CmsAttachmentListDetailsModel.name}"
-                                            removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/title/@remove"
+                readOnly="#{!CmsAttachmentListDetailsModel.canEdit}"
-                                            title="CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title_editor.title']}"
+                removeButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.remove_button.label']}"
-                                            unusedLocales="#{CmsAttachmentListDetailsModel.unusedDescriptionLocales}"
+                removeDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.remove.cancel']}"
+                removeDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.remove.submit']}"
+                removeDialogText="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.remove.text']}"
+                removeDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title.remove.title']}"
+                removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/title/@remove"
+                title="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.title_editor.title']}"
+                unusedLocales="#{CmsAttachmentListDetailsModel.unusedTitleLocales}"
                 values="#{CmsAttachmentListDetailsModel.titles}"
                 />
 
-            <libreccm:localizedStringEditor addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/description/@add"
+            <libreccm:localizedStringEditor 
-                                            editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/description/@edit"
+                addButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add_button.label']}"
+                addDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.cancel']}"
+                addDialogLocaleSelectHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.locale.help']}"
+                addDialogLocaleSelectLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.locale.label']}"
+                addDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.submit']}"
+                addDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.title']}"
+                addDialogValueHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.value.help']}"
+                addDialogValueLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.add.value.label']}"
+                addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/description/@add"
+                editButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit_button.label']}"
+                editDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit.cancel']}"
+                editDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit.submit']}"
+                editDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit.title']}"
+                editDialogValueHelp="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit.value.help']}"
+                editDialogValueLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.edit.value.label']}"
+                editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/description/@edit"
                 editorId="list-description-editor"
-                                            hasUnusedLocales="#{!CmsAttachmentListDetailsModel.unusedD.isEmpty()}"
+                hasUnusedLocales="#{!CmsAttachmentListDetailsModel.unusedDescriptionLocales.isEmpty()}"
                 objectIdentifier="#{CmsAttachmentListDetailsModel.name}"
-                                            removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringSteps/relatedinfo/attachmentlists/#{list.name}/description/@remove"
+                removeButtonLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.remove_button.label']}"
-                                            title="CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description_editor.title']}"
+                removeDialogCancelLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.remove.cancel']}"
-                                            unusedLocales="#{CmsAttachmentListDetailsModel.unusedTitleLocales}"
+                removeDialogSubmitLabel="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.remove.submit']}"
+                removeDialogText="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.remove.text']}"
+                removeDialogTitle="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description.remove.title']}"
+                removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{CmsAttachmentListDetailsModel.name}/description/@remove"
+                title="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlist.details.description_editor.title']}"
+                unusedLocales="#{CmsAttachmentListDetailsModel.unusedDescriptionLocales}"
                 useTextarea="true"
                 values="#{CmsAttachmentListDetailsModel.descriptions}"
                 />

ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml

@@ -371,15 +371,55 @@
                                     <span class="sr-only">#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.move.button']}"</span>
                                 </button>
                                 <button class="btn btn-secondary"
+                                        data-toggle="modal"
+                                        data-target="#attachment-list-#{list.name}-info"
                                         type="button">
                                     <bootstrap:svgIcon icon="info-circle" />
                                     <span class="sr-only">#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.info.button']}"</span>
                                 </button>
-                                <button class="btn btn-primary"
+                                <div aria-hidden="true"
+                                     aria-labelledby="attachmentlist-#{list.name}-info-title"
+                                     class="modal fade"
+                                     id="attachment-list-#{list.name}-info"
+                                     tabindex="-1">
+                                    <div class="modal-dialog">
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <h3 class="modal-title"
+                                                    id="attachmentlist-#{list.name}-info-title">
+                                                    #{CmsDefaultStepsMessageBundle.getMessage('relatedinfo.attachmentlists.info.dialog.title', [list.name])}
+                                                </h3>
+                                                <button 
+                                                    aria-label="#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.info.dialog.close']}"
+                                                    class="close"
+                                                    data-dismiss="modal"
                                                     type="button">
+                                                    <bootstrap:svgIcon icon="x" />
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                <dl>
+                                                    <dt>#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.info.dialog.title.label']}</dt>
+                                                    <dd>#{list.title}</dd>
+                                                    <dt>#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.info.dialog.description.label']}</dt>
+                                                    <dd>#{list.description}</dd>
+                                                </dl>
+                                            </div>
+                                            <div class="modal-footer">
+                                                <button class="btn btn-secondary"
+                                                        data-dismiss="modal"
+                                                        type="button">
+                                                    #{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.info.dialog.close']}
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <a class="btn btn-primary"
+                                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo/attachmentlists/#{list.name}/@details">
                                     <bootstrap:svgIcon icon="pen" />
                                     <span class="sr-only">#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.edit.button']}"</span>
-                                </button>
+                                </a>
                                 <button class="btn btn-primary"
                                         data-target="#attachmentlist-#{list.name}-add-attachment-dialog"
                                         data-toggle="modal"

ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties

@@ -120,3 +120,49 @@ relatedinfo.attachments.delete.button=Remove attachment
 relatedinfo.attachmentlists.attachment.add.label=Add attachment
 relatedinfo.attachmentlists.internal_link.add.label=Add internal link
 relatedinfo.attachmentlists.link.add.label=Add link
+contentsection.documents.relatedinfo.attachmentlist.back=Back
+relatedinfo.attachmentlist.details.title_editor.title=Title of attachment list
+relatedinfo.attachmentlist.details.description_editor.title=Description of the attachment list
+relatedinfo.attachmentlist.details.name.edit=Edit name of attachment list
+relatedinfo.attachmentlist.details.title.add_button.label=Add localized title
+relatedinfo.attachmentlist.details.title.add.cancel=Cancel
+relatedinfo.attachmentlist.details.title.add.locale.help=The locale of the title value.
+relatedinfo.attachmentlist.details.title.add.locale.label=Locale
+relatedinfo.attachmentlist.details.title.add.submit=Add title
+relatedinfo.attachmentlist.details.title.add.title=Add localized title
+relatedinfo.attachmentlist.details.title.add.value.help=The localized title.
+relatedinfo.attachmentlist.details.title.edit_button.label=Edit title
+relatedinfo.attachmentlist.details.title.edit.cancel=Cancel
+relatedinfo.attachmentlist.details.title.edit.submit=Save
+relatedinfo.attachmentlist.details.title.edit.title=Edit localized title
+relatedinfo.attachmentlist.details.title.edit.value.help=The loccalized title.
+relatedinfo.attachmentlist.details.title.edit.value.label=Title
+relatedinfo.attachmentlist.details.title.remove_button.label=Remove
+relatedinfo.attachmentlist.details.title.remove.cancel=Cancel
+relatedinfo.attachmentlist.details.title.remove.submit=Remove
+relatedinfo.attachmentlist.details.title.remove.text=Are you sure to remove the following localized title:
+relatedinfo.attachmentlist.details.title.remove.title=Confirm removal of localized title
+relatedinfo.attachmentlist.details.description.add_button.label=Add localized description
+relatedinfo.attachmentlist.details.description.add.cancel=Cancel
+relatedinfo.attachmentlist.details.description.add.locale.help=The locale of the description.
+relatedinfo.attachmentlist.details.description.add.locale.label=Locale
+relatedinfo.attachmentlist.details.description.add.submit=Add description
+relatedinfo.attachmentlist.details.description.add.title=Add localized description
+relatedinfo.attachmentlist.details.description.add.value.help=The localized description.
+relatedinfo.attachmentlist.details.description.add.value.label=Description
+relatedinfo.attachmentlist.details.description.edit.cancel=Cancel
+relatedinfo.attachmentlist.details.description.edit.submit=Save
+relatedinfo.attachmentlist.details.description.edit.title=Edit localized description
+relatedinfo.attachmentlist.details.description.edit_button.label=Add localized description
+relatedinfo.attachmentlist.details.description.edit.value.help=The localized description.
+relatedinfo.attachmentlist.details.description.edit.value.label=Description
+relatedinfo.attachmentlist.details.description.remove_button.label=Remove
+relatedinfo.attachmentlist.details.description.remove.cancel=Cancel
+relatedinfo.attachmentlist.details.description.remove.submit=Remove
+relatedinfo.attachmentlist.details.description.remove.text=Are you sure to remove the following localized description:
+relatedinfo.attachmentlist.details.description.remove.title=Confirm removal of localized description
+relatedinfo.attachmentlist.details.title.add.value.label=Title
+relatedinfo.attachmentlists.info.dialog.title=Attachment List {0} Info
+relatedinfo.attachmentlists.info.dialog.title.label=Title
+relatedinfo.attachmentlists.info.dialog.description.label=Description
+relatedinfo.attachmentlists.info.dialog.close=Close

ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties

@@ -120,3 +120,49 @@ relatedinfo.attachments.delete.button=Anhang entfernen
 relatedinfo.attachmentlists.attachment.add.label=Anhang hinzuf\u00fcgen
 relatedinfo.attachmentlists.internal_link.add.label=Internen Link hinzuf\u00fcgen
 relatedinfo.attachmentlists.link.add.label=Link hinzuf\u00fcgen
+contentsection.documents.relatedinfo.attachmentlist.back=Zur\u00fcck
+relatedinfo.attachmentlist.details.title_editor.title=Titel der Anhangliste
+relatedinfo.attachmentlist.details.description_editor.title=Beschreibung der Anhangliste
+relatedinfo.attachmentlist.details.name.edit=Name der Anhangliste bearbeiten
+relatedinfo.attachmentlist.details.title.add_button.label=Lokalisierten Titel hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.title.add.cancel=Abbrechen
+relatedinfo.attachmentlist.details.title.add.locale.help=Die Sprache des Titels.
+relatedinfo.attachmentlist.details.title.add.locale.label=Sprache
+relatedinfo.attachmentlist.details.title.add.submit=Titel hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.title.add.title=Lokalisierten Titel hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.title.add.value.help=Der lokalisierte Titel.
+relatedinfo.attachmentlist.details.title.edit_button.label=Titel bearbeiten
+relatedinfo.attachmentlist.details.title.edit.cancel=Abbrechen
+relatedinfo.attachmentlist.details.title.edit.submit=Speichern
+relatedinfo.attachmentlist.details.title.edit.title=Lokalisierten Titel bearbeiten
+relatedinfo.attachmentlist.details.title.edit.value.help=Der lokalisierte Titel.
+relatedinfo.attachmentlist.details.title.edit.value.label=Titel
+relatedinfo.attachmentlist.details.title.remove_button.label=Entfernen
+relatedinfo.attachmentlist.details.title.remove.cancel=Abbrechen
+relatedinfo.attachmentlist.details.title.remove.submit=Entfernen
+relatedinfo.attachmentlist.details.title.remove.text=Sind Sie sicher, dass Sie den folgenden lokalisierten Titel entfernen wollen:
+relatedinfo.attachmentlist.details.title.remove.title=Entfernen eines lokalisierten Titels best\u00e4tigen
+relatedinfo.attachmentlist.details.description.add_button.label=Lokalisierte Beschreibung hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.description.add.cancel=Abbrechen
+relatedinfo.attachmentlist.details.description.add.locale.help=Die Sprache der Beschreibung.
+relatedinfo.attachmentlist.details.description.add.locale.label=Sprache
+relatedinfo.attachmentlist.details.description.add.submit=Beschreibung hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.description.add.title=Lokalisierte Beschreibung hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.description.add.value.help=Die lokalisierte Beschreibung.
+relatedinfo.attachmentlist.details.description.add.value.label=Beschreibung
+relatedinfo.attachmentlist.details.description.edit.cancel=Abbrechen
+relatedinfo.attachmentlist.details.description.edit.submit=Speichern
+relatedinfo.attachmentlist.details.description.edit.title=Lokalisierte Beschreibung bearbeiten
+relatedinfo.attachmentlist.details.description.edit_button.label=Lokaliserte Beschreibung hinzuf\u00fcgen
+relatedinfo.attachmentlist.details.description.edit.value.help=Die lokalisierte Beschreibung.
+relatedinfo.attachmentlist.details.description.edit.value.label=Beschreibung
+relatedinfo.attachmentlist.details.description.remove_button.label=Entfernen
+relatedinfo.attachmentlist.details.description.remove.cancel=Abbrechen
+relatedinfo.attachmentlist.details.description.remove.submit=Entfernen
+relatedinfo.attachmentlist.details.description.remove.text=Sind Sie sicher, dass Sie die folgende lokalisierte Beschreibung entfernen wollen:
+relatedinfo.attachmentlist.details.description.remove.title=Entfernen einer lokalisierten Beschreibung best\u00e4tigen
+relatedinfo.attachmentlist.details.title.add.value.label=Titel
+relatedinfo.attachmentlists.info.dialog.title=Anhangliste {0} Info
+relatedinfo.attachmentlists.info.dialog.title.label=Titel
+relatedinfo.attachmentlists.info.dialog.description.label=Beschreibung
+relatedinfo.attachmentlists.info.dialog.close=Schlie\u00dfen