From 5f32b643b36b30ea38de76ad414f05e0d0c53a76 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:47:14 +0100
Subject: [PATCH 1/9] fix nested span element in templates

(cherry picked from commit 394ecea1186c01f4edcf43b1f656a4e55cb56591)
---
 .../journal-volume-search-result-list-element.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 4a6ffb412da..b161874fdfe 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>

From 43d4e976955c66b94da5c6b9183b555a085d276c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:56:50 +0100
Subject: [PATCH 2/9] fix nested span element

(cherry picked from commit 84878ede6770d4d9b9417757f738d6371541e79d)
---
 .../journal-issue-search-result-list-element.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 59d2ea4dc9d..ef99e23256d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -26,12 +26,13 @@
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-issues">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
                     </span>
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
                         <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>
             </span>

From e41e8b2847d07314e4aba734647767a0a9a91559 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:59:56 +0100
Subject: [PATCH 3/9] fix nested span element

(cherry picked from commit 8509096c320f37fffbc6893e89461d364feb91e5)
---
 .../journal/journal-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index bd119493d36..8acdfed9b59 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>

From 483214d8e29986fe38467be4df332dc67cfade57 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:00:47 +0100
Subject: [PATCH 4/9] fix nested span element

(cherry picked from commit 15d3f257b348fb0d37adbcde64316f2acf62632c)
---
 .../project/project-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 34d5588c2d2..65cf6fa1f85 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->

From 1322d0ad69589dc1ce22a203b511ae51bb4da51e Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:01:37 +0100
Subject: [PATCH 5/9] fix nested span element

(cherry picked from commit 2e174cd9e67037e777608df1db8ce2f5ef13cc14)
---
 .../person/person-item-metadata-list-element.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f560567814..b78202d0fea 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>

From 00a514b9696f2e16421e31105e7f02484dc3e332 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:02:43 +0100
Subject: [PATCH 6/9] fix nested span element

(cherry picked from commit e9a28c6d3dd94101bc1ff5e06a8d3a08783bc3c3)
---
 ...rch-result-list-submission-element.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 66db99a6afb..122c8bb59e1 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>

From 2029156e499c41edac4f8f87e63b09ef09707c96 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:05:07 +0100
Subject: [PATCH 7/9] fix nested span element

(cherry picked from commit 97b5e0cc92420366355c00f5013550ce7715801d)
---
 ...-unit-search-result-list-submission-element.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e2649587382..1f020d127f4 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>

From 05dce42f872e1d4111672b5adb2a3611ca2c6814 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:09:02 +0100
Subject: [PATCH 8/9] remove nested span element

(cherry picked from commit acb7c9bd33bb678766ab219851999f217f7b81d5)
---
 .../journal-issue-search-result-list-element.component.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index ef99e23256d..277ece36573 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -31,7 +31,6 @@
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
                     <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                         <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>

From 25de1e48f3694c1dfeef9f96348d083ba762fbd7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:12:44 +0100
Subject: [PATCH 9/9] fix indentation

(cherry picked from commit dbd67f056ebff2b5dd62264f8724c64cc11b5d4a)
---
 ...-search-result-list-element.component.html | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 277ece36573..961cbfd8c4c 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -22,21 +22,21 @@
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>