[Library | Trunk]: Add breadcrumbs. Fix space on check icons. Remove reset from contact us

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58534 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-04-23 15:58:04 +00:00
parent e142a4d6ab
commit 01427dbc9d
7 changed files with 45 additions and 25 deletions

View File

@ -33,11 +33,11 @@
<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">
<label class="uk-h5 uk-text-bold">
Community Name <span class="uk-text-danger uk-text-bold">*</span>
</label>
<input class="uk-input" type="text" placeholder="Your community name" formControlName="community"
<div *ngIf="contactForm.get('community')" class="uk-width-1-1 uk-margin-top">
<div class="uk-h5 uk-width-1-1 uk-text-bold uk-margin-remove-bottom">
Research Community or Infrastructure <span class="uk-text-danger uk-text-bold">*</span>
</div>
<input class="uk-input uk-width-1-2@s" 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('funder')" class="uk-width-1-2@s uk-margin-top">
@ -55,13 +55,11 @@
[class.uk-form-danger]="contactForm.get('message').invalid && contactForm.get('message').touched">
</textarea>
</div>
<div *ngIf="contactForm.get('message')" class="uk-width-1-1 uk-margin-top">
<div *ngIf="contactForm.get('message')" class="uk-width-1-2@s uk-margin-top">
<re-captcha (resolved)="handleRecaptcha($event)" [(siteKey)]="properties.reCaptchaSiteKey">
</re-captcha>
</div>
<div class="uk-width-1-1 uk-text-right">
<button class="uk-button uk-button-default uk-margin-small-right"
(click)="reset()">Reset</button>
<div class="uk-width-1-2@s uk-text-right uk-margin-medium-top">
<button class="uk-button portal-button" (click)="send()">Send</button>
</div>
</div>

View File

@ -13,7 +13,6 @@ export class ContactUsComponent implements OnInit {
@Input() formTitle: string;
@Input() properties: EnvProperties;
@Output() sendEmitter: EventEmitter<any> = new EventEmitter<any>();
@Output() resetEmitter: EventEmitter<any> = new EventEmitter<any>();
@Input() errorMessage;
constructor() {
@ -28,11 +27,6 @@ export class ContactUsComponent implements OnInit {
});
}
public reset() {
this.resetEmitter.emit();
}
public handleRecaptcha(captchaResponse: string) {
this.contactForm.get('recaptcha').setValue(captchaResponse);
}

View File

@ -0,0 +1,22 @@
import {Component, Input} from "@angular/core";
export interface Breadcrumb {
name: string;
route?: string;
}
@Component({
selector: 'breadcrumbs',
template: `
<ul class="uk-breadcrumb" [class.uk-light]="light">
<li *ngFor="let breadcrumb of breadcrumbs">
<a class="uk-text-capitalize" *ngIf="breadcrumb.route" [routerLink]="breadcrumb.route">{{breadcrumb.name}}</a>
<span class="uk-text-capitalize" *ngIf="!breadcrumb.route">{{breadcrumb.name}}</span>
</li>
</ul>`
})
export class BreadcrumbsComponent {
@Input() public light: boolean = false;
@Input() public breadcrumbs: Breadcrumb[] = [];
}

View File

@ -0,0 +1,11 @@
import {NgModule} from "@angular/core";
import {CommonModule} from "@angular/common";
import {BreadcrumbsComponent} from "./breadcrumbs.component";
import {RouterModule} from "@angular/router";
@NgModule({
imports: [CommonModule, RouterModule],
declarations: [BreadcrumbsComponent],
exports: [BreadcrumbsComponent]
})
export class BreadcrumbsModule {}

View File

@ -1,10 +1,5 @@
import { Component, Input } from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {Component, Input} from '@angular/core';
import 'rxjs';
import {HelperService} from './helper.service';
import{EnvProperties} from '../properties/env-properties';
import {ConnectHelper} from '../../connect/connectHelper';
import {SafeHtmlPipe} from '../pipes/safeHTML.pipe';
@Component({
selector: 'helper',
@ -26,6 +21,7 @@ export class HelperComponent {
@Input() style:boolean = false;
@Input() styleName:string = '';
@Input() tooltip:boolean = false;
constructor () {}
buildTooltip(): string {

View File

@ -2,8 +2,7 @@ import {Injectable} from '@angular/core';
import {HttpClient} from "@angular/common/http";
import{EnvProperties} from '../properties/env-properties';
import {EnvProperties} from '../properties/env-properties';
@Injectable()
export class HelperService {

View File

@ -1,4 +1,3 @@
//our root app component
import { Pipe, PipeTransform} from '@angular/core'
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'
@ -6,7 +5,8 @@ import { DomSanitizer, SafeUrl } from '@angular/platform-browser'
@Pipe({ name: 'safeHtml'})
export class SafeHtmlPipe implements PipeTransform {
constructor(private sanitized: DomSanitizer) {}
transform(value):SafeUrl {
return this.sanitized.bypassSecurityTrustHtml(value);
return this.sanitized.bypassSecurityTrustHtml(value.replace(/&nbsp;/g,''));
}
}