Merge changes from master

landingPages/dataProvider/dataProvider.component.html

@@ -499,7 +499,7 @@
       </div>
     </div>
   </div>
-  <feedback *ngIf="dataProviderInfo" [dataProviderInfo]="dataProviderInfo"
+  <feedback *ngIf="dataProviderInfo && properties.reCaptchaSiteKey" [dataProviderInfo]="dataProviderInfo"
             [properties]="properties" [entityType]="'content provider'" [fields]="feedbackFields"
             [showForm]="showFeedback" (show)="showFeedback = $event"></feedback>
 </div>

landingPages/organization/organization.component.html

@@ -271,7 +271,7 @@
               [texts]="pageContents['bottom']"></helper>
     </div>
   </div>
-  <feedback *ngIf="organizationInfo" [organizationInfo]="organizationInfo"
+  <feedback *ngIf="organizationInfo && properties.reCaptchaSiteKey" [organizationInfo]="organizationInfo"
             [properties]="properties" [entityType]="'organization'" [fields]="feedbackFields"
             [showForm]="showFeedback" (show)="showFeedback = $event"></feedback>
 </div>

landingPages/project/project.component.html

@@ -795,7 +795,7 @@
       </modal-alert>
     </div>
   </div>
-  <feedback *ngIf="projectInfo" [projectInfo]="projectInfo"
+  <feedback *ngIf="projectInfo && properties.reCaptchaSiteKey" [projectInfo]="projectInfo"
             [properties]="properties" [entityType]="'project'" [title]="projectName" [fields]="feedbackFields"
             [showForm]="showFeedback" (show)="showFeedback = $event"></feedback>
 </div>

landingPages/result/resultLanding.component.html

@@ -658,7 +658,7 @@
 
     </div>
   </div>
-  <feedback *ngIf="resultLandingInfo" [resultLandingInfo]="resultLandingInfo"
+  <feedback *ngIf="resultLandingInfo && properties.reCaptchaSiteKey" [resultLandingInfo]="resultLandingInfo"
             [properties]="properties" [entityType]="getTypeName()" [fields]="feedbackFields"
             [showForm]="showFeedback" (show)="showFeedback = $event;"></feedback>
 </div>

searchPages/find/searchAll.component.html

@@ -1,12 +1,11 @@
 <div uk-height-viewport="offset-top: true;offset-bottom: 60" style="box-sizing: border-box;  "
        class="image-front-topbar uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed generalSearchForm">
-    <div class="uk-container">
+    <div class="uk-width-1-1">
-      <div class="uk-position-relative">
+      <div class="uk-position-relative uk-flex uk-flex-center">
 
 
-        <div class="uk-container">
+        <div  id="searchForm" class=" uk-container uk-grid uk-flex uk-flex-center uk-flex-middle">
-          <div class="uk-width-1-1">
+            <div id="searchImage"></div>
-
             <advanced-search-form
               entityType="all"
 
@@ -21,7 +20,6 @@
           </div>
 
 
-        </div>
       </div>
     </div>
   </div>

searchPages/searchUtils/newSearchPage.component.html

@@ -108,7 +108,7 @@
 </ng-template>
 <!-- TODO - Kostis Clean up -->
 <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
-     (stickyForm?'':' uk-position-relative ') :
+     (stickyForm?'':'  ') :
     (+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom  uk-padding-remove-top ' +
     ((usedBy == 'deposit' || usedBy == 'orcid') ? ' uk-padding-remove-top ' : ' '))"
      [attr.uk-sticky]="(stickyForm?'{animation:false;offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+
@@ -127,22 +127,24 @@
       </div>
       <div class="uk-position-relative">
         <div class="uk-container uk-container-large uk-section uk-section-small uk-margin-bottom" id="searchForm">
-          <advanced-search-form
+          <div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid>
-              [entityType]="entityType"
+            <div id="searchImage"></div>
-              [fieldIds]="fieldIds"
+            <advanced-search-form
-              [fieldIdsMap]="fieldIdsMap"
+                [entityType]="entityType"
-              [selectedFields]="selectedFields"
+                [fieldIds]="fieldIds"
-              (queryChange)="queryChanged($event)"
+                [fieldIdsMap]="fieldIdsMap"
-              [isDisabled]="disabled"
+                [selectedFields]="selectedFields"
-              [simpleSearchLink]="simpleSearchLink"
+                (queryChange)="queryChanged($event)"
-              [advancedSearchLink]="advancedSearchLink"
+                [isDisabled]="disabled"
-              [advancedSearchLinkParameters]
+                [simpleSearchLink]="simpleSearchLink"
-                  ="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
+                [advancedSearchLink]="advancedSearchLink"
-              [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText"
+                [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
-              [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
+                [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText"
-              [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter"
+                [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
-          >
+                [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter"
-          </advanced-search-form>
+            >
+            </advanced-search-form>
+          </div>
         </div>
       </div>
     </div>