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

This commit is contained in:
Konstantina Galouni 2023-06-13 16:12:56 +03:00
commit a0b4ccff23
5 changed files with 18 additions and 11 deletions

View File

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

View File

@ -3,7 +3,7 @@
<errorMessages [status]="[status]" [type]="'results'"></errorMessages> <errorMessages [status]="[status]" [type]="'results'"></errorMessages>
<li *ngFor="let result of results"> <li *ngFor="let result of results">
<div class="uk-card uk-card-default uk-position-relative uk-flex uk-flex-column uk-flex-center" <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"> <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> <span>Member</span>
</div> </div>
@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<div *ngIf="result.description && !isMobile" class="uk-margin-top uk-text-small multi-line-ellipsis lines-3"> <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> </div>
<div class="uk-width-1-5@m uk-width-1-3 uk-flex-first@m"> <div class="uk-width-1-5@m uk-width-1-3 uk-flex-first@m">

View File

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

View File

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

View File

@ -1,5 +1,5 @@
export type Environment = "development" | "test" | "beta" | "production"; 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 type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc";
export interface EnvProperties { export interface EnvProperties {