MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Trunk|Library]: 1. Fix modal close button. 2. chance community search result view 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55223 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-04-08 12:43:04 +00:00
parent afc1cca4fa
commit b5998286a5
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
searchPages/searchUtils/communitySearchResults.component.html
View File

@ -2,7 +2,7 @@
<errorMessages [status]="[status]" [type]="'results'"></errorMessages>
<li *ngFor="let result of results" class="uk-animation-fade uk-margin-auto" uk-grid>
<a class="uk-width-1-5 uk-height-small uk-card uk-card-default uk-card-body" (click)="confirmModalOpen(result.community)">
<a class="uk-width-1-5 uk-height-small uk-card uk-card-default uk-card-body uk-margin-auto-top" (click)="confirmModalOpen(result.community)">
<div *ngIf="result.isSubscribed" class="uk-card-badge portal-card-badge uk-width-1-2 uk-position-top-left uk-text-small uk-text-center">Subscribed</div>
<img *ngIf= "result.community.logoUrl != null && result.community.logoUrl != '' " class="uk-padding uk-position-center" src="{{result.community.logoUrl}}" alt="{{(result.community.title)?result.community.title:result.community.shortTitle}} logo" >
<span *ngIf= "result.community.logoUrl == null || result.community.logoUrl == '' " class="uk-icon uk-padding uk-position-center">
@ -10,25 +10,27 @@
</span>
</a>
<div class="uk-width-expand">
<h5 [title] = result.community.shortTitle>
<div [title] = result.community.shortTitle class="uk-text-large">
<a (click)="confirmModalOpen(result.community)">
{{(result.community.title)?result.community.title:result.community.shortTitle}}
</a>
</h5>
<span *ngIf="result.community.type && result.community.type != ''" class="uk-label label-community" title="Type"> {{(result.community.type == 'ri')? 'research initiative': 'research community'}}</span>
<span *ngIf="result.community.status == 'manager'" class="uk-label label-community" title="Status">Private View</span>
</div>
<div *ngIf="result.community.description">
<div class="text-justify descriptionText">
{{result.community.description}}
</div>
</div>
<br>
<div *ngIf="result.community.date">
<span><b> Creation Date: </b></span>
<span>{{result.community.date | date:'dd-MM-yyyy'}}</span>
<div class="uk-padding-small uk-padding-remove-left uk-grid">
<div class="uk-width-1-2">
<span *ngIf="result.community.date"><b> Creation Date: </b></span>
<span *ngIf="result.community.date">{{result.community.date | date:'dd-MM-yyyy'}}</span>
</div>
<div class="uk-width-1-2 uk-text-right">
<span *ngIf="result.community.type && result.community.type != ''" ><b> Type: </b></span>
<span *ngIf="result.community.type && result.community.type != ''" >{{(result.community.type == 'ri')? 'Research Initiative': 'Research Community'}}</span>
</div>
</div>
<br>
<manage [communityId]="result.community.communityId"></manage>
<manage *ngIf="result.isManager" [communityId]="result.community.communityId"></manage>
</div>
</li>
</ul>

10
utils/modal/alert.ts
View File

@ -6,7 +6,7 @@ import {Component, ViewEncapsulation, ElementRef, EventEmitter, Output} from '@a
<div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'" uk-modal [open]="!isOpen" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="uk-modal-dialog uk-modal-body" role="">
<div class="uk-modal-title" [hidden]=!alertHeader>
<a href="" class="uk-modal-close uk-close uk-float-right" (click)='cancel()' ></a>
<button class="uk-modal-close-full uk-float-right" (click)='cancel()' uk-close></button>
<h4 class="modal-title text-center" id="myModalLabel">{{alertTitle}}</h4>
</div>
<div class="uk-margin ">
@ -15,7 +15,7 @@ import {Component, ViewEncapsulation, ElementRef, EventEmitter, Output} from '@a
</div>
<ng-content></ng-content>
</div>
<div *ngIf="okButtonLeft" class=" uk-text-right" [hidden]=!alertFooter>
<div *ngIf="okButtonLeft" class="uk-text-right" [hidden]=!alertFooter>
<span [hidden]=!okButton >
<button class=" uk-button uk-button-default " (click)="ok()">{{okButtonText}}</button>
</span>
@ -23,12 +23,12 @@ import {Component, ViewEncapsulation, ElementRef, EventEmitter, Output} from '@a
<button class=" uk-button uk-button-default" (click)="cancel()">{{cancelButtonText}}</button>
</span>
</div>
<div *ngIf="!okButtonLeft" class=" uk-text-right" [hidden]=!alertFooter>
<div *ngIf="!okButtonLeft" class="uk-text-right" [hidden]=!alertFooter>
<span [hidden]=!cancelButton>
<button class=" uk-button uk-button-default" (click)="cancel()">{{cancelButtonText}}</button>
<button class="uk-button uk-button-default" (click)="cancel()">{{cancelButtonText}}</button>
</span>
<span [hidden]=!okButton >
<button class=" uk-button uk-button-default " (click)="ok()">{{okButtonText}}</button>
<button class="uk-button uk-button-default" (click)="ok()">{{okButtonText}}</button>
</span>
</div>