From e3970246c3196ee142f7898b8b2e3732f04692df Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 7 Aug 2021 15:50:40 +0200
Subject: [PATCH] Highlight current authoring step

---
 .../documents/AuthoringStepListEntry.java     |   2 +-
 .../documents/SelectedDocumentModel.java      |  23 +---
 .../documents/authoringstep.xhtml             | 112 +++++++++++++-----
 .../documents/categorization.xhtml            |   2 +
 .../ui/contentsection/documents/media.xhtml   |   6 +-
 .../ui/contentsection/documents/publish.xhtml |   1 +
 .../documents/relatedinfo.xhtml               |   4 +
 .../article/article-basic-properties.xhtml    |   3 +
 .../contenttypes/article/article-text.xhtml   |   3 +
 .../org/librecms/CmsAdminMessages.properties  |   1 +
 .../librecms/CmsAdminMessages_de.properties   |   1 +
 .../ui/DefaultAuthoringStepsBundle.properties |   2 +
 .../DefaultAuthoringStepsBundle_de.properties |   2 +
 .../ui/MvcAssetStepsBundle.properties         |   3 +
 .../ui/MvcAssetStepsBundle_de.properties      |   3 +
 15 files changed, 116 insertions(+), 52 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AuthoringStepListEntry.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AuthoringStepListEntry.java
