Merge remote-tracking branch 'origin/develop' into data-transfer-v2

connect/community/CustomizationOptions.ts

@@ -23,6 +23,7 @@ export class Layout {
         variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color);
         variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none');
         variables['@hero-background-position'] = options.backgrounds.form.position;
+        variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode?'dark':'light';
       }
       if (options.buttons) {
         //general
@@ -106,6 +107,7 @@ export class CustomizationOptions {
       imageUrl: string;
       imageFile: string;
       position: string;
+      fontsDarkMode:boolean;
     }
   };
   buttons: {
@@ -132,7 +134,8 @@ export class CustomizationOptions {
         color: CustomizationOptions.getRGBA(this.identity.mainColor, 0.15),
         imageUrl: null,
         imageFile: null,
-        position: null
+        position: null,
+        fontsDarkMode: true
       }
     };
     
@@ -194,6 +197,9 @@ export class CustomizationOptions {
       if (!current.backgrounds.form.position) {
         current.backgrounds.form.position = "center bottom"
       }
+      if (!current.backgrounds.form.fontsDarkMode) {
+        current.backgrounds.form.fontsDarkMode = true;
+      }
       if (!current.buttons) {
         current.buttons = Object.assign({}, updated.buttons);
       }

searchPages/searchUtils/portal-search-result.component.html

@@ -3,7 +3,7 @@
   <errorMessages [status]="[status]" [type]="'results'"></errorMessages>
   <li *ngFor="let result of results">
     <div class="uk-card uk-card-default uk-position-relative uk-flex uk-flex-column uk-flex-center"
-			[ngClass]="result.type" [class.uk-disabled]="!hasPermission(result)">
+			[ngClass]="result.type" [class.noColor]="properties.adminToolsPortalType == 'connect'" [class.uk-disabled]="!hasPermission(result)">
       <div *ngIf="type === 'community' && result.isSubscribed" [class.uk-position-top-left]="!isMobile" [class.uk-position-top-right]="isMobile" class="uk-text-background uk-text-center uk-padding-small uk-text-uppercase uk-text-bold">
         <span>Member</span>
       </div>
@@ -49,7 +49,7 @@
               </div>
             </div>
             <div *ngIf="result.description && !isMobile" class="uk-margin-top uk-text-small multi-line-ellipsis lines-3">
-              <p class="uk-text-meta" [innerHTML]="result.description"></p>
+              <p class="uk-text-meta" >{{result.description | htmlToString}}</p>
             </div>
           </div>
           <div class="uk-width-1-5@m uk-width-1-3 uk-flex-first@m">

searchPages/searchUtils/portal-search-result.component.less

@@ -11,15 +11,15 @@
 
 @media(min-width: @breakpoint-medium) {
   .uk-card {
-    &.funder {
+    &.funder:not(.noColor) {
       .setType(@funder-color);
     }
 
-    &.ri {
+    &.ri:not(.noColor) {
       .setType(@ri-color);
     }
 
-    &.organization {
+    &.organization:not(.noColor) {
       .setType(@organization-color);
     }
   }
@@ -27,15 +27,15 @@
 
 @media(max-width: @breakpoint-small-max) {
   .uk-card {
-    &.funder {
+    &.funder:not(.noColor) {
       .setType(@funder-color, bottom);
     }
 
-    &.ri {
+    &.ri:not(.noColor) {
       .setType(@ri-color, bottom);
     }
 
-    &.organization {
+    &.organization:not(.noColor) {
       .setType(@organization-color, bottom);
     }
   }

searchPages/searchUtils/portal-search-result.module.ts

@@ -11,12 +11,13 @@ import {UrlPrefixModule} from "../../utils/pipes/url-prefix.module";
 import {IconsService} from "../../utils/icons/icons.service";
 import {incognito, restricted} from "../../utils/icons/icons";
 import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module";
+import {HTMLToStringPipeModule} from "../../utils/pipes/HTMLToStringPipe.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
     RouterModule, ErrorMessagesModule,
-    AlertModalModule, ManageModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule
+    AlertModalModule, ManageModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, HTMLToStringPipeModule
   ],
   declarations: [
     PortalSearchResultComponent

utils/properties/env-properties.ts

@@ -1,5 +1,5 @@
 export type Environment = "development" | "test" | "beta" | "production";
-export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc";
+export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "client-management-portal";
 export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc";
 
 export interface EnvProperties {