[Trunk | Connect]:
1. affiliations.component & curators.component: In affiliations website_url, call method 'StringUtils.urlPrefix()' (add "//" prefix, when url does not start with protocol (http, https, //)). 2. community.component.html: [Bug fix] Add checks (<div *ngIf="communityInfo && community" class="publicationsSearchForm ">). git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58632 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
8ff482028e
commit
27e978736a
|
@ -35,7 +35,7 @@
|
|||
|
||||
<div *ngFor="let affiliation of affiliations;">
|
||||
<div class="uk-card communityCard">
|
||||
<a *ngIf="affiliation.website_url" target="_blank" [href]="affiliation.website_url" class="affiliation-content">
|
||||
<a *ngIf="affiliation.website_url" target="_blank" [href]="urlPrefix(affiliation.website_url) + affiliation.website_url" class="affiliation-content">
|
||||
<ng-container *ngTemplateOutlet="card; context: { organization: affiliation, fullView: true}"></ng-container>
|
||||
</a>
|
||||
<span *ngIf="!affiliation.website_url" class="affiliation-content">
|
||||
|
@ -60,7 +60,7 @@
|
|||
[class]="'affiliation-element uk-width-1-'+(affiliations.length >= affiliationsInSlider ? affiliationsInSlider : affiliations.length)">
|
||||
<div class="affiliation uk-flex uk-flex-middle uk-flex-center uk-padding-small"
|
||||
[attr.uk-tooltip]="(affiliation.name) ? affiliation.name : 'cls: uk-invisible'">
|
||||
<a *ngIf="affiliation.website_url" target="_blank" [href]="affiliation.website_url"
|
||||
<a *ngIf="affiliation.website_url" target="_blank" [href]="urlPrefix(affiliation.website_url) + affiliation.website_url"
|
||||
class="affiliation-content">
|
||||
<ng-container
|
||||
*ngTemplateOutlet="card; context: { organization: affiliation, fullView: false}"></ng-container>
|
||||
|
|
|
@ -8,6 +8,7 @@ import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
|
|||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {PiwikHelper} from "../utils/piwikHelper";
|
||||
import {StringUtils} from '../openaireLibrary/utils/string-utils.class';
|
||||
|
||||
@Component({
|
||||
selector: 'affiliations',
|
||||
|
@ -83,6 +84,10 @@ export class AffiliationsComponent {
|
|||
}
|
||||
}
|
||||
|
||||
public urlPrefix(url: string): string {
|
||||
return StringUtils.urlPrefix(url);
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
|
|
|
@ -185,7 +185,7 @@
|
|||
|
||||
</ng-template>
|
||||
|
||||
<div class="publicationsSearchForm ">
|
||||
<div *ngIf="communityInfo && community" class="publicationsSearchForm ">
|
||||
<div class="uk-container uk-container-large">
|
||||
<div class="uk-margin-large-top">
|
||||
<div *ngIf="community.title" class="uk-h2 uk-margin-remove">
|
||||
|
|
|
@ -65,7 +65,8 @@
|
|||
<span *ngIf="!affiliation.website_url">
|
||||
<img [src]="affiliation.logo_url" [alt]="affiliation.name">
|
||||
</span>
|
||||
<a *ngIf="affiliation.website_url" [href]="affiliation.website_url">
|
||||
<a *ngIf="affiliation.website_url"
|
||||
target="_blank" [href]="urlPrefix(affiliation.website_url) + affiliation.website_url">
|
||||
<img [src]="affiliation.logo_url" [alt]="affiliation.name">
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
@ -12,6 +12,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
|||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {PiwikHelper} from "../utils/piwikHelper";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||
|
||||
@Component({
|
||||
selector: 'curators',
|
||||
|
@ -132,6 +133,10 @@ export class CuratorsComponent {
|
|||
}
|
||||
}
|
||||
|
||||
public urlPrefix(url: string): string {
|
||||
return StringUtils.urlPrefix(url);
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
|
|
Loading…
Reference in New Issue