From bde482bd008126c71212f3d44f2ca076a1addf1b Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Thu, 7 May 2020 10:26:38 +0000
Subject: [PATCH] [Library|Trunk]

Search pages and table view components: add breadcrumb when it not only results displayed
Deposit: remocve a margin



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58625 d315682c-612b-4755-9ff5-7f18f6832af3
---
 deposit/depositFirstPage.component.ts         |  2 +-
 .../searchUtils/newSearchPage.component.html  |  8 ++++---
 .../searchPageTableView.component.html        | 24 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts
index 4179dee8..ddcc7d08 100644
--- a/deposit/depositFirstPage.component.ts
+++ b/deposit/depositFirstPage.component.ts
@@ -15,7 +15,7 @@ import {Breadcrumb} from "../utils/breadcrumbs/breadcrumbs.component";
    
 
     <div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">
-      <div class="explorePanelBackground communityPanelBackground uk-margin-top uk-padding-small">
+      <div class="explorePanelBackground communityPanelBackground uk-padding-small">
         <div class="uk-align-center uk-container uk-container-large uk-margin-large-top uk-margin-large-bottom">
           <breadcrumbs [breadcrumbs]="breadcrumbs" [light]="!!(this.communityId)"></breadcrumbs>
           <div class="uk-h1 uk-width-1-2@m uk-width-1-1@s ">
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index d6a38af9..74b05e19 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -78,9 +78,11 @@
 
     <div [class]="(usedBy!='deposit' && (!customFilter || customFilter.queryFieldName != 'communityId'))?'uk-position-cover':''" ></div>
     <div class="uk-width-1-1">
+      <breadcrumbs *ngIf="showBreadcrumb && entityType!='community'"
+                   addClass=" uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
         <div class="uk-position-relative">
            <div   [class]="'uk-container '+(customFilter && customFilter.queryFieldName ==
-           'communityId'?'':'uk-margin-large-top')+
+           'communityId'?'  uk-margin-large-bottom ':'uk-margin-large-top')+
            (entityType === 'community' ||entityType === 'funder'?' uk-position-relative':'')">
                 <advanced-search-form
                    [entityType] = "entityType"
@@ -114,8 +116,8 @@
 <div id="tm-main" class="   tm-middle communityBackground">
   <div uk-grid>
     <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
-      <breadcrumbs *ngIf="showBreadcrumb && entityType!='community'"
-                   addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
+<!--      <breadcrumbs *ngIf="showBreadcrumb && entityType!='community'"-->
+<!--                   addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>-->
       <div class="uk-container uk-container-large">
         <div>
           <breadcrumbs *ngIf="showBreadcrumb && entityType=='community'"
diff --git a/searchPages/searchUtils/searchPageTableView.component.html b/searchPages/searchUtils/searchPageTableView.component.html
index ff5a5474..89532589 100644
--- a/searchPages/searchUtils/searchPageTableView.component.html
+++ b/searchPages/searchUtils/searchPageTableView.component.html
@@ -55,16 +55,25 @@
   </div>
 </ng-template>
 
-<div *ngIf="!includeOnlyResultsAndFilter" class="image-front-topbar  uk-section-default uk-position-relative"
+<div *ngIf="!includeOnlyResultsAndFilter"
+     [class]=" (!customFilter || customFilter.queryFieldName != 'communityId') ?
+    ' image-front-topbar uk-section-default uk-position-relative ' :
+    ('  uk-padding-remove-bottom  uk-padding-remove-top ')"
+     class="image-front-topbar  uk-section-default uk-position-relative"
      uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
-  <div style=" min-height: 350px;"  [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
-    <div class="uk-position-cover" style="/*background-color: rgba(255, 255, 255, 0.37);*/"></div>
-    <div class="uk-container">
+  <div style=" min-height: 220px; "
+       [class]="' uk-background-norepeat uk-background-cover uk-background-bottom-center   uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass">
+
+    <div [class]="(!customFilter || customFilter.queryFieldName != 'communityId')?'uk-position-cover':''" ></div>
+    <div class="uk-width-1-1">
+      <breadcrumbs *ngIf="showBreadcrumb && !includeOnlyResultsAndFilter"
+                   addClass=" uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
         <div class="uk-position-relative">
 
 
            <div   class="uk-container ">
              <div   class="uk-width-1-1">
+
 <!--               <search-form [isDisabled]="disableForms" [(keyword)]="searchUtils.keyword" (keywordChange)="keywordChanged($event)"  [placeholderText]="formPlaceholderText"></search-form>-->
                <form class=" uk-margin uk-margin-top ">
                  <div class="uk-grid uk-margin-small-left">
@@ -80,7 +89,7 @@
                           (click)="searchUtils.keyword = '';  goTo(1);"
                           uk-icon="icon: close"></a>
                        <input type="text" class="uk-input   uk-width-xlarge@l uk-width-large@m uk-width-medium"
-                              placeholder="Search in OpenAIRE for scholarly works"
+                              [placeholder]="formPlaceholderText"
                               [(ngModel)]="searchUtils.keyword"
                               name="keyword">
                      </div>
@@ -102,7 +111,7 @@
 
            </div>
         </div>
-     </div>
+
   </div>
 </div>
 <schema2jsonld   *ngIf="url"  [URL]="url" type="search" [name]=pageTitle [searchAction]=false></schema2jsonld>
@@ -110,7 +119,8 @@
 <div id="tm-main" class=" uk-section uk-padding-remove-top tm-middle communityBackground"   >
   <div uk-grid>
     <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
-      <breadcrumbs *ngIf="showBreadcrumb" addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
+      <breadcrumbs *ngIf="showBreadcrumb && includeOnlyResultsAndFilter"
+                   addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
       <div  class="uk-container  uk-container-large">
         <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
         <div  class="uk-width-2-3@m  uk-width-2-3@l  uk-width-1-1@s">