From 89acbac1c0f8da8e13106e4a9c2625bafadebd84 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Wed, 2 Dec 2020 08:41:00 +0000
Subject: [PATCH] [Trunk | Library] 1. subscribe.service.ts: [Bug fix] In
 method "initIsSubscribedToCommunity()" and "isSubscribedToCommunity()" in api
 path /{portalType} changed with /community. 2. newSearchPage.component.html:
 Use updated icon "search.svg" (not .png). 3. contact-us.component.html: In
 contact us form rows change "uk-margin-top" to "uk-margin-medium-top".

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60008 d315682c-612b-4755-9ff5-7f18f6832af3
---
 contact-us/contact-us.component.html          | 22 +++++++++----------
 .../searchUtils/newSearchPage.component.html  |  2 +-
 utils/subscribe/subscribe.service.ts          |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html
index 0d746723..9fdaa0a2 100644
--- a/contact-us/contact-us.component.html
+++ b/contact-us/contact-us.component.html
@@ -5,54 +5,54 @@
     <div class="uk-margin-small uk-width-1-1 uk-text-danger uk-text-bold uk-margin-remove-bottom">
         *Required fields
     </div>
-    <div *ngIf="contactForm.get('name')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('name')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Name <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
         <input class="uk-input" type="text" placeholder="Your name" formControlName="name"
                [class.uk-form-danger]="contactForm.get('name').invalid && contactForm.get('name').touched">
     </div>
-    <div *ngIf="contactForm.get('surname')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('surname')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Surname <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
         <input class="uk-input" type="text" placeholder="Your surname" formControlName="surname"
                [class.uk-form-danger]="contactForm.get('surname').invalid && contactForm.get('surname').touched">
     </div>
-    <div *ngIf="contactForm.get('email')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('email')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Email <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
         <input class="uk-input" type="text" placeholder="Preferably your work email" formControlName="email"
                [class.uk-form-danger]="contactForm.get('email').invalid && contactForm.get('email').touched">
     </div>
-    <div *ngIf="contactForm.get('job')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('job')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Job Title <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
         <input class="uk-input" type="text" placeholder="Your job title" formControlName="job"
                [class.uk-form-danger]="contactForm.get('job').invalid && contactForm.get('job').touched">
     </div>
-    <div *ngIf="contactForm.get('affiliation')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('affiliation')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Affiliation <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
         <input class="uk-input" type="text" placeholder="Your affiliation" formControlName="affiliation"
                [class.uk-form-danger]="contactForm.get('affiliation').invalid && contactForm.get('affiliation').touched">
     </div>
-    <div *ngIf="contactForm.get('community')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('community')" class="uk-width-1-2@s uk-margin-medium-top">
         <div class="uk-width-1-1">
             <h6 class="uk-text-bold uk-margin-small-bottom uk-text-nowrap">Research Community or Infrastructure <span class="uk-text-danger uk-text-bold">*</span></h6>
         </div>
         <input class="uk-input uk-width-1" type="text" placeholder="Your community name" formControlName="community"
                [class.uk-form-danger]="contactForm.get('community').invalid && contactForm.get('community').touched">
     </div>
-    <div *ngIf="contactForm.get('organization')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('organization')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">Organization <span class="uk-text-danger uk-text-bold">*</span></h6>
         <input class="uk-input uk-width-1-1" type="text" placeholder="Your organization" formControlName="organization"
                [class.uk-form-danger]="contactForm.get('organization').invalid && contactForm.get('organization').touched">
     </div>
-    <div *ngIf="contactForm.get('organizationType')" class="uk-width-1-2@s uk-margin-top">
+    <div *ngIf="contactForm.get('organizationType')" class="uk-width-1-2@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">Organization Type <span class="uk-text-danger uk-text-bold">*</span></h6>
         <input type="text" class="uk-input uk-width-1-1" placeholder="Your Organization Type" formControlName="organizationType"
                [class.uk-form-danger]="contactForm.get('organizationType').invalid && contactForm.get('organizationType').touched"
@@ -63,12 +63,12 @@
             </mat-option>
         </mat-autocomplete>
     </div>
-    <div *ngIf="contactForm.get('subject')" class="uk-width-1-1@s uk-margin-top">
+    <div *ngIf="contactForm.get('subject')" class="uk-width-1-1@s uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">Subject <span class="uk-text-danger uk-text-bold">*</span></h6>
         <input class="uk-input uk-width-1-1" type="text" placeholder="Your subject" formControlName="subject"
                [class.uk-form-danger]="contactForm.get('subject').invalid && contactForm.get('subject').touched">
     </div>
-    <div *ngIf="contactForm.get('message')" class="uk-width-1-1 uk-margin-top">
+    <div *ngIf="contactForm.get('message')" class="uk-width-1-1 uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Message <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
@@ -76,7 +76,7 @@
                   [class.uk-form-danger]="contactForm.get('message').invalid && contactForm.get('message').touched">
         </textarea>
     </div>
-    <div *ngIf="contactForm.get('description')" class="uk-width-1-1 uk-margin-top">
+    <div *ngIf="contactForm.get('description')" class="uk-width-1-1 uk-margin-medium-top">
         <h6 class="uk-text-bold uk-margin-small-bottom">
             Description <span class="uk-text-danger uk-text-bold">*</span>
         </h6>
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index 2c5717c6..b9f3c401 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -184,7 +184,7 @@
           >
           </advanced-search-form>
           <div *ngIf="entityType === 'community' || entityType === 'stakeholder' " class="uk-position-center-right uk-visible@m">
-            <img src="assets/common-assets/common/search.png" class="uk-align-center" width="141" height="171">
+            <img src="assets/common-assets/common/search.svg" class="uk-align-center" width="141" height="171">
           </div>
         </div>
       </div>
diff --git a/utils/subscribe/subscribe.service.ts b/utils/subscribe/subscribe.service.ts
index 436c84ca..cb03e066 100644
--- a/utils/subscribe/subscribe.service.ts
+++ b/utils/subscribe/subscribe.service.ts
@@ -20,7 +20,7 @@ export class SubscribeService {
     }
   }
   public initIsSubscribedToCommunity(properties: EnvProperties, pid: string) {
-    let url = properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType +"/" + pid + "/is-subscriber/";
+    let url = properties.adminToolsAPIURL + "/community/" + pid + "/is-subscriber/";
     this.sub = this.http.get<boolean>(url, CustomOptions.getAuthOptionsWithBody()).subscribe((isSubscribed) => {
       this.isSubscribedSubject.next(isSubscribed);
     }, error => {
@@ -43,7 +43,7 @@ export class SubscribeService {
   }
 
   isSubscribedToCommunity(properties: EnvProperties, pid: string) {
-    let url = properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType +"/" + pid + "/is-subscriber/";
+    let url = properties.adminToolsAPIURL + "/community/" + pid + "/is-subscriber/";
     return this.http.get<boolean>(url, CustomOptions.getAuthOptionsWithBody())
       .pipe(map(res => {
         // if (res['status'] && res['status'] != 200) {