index b252391bc..efbb02d92 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AuthoringStepListEntry.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AuthoringStepListEntry.java
@@ -39,7 +39,7 @@ public class AuthoringStepListEntry {
     private String description;
 
     /**
-     * The path fragment of the authoring step.
+     * The path of the step.
      */
     private String path;
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
index 3ef827c7e..a318e9996 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java
@@ -348,10 +348,7 @@ public class SelectedDocumentModel {
     ) {
         final MvcAuthoringStepDef stepAnnotation = authoringStepClass
             .getAnnotation(MvcAuthoringStepDef.class);
-        final Path pathAnnotation = authoringStepClass.getAnnotation(
-            Path.class
-        );
-        final LocalizedTextsUtil textsUtil = globalizationHelper
+               final LocalizedTextsUtil textsUtil = globalizationHelper
             .getLocalizedTextsUtil(stepAnnotation.bundle());
         final AuthoringStepListEntry entry = new AuthoringStepListEntry();
         entry.setDescription(textsUtil.getText(stepAnnotation.descriptionKey()));
@@ -360,24 +357,6 @@ public class SelectedDocumentModel {
         return entry;
     }
 
-    private String createStepPath(final String path) {
-        return path
-            .replace(
-                String.format(
-                    "{%s}",
-                    MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM
-                ),
-                item.getContentType().getContentSection().getLabel()
-            )
-            .replace(
-                String.format(
-                    "{%s}",
-                    MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM
-                ),
-                itemPath
-            );
-    }
-
     private String createStepPath(final Class<?> stepClass) {
         final Map<String, String> values = new HashMap<>();
         values.put(
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
index 8fa1f5634..0a26f046d 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
@@ -114,42 +114,98 @@
 
                     <!-- Authoring steps -->
                     <h2>#{CmsAdminMessages['contentsection.document.authoring.steps.title']}</h2>
+                    <!--<pre>authoringStep = #{authoringStep}</pre>-->
+                    
                     <ul class="list-group">
                         <c:forEach items="#{CmsSelectedDocumentModel.authoringStepsList}"
                                    var="step">
-                            <li aria-current="#{step.path == authoringStep ? 'true' : ''}"
-                                class="list-group-item #{step.path == authoringStep ? 'active' : ''}">
-                                <a class="list-group-item-action"
-                                   href="#{step.path}">
-                                    #{step.label}
-                                </a>
-                            </li>
+                            <!--<pre>step.path = #{step.path}</pre>-->
+                            <c:choose>
+                                <c:when test="#{authoringStep == step.path}">
+                                    <li aria-current="true"
+                                        class="list-group-item active">
+                                        #{step.label}
+                                    </li>
+                                </c:when>
+                                <c:otherwise>
+                                    <li class="list-group-item">
+                                        <a class="list-group-item-action"
+                                           href="#{step.path}">
+                                            #{step.label}
+                                        </a>
+                                    </li>
+                                </c:otherwise>
+                            </c:choose>
+
                         </c:forEach>
 
                         <c:if test="#{!CmsSelectedDocumentModel.excludeDefaultAuthoringSteps}">
-                            <li aria-current="#{'categorize' == authoringStep ? 'true' : ''}"
-                                class="list-group-item #{'categorize' == authoringStep ? 'active' : ''}">
-                                <a class="list-group-item-action"
-                                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@categorization">
-                                    #{CmsAdminMessages['contentsection.document.authoring.steps.categorize.label']}
-                                </a>
-                            </li>
-                            <li aria-current="#{'relatedInfo' == authoringStep ? 'true' : ''}"
-                                class="list-group-item #{'relatedInfo' == authoringStep ? 'active' : ''}">
-                                <a class="list-group-item-action"
-                                   href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo">
-                                    #{CmsAdminMessages['contentsection.document.authoring.steps.relatedInfo.label']}
-                                </a>
-                            </li>
+                            <c:choose>
+                                <c:when test="#{authoringStep == 'categorize'}">
+                                    <li aria-current="true"
+                                        class="list-group-item active">
+                                        #{CmsAdminMessages['contentsection.document.authoring.steps.categorize.label']}
+                                    </li>
+                                </c:when>
+                                <c:otherwise>
+                                    <li class="list-group-item ">
+                                        <a class="list-group-item-action"
+                                           href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@categorization">
+                                            #{CmsAdminMessages['contentsection.document.authoring.steps.categorize.label']}
+                                        </a>
+                                    </li>
+                                </c:otherwise>
+                            </c:choose>
+                            <c:choose>
+                                <c:when test="#{authoringStep == 'media'}">
+                                    <li aria-current="true"
+                                        class="list-group-item active">
+                                        #{CmsAdminMessages['contentsection.document.authoring.steps.media.label']}
+                                    </li>
+                                </c:when>
+                                <c:otherwise>
+                                    <li class="list-group-item">
+                                        <a class="list-group-item-action"
+                                           href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@media">
+                                            #{CmsAdminMessages['contentsection.document.authoring.steps.media.label']}
+                                        </a>
+                                    </li>   
+                                </c:otherwise>
+                            </c:choose>
+                            <c:choose>
+                                <c:when test="#{authoringStep == 'relatedInfo'}">
+                                    <li aria-current="true"
+                                        class="list-group-item active">
+                                        #{CmsAdminMessages['contentsection.document.authoring.steps.relatedInfo.label']}
+                                    </li>
+                                </c:when>
+                                <c:otherwise>
+                                    <li class="list-group-item">
+                                        <a class="list-group-item-action"
+                                           href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@relatedinfo">
+                                            #{CmsAdminMessages['contentsection.document.authoring.steps.relatedInfo.label']}
+                                        </a>
+                                    </li>
+                                </c:otherwise>
+                            </c:choose>
                         </c:if>
 
-                        <li aria-current="#{'publish' == authoringStep ? 'true' : ''}"
-                            class="list-group-item #{'publish' == authoringStep ? 'active' : ''}">
-                            <a class="list-group-item-action"
-                               href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publish">
-                                #{CmsAdminMessages['contentsection.document.authoring.steps.publish.label']}
-                            </a>
-                        </li>
+                        <c:choose>
+                            <c:when test="#{authoringStep == 'publish'}">
+                                <li aria-current="true"
+                                    class="list-group-item active">
+                                    #{CmsAdminMessages['contentsection.document.authoring.steps.publish.label']}
+                                </li>
+                            </c:when>
+                            <c:otherwise>
+                                <li class="list-group-item">
+                                    <a class="list-group-item-action"
+                                       href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publish">
+                                        #{CmsAdminMessages['contentsection.document.authoring.steps.publish.label']}
+                                    </a>
+                                </li>
+                            </c:otherwise>
+                        </c:choose>
 
                     </ul>
 
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
index caa1e7a17..9f1253181 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/categorization.xhtml
@@ -6,6 +6,8 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
+        <ui:param name="authoringStep" value="categorize" />
+        
         <ui:define name="authoringStep">
             <h1>#{CmsDefaultStepsMessageBundle.getMessage('categorization.title', [CmsSelectedDocumentModel.itemTitle])}</h1>
             
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
index 4a6badbf7..31730f540 100644
--- 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
@@ -7,7 +7,11 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
+        <ui:param name="authoringStep" value="media" />
+        
         <ui:define name="authoringStep">
+            <h1>#{CmsDefaultStepsMessageBundle.getMessage("media.title", [CmsSelectedDocumentModel.itemTitle])}</h1>
+            
             <template id="cms-sort-media-error-general">
                 <div class="alert alert-danger mt-3" role="alert">
                     #{CmsDefaultStepsMessageBundle['media.sortmedia.errors.general']}
@@ -187,7 +191,7 @@
                                     assetPickerId="attach-media-picker-#{list.uuid}"
                                     baseUrl="#{CmsMediaStep.mediaAssetPickerBaseUrl}"
                                     contentSection="#{CmsMediaStep.sectionName}"
-                                    formParamName="assetIdentifier"
+                                    formParamName="mediaIdentifier"
                                     />
                             </div>
                         </div>
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
index d079e621c..b2cf8354f 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
@@ -7,6 +7,7 @@
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/document.xhtml">
 
         <ui:param name="activePage" value="document" />
+        <ui:param name="authoringStep" value="publish" />
         <ui:param name="title" value="#{CmsAdminMessages['contentsection.documents.publishstep.title']}" />
 
         <ui:define name="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 42cecea0f..99e9d3d3b 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
@@ -7,7 +7,11 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
+        <ui:param name="authoringStep" value="relatedInfo" />
+        
         <ui:define name="authoringStep">
+            <h1>#{CmsDefaultStepsMessageBundle.getMessage("relatedinfo.title", [CmsSelectedDocumentModel.itemTitle])}</h1>
+            
             <template id="cms-sort-attachments-error-general">
                 <div class="alert alert-danger mt-3" role="alert">
                     #{CmsDefaultStepsMessageBundle['relatedinfo.sortattachments.errors.general']}
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml
index 965f01e68..fd9672d8c 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml
@@ -6,6 +6,9 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
+        <ui:param name="authoringStep" 
+                  value="/libreccm/@contentsections/info/documents/test-article/@article-basicproperties" />
+        
         <ui:define name="authoringStep">
             <h2>#{CmsArticleMessageBundle.getMessage('basicproperties.header', [CmsArticlePropertiesStep.name])}</h2>
 
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text.xhtml
index ca9fc45cb..8f25e929f 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text.xhtml
@@ -7,6 +7,9 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
+        <ui:param name="authoringStep" 
+                  value="/libreccm/@contentsections/info/documents/test-article/@article-text" />
+        
         <ui:define name="authoringStep">
             <h2>#{CmsArticleMessageBundle['textstep.header']}</h2>
 
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
index 302a03fa0..91219e766 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages.properties
@@ -833,3 +833,4 @@ contentsection.configuration.contactentrykey.not_found.title=Contact Data Entry
 contentsection.configuration.contactentrykey.not_found=Contact Data Entry Key {0} not found.
 contentsection.configuration.contactentrykeys.add.dialog.title=Add Contact Entry Key
 contentsection.configuration.contactentrykeys.breadcrumbs=Contact Entry Keys
+contentsection.document.authoring.steps.media.label=Media
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
index 995ab264f..54bb04a1a 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsAdminMessages_de.properties
@@ -834,3 +834,4 @@ contentsection.configuration.contactentrykey.not_found.title=Kontaktdaten-Angabe
 contentsection.configuration.contactentrykey.not_found=Kontaktdaten-Angabe {0} nicht gefunden.
 contentsection.configuration.contactentrykeys.add.dialog.title=M\u00f6gliche Kontaktdaten-Angabe hinzuf\u00fcgen
 contentsection.configuration.contactentrykeys.breadcrumbs=Kontaktdaten-Angaben
+contentsection.document.authoring.steps.media.label=Medien
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
index bf7901889..ec6195f72 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
@@ -335,3 +335,5 @@ contentsection.document.media.breadcrumb=Media
 media.medialists.media.not_found.message=No media identified by {1} found in content section {0}.
 media.medialist.not_found.title=Media List not found
 media.medialist.not_found.message=Content Item {0} has not media list {1}.
+media.title=Media for Content Item {0}
+relatedinfo.title=Related Info for Content Item {0}
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
index cc9efb8cb..ecd9a8f42 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
@@ -335,3 +335,5 @@ contentsection.document.media.breadcrumb=Medien
 media.medialists.media.not_found.message=Kein Medium mit UUID {1} in Content Section {0} gefunden.
 media.medialist.not_found.title=Medienliste nicht gefunden
 media.medialist.not_found.message=Keine Medienliste {1} f\u00fcr Dokument {0} gefunden.
+media.title=Medien f\u00fcr Dokument {0}
+relatedinfo.title=Weiterf\u00fchrende Informationen f\u00fcr Dokument {0}
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 d855abc7e..d6c645d07 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
@@ -535,3 +535,6 @@ videoasset.editstep.legelmetadata.creator=Creator
 categorization.tree.expand=Expand/Hide subcategories
 authoringsteps.media.description=Add different media, for example images, videos or audio asset to a content item.
 authoringsteps.media.label=Media
+contentsection.document.authoring.steps.media.label=Media
+relatedinfo.title=Related Info for Content Item {0}
+media.title=Media for Content Item {0}
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 9784e44a1..3ee0380ef 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
@@ -535,3 +535,6 @@ videoasset.editstep.legelmetadata.creator=K\u00fcnstler
 categorization.tree.expand=Unterkategorien anzeigen/verbergen
 authoringsteps.media.description=F\u00fcgen Sie Medien, z.B. Bilder, Videos oder Audio-Dateien einem Dokument hinzu.
 authoringsteps.media.label=Medien
+contentsection.document.authoring.steps.media.label=Medien
+relatedinfo.title=Weiterf\u00fchrende Informationen f\u00fcr Dokument {0}
+media.title=Medien f\u00fcr Dokument {0}