diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaAttachmentDto.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaDto.java similarity index 98% rename from ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaAttachmentDto.java rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaDto.java index 14cfcf27a..af96bc064 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaAttachmentDto.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaDto.java @@ -24,7 +24,7 @@ package org.librecms.ui.contentsections.documents.media; * * @author Jens Pelzetter */ -public class MediaAttachmentDto { +public class MediaDto { /** * The ID of the attachment. diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaListDto.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaListDto.java index ed132b9cd..da768e42b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaListDto.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaListDto.java @@ -25,8 +25,8 @@ import java.util.List; /** * A data transfer object used by the template for the listing of the - * {@link AttachmentList}s containing media attachments of a - * {@link ContentItem}. + * {@link AttachmentList}s containing media media of a + {@link ContentItem}. * * @see MediaStep * @@ -69,7 +69,7 @@ public class MediaListDto { /** * The @link{ItemAttachment}s associated with the {@link AttachmentList}. */ - private List attachments; + private List media; public long getListId() { return listId; @@ -119,12 +119,12 @@ public class MediaListDto { this.description = description; } - public List getAttachments() { - return Collections.unmodifiableList(attachments); + public List getMedia() { + return Collections.unmodifiableList(media); } - public void setAttachments(final List attachments) { - this.attachments = new ArrayList<>(attachments); + public void setMedia(final List media) { + this.media = new ArrayList<>(media); } } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java index 01b488e9b..fbdfafe72 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java @@ -242,7 +242,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { @POST @Path("/medialists/@add") @Transactional(Transactional.TxType.REQUIRED) - public String addMedia( + public String addMediaList( @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) @@ -450,7 +450,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { } /** - * Removes an media list and all media attachments of the list. + * Removes an media list and all media of the list. * * @param sectionIdentifier * @param documentPath @@ -520,7 +520,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { @POST @Path("/medialists/{mediaListIdentifier}/title/@add") @Transactional(Transactional.TxType.REQUIRED) - public String addAttachmentListTitle( + public String addMediaListTitle( @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) @@ -640,7 +640,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { @Path( "/medialists/{mediaListIdentifier}/title/@remove/{locale}") @Transactional(Transactional.TxType.REQUIRED) - public String removeAttachmentListTitle( + public String removeMediaListTitle( @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) @@ -698,7 +698,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { @POST @Path("/medialists/{mediaListIdentifier}/description/@add") @Transactional(Transactional.TxType.REQUIRED) - public String addAttachmentListDescription( + public String addMediaListDescription( @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) @@ -873,12 +873,12 @@ public class MediaStep extends AbstractMvcAuthoringStep { * @param mediaIdentifierParam The identifier of the media asset to use for * the media attachment. * - * @return A redirect to the list of attachment lists and attachments. + * @return A redirect to the list of media lists and mediaa. */ @POST - @Path("/medialists/{mediaListIdentifier}/attachments/@create") + @Path("/medialists/{mediaListIdentifier}/media/@create") @Transactional(Transactional.TxType.REQUIRED) - public String createAttachment( + public String linkMedia( @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) @@ -936,7 +936,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { models .put("section", getContentSection().getLabel()); models.put("assetUuid", mediaIdentifierParam); - return "org/librecms/ui/contentsection/documents/asset-not-found.xhtml"; + return "org/librecms/ui/contentsection/documents/media-not-found.xhtml"; } final Asset asset = assetResult.get(); @@ -1329,11 +1329,11 @@ public class MediaStep extends AbstractMvcAuthoringStep { final AttachmentList attachmentList ) { final MediaListDto dto = new MediaListDto(); - dto.setAttachments( + dto.setMedia( attachmentList .getAttachments() .stream() - .map(this::buildMediaAttachmentDto) + .map(this::buildMediaDto) .collect(Collectors.toList()) ); dto.setDescription( @@ -1359,18 +1359,18 @@ public class MediaStep extends AbstractMvcAuthoringStep { * Helper function for building a {@link ItemAttachmentDto} for an * {@link ItemAttachment}. * - * @param itemAttachment The {@link ItemAttachment} from which the + * @param mediaAttachment The {@link ItemAttachment} from which the * {@link ItemAttachmentDto} is build. * - * @return The {@link ItemAttachmentDto}. + * @return The {@link MediaDto}. */ - private MediaAttachmentDto buildMediaAttachmentDto( - final ItemAttachment itemAttachment + private MediaDto buildMediaDto( + final ItemAttachment mediaAttachment ) { - final MediaAttachmentDto dto = new MediaAttachmentDto(); + final MediaDto dto = new MediaDto(); dto.setAssetType( Optional - .ofNullable(itemAttachment.getAsset()) + .ofNullable(mediaAttachment.getAsset()) .map(Asset::getClass) .map(clazz -> assetTypesManager.getAssetTypeInfo(clazz)) .map(info -> info.getAssetClass().getName()) @@ -1378,7 +1378,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { ); dto.setAssetTypeLabel( Optional - .ofNullable(itemAttachment.getAsset()) + .ofNullable(mediaAttachment.getAsset()) .map(Asset::getClass) .map(clazz -> assetTypesManager.getAssetTypeInfo(clazz)) .map( @@ -1388,15 +1388,15 @@ public class MediaStep extends AbstractMvcAuthoringStep { ); dto.setAssetUuid( Optional - .ofNullable(itemAttachment.getAsset()) + .ofNullable(mediaAttachment.getAsset()) .map(Asset::getUuid) .orElse(null) ); - dto.setAttachmentId(itemAttachment.getAttachmentId()); - dto.setSortKey(itemAttachment.getSortKey()); + dto.setAttachmentId(mediaAttachment.getAttachmentId()); + dto.setSortKey(mediaAttachment.getSortKey()); dto.setTitle( Optional - .ofNullable(itemAttachment.getAsset()) + .ofNullable(mediaAttachment.getAsset()) .map( asset -> globalizationHelper.getValueFromLocalizedString( asset.getTitle() @@ -1404,7 +1404,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { ) .orElse("") ); - dto.setUuid(itemAttachment.getUuid()); + dto.setUuid(mediaAttachment.getUuid()); return dto; } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepAttachmentOrder.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepMediaOrder.java similarity index 52% rename from ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepAttachmentOrder.java rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepMediaOrder.java index a6672d93f..d764e46ff 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepAttachmentOrder.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepMediaOrder.java @@ -29,30 +29,30 @@ import java.util.stream.Collectors; * * @author Jens Pelzetter */ -public class MediaStepAttachmentOrder { +public class MediaStepMediaOrder { - private List attachmentListsOrder; + private List mediaListsOrder; - private Map> attachmentsOrder; + private Map> mediaOrder; - private List movedAttachments; + private List movedMedia; - public List getAttachmentListsOrder() { - return Collections.unmodifiableList(attachmentListsOrder); + public List getMediaListsOrder() { + return Collections.unmodifiableList(mediaListsOrder); } - public void setAttachmentListsOrder(final List attachmentListsOrder) { - this.attachmentListsOrder = new ArrayList<>(attachmentListsOrder); + public void setMediaListsOrder(final List mediaListsOrder) { + this.mediaListsOrder = new ArrayList<>(mediaListsOrder); } - public Map> getAttachmentsOrder() { - return Collections.unmodifiableMap(attachmentsOrder); + public Map> getMediaOrder() { + return Collections.unmodifiableMap(mediaOrder); } - public void setAttachmentsOrder( - final Map> attachmentsOrder + public void setMediaOrder( + final Map> mediaOrder ) { - this.attachmentsOrder = attachmentsOrder + this.mediaOrder = mediaOrder .entrySet() .stream() .collect( @@ -63,23 +63,22 @@ public class MediaStepAttachmentOrder { ); } - public List getMovedAttachments() { - return Collections.unmodifiableList(movedAttachments); + public List getMovedMedia() { + return Collections.unmodifiableList(movedMedia); } - public void setMovedAttachments(final List movedAttachments) { - this.movedAttachments = new ArrayList<>(movedAttachments); + public void setMovedMedia(final List movedMedia) { + this.movedMedia = new ArrayList<>(movedMedia); } @Override public String toString() { - return String.format( - "attachmentListsOrder = %s, " - + "attachmentsOrder = %s, " - + "movedAttachments = %s", - Objects.toString(attachmentListsOrder), - Objects.toString(attachmentsOrder), - Objects.toString(movedAttachments) + return String.format("mediaListsOrder = %s, " + + "mediaOrder = %s, " + + "movedMedia = %s", + Objects.toString(mediaListsOrder), + Objects.toString(mediaOrder), + Objects.toString(movedMedia) ); } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepService.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepService.java index 4496511a3..110e1a40b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepService.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStepService.java @@ -72,7 +72,7 @@ public class MediaStepService { final String sectionIdentifier, @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) final String documentPath, - final MediaStepAttachmentOrder order + final MediaStepMediaOrder order ) { final ContentSection contentSection = sectionsUi .findContentSection(sectionIdentifier) @@ -99,7 +99,7 @@ public class MediaStepService { final List attachmentLists = document.getAttachments(); final List attachmentListsOrder = order - .getAttachmentListsOrder(); + .getMediaListsOrder(); if (attachmentListsOrder.size() != attachmentLists.size()) { throw new BadRequestException( @@ -135,7 +135,7 @@ public class MediaStepService { } for (final Map.Entry> attachmentsOrder : order - .getAttachmentsOrder().entrySet()) { + .getMediaOrder().entrySet()) { final AttachmentList attachmentList = document .getAttachments() .stream() diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedAttachment.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedMedia.java similarity index 84% rename from ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedAttachment.java rename to ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedMedia.java index 159a4e454..911dc49f4 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedAttachment.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MovedMedia.java @@ -22,20 +22,20 @@ package org.librecms.ui.contentsections.documents.media; * * @author Jens Pelzetter */ -public class MovedAttachment { +public class MovedMedia { - private String attachmentUuid; + private String mediaUuid; private String fromListUuid; private String toListUuid; - public String getAttachmentUuid() { - return attachmentUuid; + public String getMediaUuid() { + return mediaUuid; } - public void setAttachmentUuid(final String attachmentUuid) { - this.attachmentUuid = attachmentUuid; + public void setMediaUuid(final String mediaUuid) { + this.mediaUuid = mediaUuid; } public String getFromListUuid() { diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-medialist-details.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-medialist-details.xhtml new file mode 100644 index 000000000..dde6cb01e --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-medialist-details.xhtml @@ -0,0 +1,145 @@ +]> + + + + + +
+ + + #{CmsDefaultStepsMessageBundle['contentsection.documents.media.medialist.back']} + +

+ #{CmsDefaultStepsMessageBundle.getMessage('media.medialist.details.title', [CmsMediaListDetailsModel.name])} +

+
+ +

+ #{CmsDefaultStepsMessageBundle['media.medialist.details.name.label']}: + #{CmsMediaListDetailsModel.name} + +

+ + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-not-found.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-not-found.xhtml new file mode 100644 index 000000000..4f78f92ee --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media-not-found.xhtml @@ -0,0 +1,36 @@ +]> + + + + + + + + +
  • + #{CmsDefaultStepsMessageBundle['contentsection.document.media.breadcrumb']} +
    • +     + + +
    + +
    +     + +     + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml new file mode 100644 index 000000000..4a6badbf7 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml @@ -0,0 +1,324 @@ +]> + + + + + + +
    + +
    + + +
    + +
    +
    +
      + +
    • +
      +
      #{list.name}
      +
      + + + + + + #{CmsDefaultStepsMessageBundle['media.medialists.edit.button']}" + + + + +
      +
      +
        + +
      • +
        + + + + #{CmsDefaultStepsMessageBundle['media.medialists.mediatype.audioasset']} + + + + + + #{CmsDefaultStepsMessageBundle['media.medialists.mediatype.externalaudioasset']} + + + + + + #{CmsDefaultStepsMessageBundle['media.medialists.mediatype.externalvideoasset']} + + + + + #{CmsDefaultStepsMessageBundle['media.medialists.mediatype.image']} + + + + + #{CmsDefaultStepsMessageBundle['media.medialists.mediatype.video']} + + + + #{media.title} +
        +
        + + + + +
        +
        • +         +
      +
      • +       +
    + +
    + +
    + +     +     + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/medialist-not-found.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/medialist-not-found.xhtml new file mode 100644 index 000000000..6fe4fcba8 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/medialist-not-found.xhtml @@ -0,0 +1,37 @@ +]> + + + + + + + + +
  • + #{CmsAdminMessages['contentsection.document.media.breadcrumb']} +
    • +     + + +
    + +
    +     + +     + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml index 842c6050c..42cecea0f 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml @@ -38,7 +38,7 @@ method="post">
    + id="add-attachment-list-dialog-title">#{CmsDefaultStepsMessageBundle['relatedinfo.attachmentlists.add.dialog.title']}