From 166aab606d412129a88476f86bd27bd6127e9a91 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 12 Nov 2019 14:54:16 +0100
Subject: [PATCH] 65240: logo under browse

---
 .../collection-page.component.html                 | 14 ++++++++------
 .../+community-page/community-page.component.html  |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 436cd351a0..a8a9a9fdd5 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,12 +3,7 @@
          *ngVar="(collectionRD$ | async) as collectionRD">
         <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
             <div *ngIf="collectionRD?.payload as collection">
-                <header class="comcol-header border-bottom mb-4 pb-4">
-                    <!-- Collection logo -->
-                    <ds-comcol-page-logo *ngIf="logoRD$"
-                        [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
-                        [alternateText]="'Collection Logo'">
-                    </ds-comcol-page-logo>
+              <header class="comcol-header border-bottom mb-4 pb-4">
                 <!-- Collection Name -->
                 <ds-comcol-page-header
                         [name]="collection.name">
@@ -38,6 +33,13 @@
                       [contentType]="collection.type">
               </ds-comcol-page-browse-by>
 
+              <!-- Collection logo -->
+              <ds-comcol-page-logo *ngIf="logoRD$"
+                                   [logo]="(logoRD$ | async)?.payload"
+                                   [alternateText]="'Collection Logo'"
+                                   [alternateText]="'Collection Logo'">
+              </ds-comcol-page-logo>
+
             <ng-container *ngVar="(itemRD$ | async) as itemRD">
                 <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn>
                     <h3 class="sr-only">{{'collection.page.browse.recent.head' | translate}}</h3>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 05d0bd1d0e..87c64b79b7 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -2,9 +2,6 @@
   <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="communityRD?.payload; let communityPayload">
       <header class="comcol-header border-bottom mb-4 pb-4">
-        <!-- Community logo -->
-        <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
-        </ds-comcol-page-logo>
 
         <!-- Community name -->
         <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
@@ -25,6 +22,10 @@
         <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
         </ds-comcol-page-browse-by>
 
+        <!-- Community logo -->
+        <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+        </ds-comcol-page-logo>
+
         <ds-community-page-sub-community-list [community]="communityPayload"></ds-community-page-sub-community-list>
         <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>
       </section>