From 6e13dd6019bfa930c77afdbb6af4d537edbeb2c0 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 14 Jun 2021 20:27:33 +0200
Subject: [PATCH] Bugfixes for the UI of ExternalAudioAsset and
 ExternalVideoAsset.

---
 .../assets/ExternalAudioAssetCreateStep.java  | 16 ++++++++++++
 .../assets/ExternalAudioAssetEditStep.java    |  5 ++++
 .../assets/ExternalVideoAssetCreateStep.java  | 17 +++++++++++++
 .../assets/ExternalVideoAssetEditStep.java    |  5 ++++
 .../assets/bookmark/edit-bookmark.xhtml       |  9 ++++++-
 .../create-external-audio-asset.xhtml         |  3 +++
 .../edit-external-audio-asset.xhtml           | 24 +++++++++++++-----
 .../edit-external-video-asset.xhtml           | 25 +++++++++++++------
 .../ui/MvcAssetStepsBundle.properties         | 11 ++++++++
 .../ui/MvcAssetStepsBundle_de.properties      | 11 ++++++++
 10 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetCreateStep.java
index 9095cfe54..216931fc0 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetCreateStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetCreateStep.java
@@ -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()
+        );
+    }
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetEditStep.java
index 0377a776d..42dc51e67 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalAudioAssetEditStep.java
@@ -80,6 +80,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,
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetCreateStep.java
index adad65542..20272ad88 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetCreateStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetCreateStep.java
@@ -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()
+        );
+    }
+    
 }
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java
index 9be3c797c..49ea337b4 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java
@@ -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 {
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/bookmark/edit-bookmark.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/bookmark/edit-bookmark.xhtml
index 93dd45c2b..91cdbd1a9 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/bookmark/edit-bookmark.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/bookmark/edit-bookmark.xhtml
@@ -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']}"
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/create-external-audio-asset.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/create-external-audio-asset.xhtml
index 0bb6e68bb..493f805fe 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/create-external-audio-asset.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/create-external-audio-asset.xhtml
@@ -76,4 +76,7 @@
             </div>
 
         </ui:define>
+
+    </ui:composition>
+    
 </html>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/edit-external-audio-asset.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/edit-external-audio-asset.xhtml
index 4aa53fb22..7e1093dd6 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/edit-external-audio-asset.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-audio-asset/edit-external-audio-asset.xhtml
@@ -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>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml
index df2af4d65..9fa782ddf 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml
@@ -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>
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 7b84729bc..dbb6327ad 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
@@ -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
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 6a5097374..588895c74 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
@@ -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