LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Bugfixes for the UI of ExternalAudioAsset and ExternalVideoAsset.

pull/10/head
Jens Pelzetter 2021-06-14 20:27:33 +02:00
parent 178789690f
commit 6e13dd6019
10 changed files with 112 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetCreateStep.java
View File

@ -21,6 +21,8 @@ package org.librecms.ui.contentsections.assets;
import org.libreccm.l10n.GlobalizationHelper;
import org.librecms.assets.ExternalAudioAsset;
import java.util.Map;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named;
@ -61,4 +63,18 @@ public class ExternalAudioAssetCreateStep
return ExternalAudioAsset.class;
}
@Override
protected String setAssetProperties(
final ExternalAudioAsset asset,
final Map<String, String[]> formParams
) {
super.setAssetProperties(asset, formParams);
return String.format(
"redirect:/%s/assets/%s/%s/@external-audio-asset-edit",
getContentSectionLabel(),
getFolderPath(),
getName()
);
}
}

5
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetEditStep.java
View File

@ -81,6 +81,11 @@ public class ExternalAudioAssetEditStep extends BookmarkEditStep {
@Inject
private Models models;
@Override
public Class<? extends MvcAssetEditStep> getStepClass() {
return ExternalAudioAssetEditStep.class;
}
@Override
protected void init() throws ContentSectionNotFoundException,
AssetNotFoundException {

17
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetCreateStep.java
View File

@ -21,6 +21,8 @@ package org.librecms.ui.contentsections.assets;
import org.libreccm.l10n.GlobalizationHelper;
import org.librecms.assets.ExternalVideoAsset;
import java.util.Map;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named;
@ -61,4 +63,19 @@ public class ExternalVideoAssetCreateStep
return ExternalVideoAsset.class;
}
@Override
protected String setAssetProperties(
final ExternalVideoAsset asset,
final Map<String, String[]> formParams
) {
super.setAssetProperties(asset, formParams);
return String.format(
"redirect:/%s/assets/%s/%s/@external-video-asset-edit",
getContentSectionLabel(),
getFolderPath(),
getName()
);
}
}

5
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java
View File

@ -81,6 +81,11 @@ public class ExternalVideoAssetEditStep extends BookmarkEditStep {
@Inject
private Models models;
@Override
public Class<? extends MvcAssetEditStep> getStepClass() {
return ExternalAudioAssetEditStep.class;
}
@Override
protected void init() throws ContentSectionNotFoundException,
AssetNotFoundException {

9
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/bookmark/edit-bookmark.xhtml
View File

@ -73,7 +73,14 @@
</div>
</div>
</c:if>
<!--<pre>#{CmsBookmarkEditStep.url}</pre>-->
<c:choose>
<c:when test="#{CmsBookmarkEditStep.url != null}">
<pre>#{CmsBookmarkEditStep.url}</pre>
</c:when>
<c:otherwise>
<p>#{CmsAssetsStepsDefaultMessagesBundle['bookmark.editstep.url.not_set']}</p>
</c:otherwise>
</c:choose>
<libreccm:localizedStringEditor
addButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['bookmark.editstep.description.add_button.label']}"

3
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/create-external-audio-asset.xhtml
View File

@ -76,4 +76,7 @@
</div>
</ui:define>
</ui:composition>
</html>

24
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/edit-external-audio-asset.xhtml
View File

@ -57,7 +57,7 @@
label="#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.url.edit.label']}"
name="url"
required="true"
value="#{CmsExternalAudioAssetEditStep.url}"/>
value="#{CmsBookmarkEditStep.url}"/>
</div>
<div class="modal-footer">
<button class="btn btn-warning"
@ -74,7 +74,19 @@
</div>
</div>
</c:if>
<!--<pre>#{CmsExternalAudioAssetEditStep.url}</pre>-->
<c:choose>
<c:when test="#{CmsBookmarkEditStep.url != null}">
<pre>#{CmsBookmarkEditStep.url}</pre>
<div class="audioplayer">
<audio controls="controls"
src="#{CmsBookmarkEditStep.url}">
</audio>
</div>
</c:when>
<c:otherwise>
<p>#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.url.not_set']}</p>
</c:otherwise>
</c:choose>
<libreccm:localizedStringEditor
addButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.description.add_button.label']}"
@ -94,7 +106,7 @@
editDialogValueLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.description.edit.value.label']}"
editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSelectedAssetModel.assetPath}/@external-audio-asset-edit/description/edit"
editorId="description-editor"
hasUnusedLocales="#{!CmsExternalAudioAssetEditStep.unusedDescriptionLocales.isEmpty()}"
hasUnusedLocales="#{!CmsBookmarkEditStep.unusedDescriptionLocales.isEmpty()}"
headingLevel="3"
objectIdentifier="#{CmsSelectedAssetModel.assetPath}"
readOnly="#{!MvcAssetEditStepModel.canEdit}"
@ -105,9 +117,9 @@
removeDialogTitle="#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.description.remove.title']}"
removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSelectedAssetModel.assetPath}/@external-audio-asset-edit/description/remove"
title="#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.description.title']}"
unusedLocales="#{CmsExternalAudioAssetEditStep.unusedDescriptionLocales}"
unusedLocales="#{CmsBookmarkEditStep.unusedDescriptionLocales}"
useTextarea="true"
values="#{CmsExternalAudioAssetEditStep.descriptionValues}"
values="#{CmsBookmarkEditStep.descriptionValues}"
/>
<h3>#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.legalmetadata.title']}</h3>
@ -138,7 +150,7 @@
/>
<button class="btn btn-danger"
data-toggle="modal"
data-target="#remove-legalmetdata-dialog"
data-target="#remove-legalmetadata-dialog"
type="button">
<bootstrap:svgIcon icon="x-circle" />
<span class="sr-only">#{CmsAssetsStepsDefaultMessagesBundle['externalaudioasset.editstep.legelmetadata.remove.close']}</span>

25
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml
View File

@ -57,7 +57,7 @@
label="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.url.edit.label']}"
name="url"
required="true"
value="#{CmsExternalVideoAssetEditStep.url}"/>
value="#{CmsBookmarkEditStep.url}"/>
</div>
<div class="modal-footer">
<button class="btn btn-warning"
@ -74,7 +74,18 @@
</div>
</div>
</c:if>
<!--<pre>#{CmsExternalVideoAssetEditStep.url}</pre>-->
<c:choose>
<c:when test="#{CmsBookmarkEditStep.url != null}">
<pre>#{CmsBookmarkEditStep.url}</pre>
<video controls="controls"
src="#{CmsBookmarkEditStep.url}"
width="320">
</video>
</c:when>
<c:otherwise>
<p>#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.url.not_set']}</p>
</c:otherwise>
</c:choose>
<libreccm:localizedStringEditor
addButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.add_button.label']}"
@ -94,10 +105,10 @@
editDialogValueLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.edit.value.label']}"
editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSelectedAssetModel.assetPath}/@external-video-asset-edit/description/edit"
editorId="description-editor"
hasUnusedLocales="#{!CmsExternalVideoAssetEditStep.unusedDescriptionLocales.isEmpty()}"
hasUnusedLocales="#{!CmsBookmarkEditStep.unusedDescriptionLocales.isEmpty()}"
headingLevel="3"
objectIdentifier="#{CmsSelectedAssetModel.assetPath}"
readOnly="#{!MvcAssetEditStepModel.canEdit}"
readOnly="#{!CmsBookmarkEditStep.canEdit}"
removeButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove_button.label']}"
removeDialogCancelLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove.cancel']}"
removeDialogSubmitLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove.submit']}"
@ -105,9 +116,9 @@
removeDialogTitle="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove.title']}"
removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSelectedAssetModel.assetPath}/@external-video-asset-edit/description/remove"
title="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.title']}"
unusedLocales="#{CmsExternalVideoAssetEditStep.unusedDescriptionLocales}"
unusedLocales="#{CmsBookmarkEditStep.unusedDescriptionLocales}"
useTextarea="true"
values="#{CmsExternalVideoAssetEditStep.descriptionValues}"
values="#{CmsBookmarkEditStep.descriptionValues}"
/>
<h3>#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.legalmetadata.title']}</h3>
@ -138,7 +149,7 @@
/>
<button class="btn btn-danger"
data-toggle="modal"
data-target="#remove-legalmetdata-dialog"
data-target="#remove-legalmetadata-dialog"
type="button">
<bootstrap:svgIcon icon="x-circle" />
<span class="sr-only">#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.legelmetadata.remove.close']}</span>

11
ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
View File

@ -376,3 +376,14 @@ externalvideoasset.editstep.legelmetadata.remove.message=Are you sure to remove
externalvideoasset.editstep.legelmetadata.remove.submit=Remove legal metadata
externalvideoasset.editstep.legelmetadata.rightsholder=Rights Holder
externalvideoasset.editstep.legelmetadata.creator=Creator
externalvideoasset.editstep.url.not_set=URL has not been set yet.
externalaudioasset.editstep.url.not_set=URL has not been set yet.
bookmark.editstep.url.not_set=URL has not been set yet.
createform.externalaudioasset.url.label=URL
createform.externalaudioasset.description.label=Description
createform.externalaudioasset.url.help=The URL of the external audio file. This URL should point to a audio file of a format supported by most browser, like MP3.
createform.externalaudioasset.description.help=A short description of the contents of the external audio file.
createform.externalvideoasset.url.help=The URL of the external video. The video should be available in a format supported by must browsers, e.g.MPEG4/H.264.
createform.externalvideoasset.url.label=URL
createform.externalvideoasset.description.help=A short description of the contents of the video.
createform.externalvideoasset.description.label=Description

11
ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties
View File

@ -376,3 +376,14 @@ externalvideoasset.editstep.legelmetadata.remove.message=Sind Sie sicher, dass S
externalvideoasset.editstep.legelmetadata.remove.submit=Rechtliche Informationen entfernen
externalvideoasset.editstep.legelmetadata.rightsholder=Rechte-Inhaber
externalvideoasset.editstep.legelmetadata.creator=K\u00fcnstler
externalvideoasset.editstep.url.not_set=Keine URL gesetzt.
externalaudioasset.editstep.url.not_set=Keine URL gesetzt.
bookmark.editstep.url.not_set=Keine URL gesetzt.
createform.externalaudioasset.url.label=URL
createform.externalaudioasset.description.label=Beschreibung
createform.externalaudioasset.url.help=Die URL der externen Audio-Datei. Die Datei sollte in einem von den meisten Browsern unterst\u00fctzten Format, z.B. MP3, vorliegen.
createform.externalaudioasset.description.help=Eine kurze Beschreibung des Inhaltes der externen Audio-Datei.
createform.externalvideoasset.url.help=Die URL der externe Video-Datei. Das Video sollte in einem von den meisten Browsern unterst\u00fctzten Format vorliegen, z.B MPEG-4/H.264.
createform.externalvideoasset.url.label=URL
createform.externalvideoasset.description.help=Eine kurze Beschreibung des Inhaltes des Videos.
createform.externalvideoasset.description.label=Beschreibung