MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

[Connect]: Community page: Add select of material. Align View More and View All on center. Communities Page: Remove height match from card body and make browse all and view all text-small. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56833 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-08-02 08:20:54 +00:00
parent 1e77abbc78
commit 4b5eaa40cf
5 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/communities/browseCommunity/browse-community.component.html
View File

@ -41,7 +41,7 @@
</div> </div>
</a> </a>
</div> </div>
<div class="uk-card-body uk-padding-remove-horizontal uk-padding-remove-top uk-margin-small-top community"> <div class="uk-card-body uk-padding-small uk-padding-remove-horizontal uk-padding-remove-top uk-margin-small-top uk-margin-bottom">
<div class="uk-text-center uk-text-bold " [ngClass]="(showDescription)?'uk-margin-bottom':''"> <div class="uk-text-center uk-text-bold " [ngClass]="(showDescription)?'uk-margin-bottom':''">
<a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank"> <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank">
<span *ngIf="community.title"> <span *ngIf="community.title">
@ -71,7 +71,7 @@
</div> </div>
</div> </div>
<div> <div>
<div class="uk-text-right"> <div class="uk-position-small uk-position-bottom-right">
<a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank" class="portal-link uk-text-uppercase uk-text-bold"> <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank" class="portal-link uk-text-uppercase uk-text-bold">
Visit Visit
</a> </a>

6
src/app/communities/communities.component.html
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div *ngIf="managerOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top"> <div *ngIf="managerOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top">
<a [queryParams]="{role: quote('manager')}" class="portal-link uk-text-uppercase uk-text-bold" <a [queryParams]="{role: quote('manager')}" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
routerLinkActive="router-link-active" routerLink="/search/find/communities"> routerLinkActive="router-link-active" routerLink="/search/find/communities">
<div>View all ({{managerOfCommunities.length | number}}) ></div> <div>View all ({{managerOfCommunities.length | number}}) ></div>
</a> </a>
@ -55,7 +55,7 @@
</div> </div>
</div> </div>
<div *ngIf="subscriberOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top"> <div *ngIf="subscriberOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top">
<a [queryParams]="{status: quote('subscribed')}" class="portal-link uk-text-uppercase uk-text-bold" <a [queryParams]="{status: quote('subscribed')}" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
routerLinkActive="router-link-active" routerLink="/search/find/communities"> routerLinkActive="router-link-active" routerLink="/search/find/communities">
<div>View all ({{subscriberOfCommunities.length | number}}) ></div> <div>View all ({{subscriberOfCommunities.length | number}}) ></div>
</a> </a>
@ -275,7 +275,7 @@
</div> </div>
<div class="uk-text-right uk-margin-top"> <div class="uk-text-right uk-margin-top">
<a *ngIf="researchCommunities.length > 5" class="portal-link uk-text-uppercase uk-text-bold" <a *ngIf="researchCommunities.length > 5" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
routerLinkActive="router-link-active" routerLink="/search/find/communities"> routerLinkActive="router-link-active" routerLink="/search/find/communities">
Browse All > Browse All >
</a> </a>

84
src/app/community/community.component.html
View File

@ -16,18 +16,19 @@
</div> </div>
<div *ngIf="community.description != null" class="uk-margin "> <div *ngIf="community.description != null" class="uk-margin ">
<div *ngIf="!showAllDescription" class=""> <div *ngIf="!showAllDescription" class="">
{{community.description.substring(0,300)}}{{community.description.length>300?'...':''}}</div> {{community.description.substring(0, 300)}}{{community.description.length > 300 ? '...' : ''}}</div>
<div *ngIf="showAllDescription" class=""> {{community.description}}</div> <div *ngIf="showAllDescription" class=""> {{community.description}}</div>
<span *ngIf="!showAllDescription && community.description.length > 300 " class="uk-animation-fade"> <div *ngIf="!showAllDescription && community.description.length > 300 "
<a (click)="showAllDescription = !showAllDescription;"> class="uk-animation-fade uk-text-center uk-text-bold">
view all <a (click)="showAllDescription = !showAllDescription;">View More
</a> </a>
</span> </div>
<span *ngIf="showAllDescription"> <div *ngIf="showAllDescription"
<a (click)="showAllDescription = !showAllDescription;"> class="uk-text-center uk-text-bold">
view less <a (click)="showAllDescription = !showAllDescription;">
</a> View Less
</span> </a>
</div>
</div> </div>
</div> </div>
<div class="uk-width-3-5@m uk-width-1-1@s"> <div class="uk-width-3-5@m uk-width-1-1@s">
@ -152,16 +153,18 @@
</span> </span>
</span> </span>
<br> <br>
<span *ngIf="!showAllSubjects && community.subjects.length > 4 "> <div *ngIf="!showAllSubjects && community.subjects.length > 4 "
class="uk-animation-fade uk-text-center uk-text-bold">
<a (click)="showAllSubjects = !showAllSubjects;"> <a (click)="showAllSubjects = !showAllSubjects;">
view all View All
</a> </a>
</span> </div>
<span *ngIf="showAllSubjects"> <div *ngIf="showAllSubjects"
class="uk-text-center uk-text-bold">
<a (click)="showAllSubjects = !showAllSubjects;"> <a (click)="showAllSubjects = !showAllSubjects;">
view less View Less
</a> </a>
</span> </div>
</div> </div>
</div> </div>
</div> </div>
@ -191,12 +194,12 @@
!statisticsDisplay.entities[entity].numbers.map['total'][showIn] && !statisticsDisplay.entities[entity].numbers.map['project'][showIn] && !statisticsDisplay.entities[entity].numbers.map['total'][showIn] && !statisticsDisplay.entities[entity].numbers.map['project'][showIn] &&
!statisticsDisplay.entities[entity].numbers.map['open'][showIn] && !statisticsDisplay.entities[entity].numbers.map['closed'][showIn] && !statisticsDisplay.entities[entity].numbers.map['open'][showIn] && !statisticsDisplay.entities[entity].numbers.map['closed'][showIn] &&
!statisticsDisplay.entities[entity].numbers.map['embargo'][showIn] && !statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]" !statisticsDisplay.entities[entity].numbers.map['embargo'][showIn] && !statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]"
class="uk-alert uk-alert-primary"> class="uk-alert uk-alert-primary">
No graphs available No graphs available
</div> </div>
<div *ngIf="statisticsSum && statisticsDisplay && <div *ngIf="statisticsSum && statisticsDisplay &&
statisticsSum[entity].total>0" statisticsSum[entity].total>0"
class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-2@s" > class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-2@s">
<div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="uk-padding-remove"> <div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="uk-padding-remove">
<div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small"> <div class="uk-card portal-card uk-text-right uk-margin-left uk-margin-bottom uk-padding-small">
<div <div
@ -311,27 +314,34 @@
</ng-template> </ng-template>
<div class="uk-text-center"> <div class="uk-text-center">
<!-- <button [class]="'uk-button '+((show == 'overview')?'uk-disabled ':' uk-button-default ')" <!-- <button [class]="'uk-button '+((show == 'overview')?'uk-disabled ':' uk-button-default ')"
(click)="show='overview'">Overview (click)="show='overview'">Overview
</button> </button>
{{" "}} {{" "}}
<button [class]="'uk-button '+((show != 'overview')?'uk-disabled ':' uk-button-default ')" <button [class]="'uk-button '+((show != 'overview')?'uk-disabled ':' uk-button-default ')"
(click)="show='analysis';">Graph Analysis (click)="show='analysis';">Graph Analysis
</button>--> </button>-->
<select [(ngModel)]="show" class="uk-select uk-text-bold uk-width-small"> <mat-form-field>
<option value="overview" >Overview</option> <mat-label>Select View</mat-label>
<option value="analysis" >Graph Analysis</option> <mat-select [(value)]="show">
</select> <mat-option value="overview">Overview</mat-option>
<!-- <select [(ngModel)]="sortBy" class="uk-select uk-margin-small-bottom uk-width-1-2 uk-padding-remove" name="select_order" >--> <mat-option value="analysis">Graph Analysis</mat-option>
<!-- <option value="num" >Sort by results number</option>--> </mat-select>
<!-- <option value="name" >Sort by name</option>--> </mat-form-field>
<!-- </select>--> <!--<select [(ngModel)]="show" class="uk-select uk-text-bold uk-width-small">
<option value="overview">Overview</option>
<option value="analysis">Graph Analysis</option>
</select>-->
<!-- <select [(ngModel)]="sortBy" class="uk-select uk-margin-small-bottom uk-width-1-2 uk-padding-remove" name="select_order" >-->
<!-- <option value="num" >Sort by results number</option>-->
<!-- <option value="name" >Sort by name</option>-->
<!-- </select>-->
</div> </div>
<div class="uk-margin-top customTabs"> <div class="uk-margin-top customTabs">
<ul class=" uk-margin-remove uk-flex-center" <ul class="uk-margin-remove uk-flex-center"
data-uk-tab="{connect: '#resultTabs'"> data-uk-tab="{connect: '#resultTabs'">
<li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a <li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a
href="#">publications</a></li> href="#">publications</a></li>
@ -383,7 +393,7 @@
[properties]="properties" [properties]="properties"
class=""></results-comp> class=""></results-comp>
</div> </div>
<div *ngIf="show!='overview' && activeTab == 'dataset'" > <div *ngIf="show!='overview' && activeTab == 'dataset'">
<ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName: <ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName:
'research data' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay, 'research data' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
allowedEntities: statistics.allowedEntitiesMode['showInMonitor'], allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],

3
src/app/community/community.module.ts
View File

@ -24,13 +24,14 @@ import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/se
import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module"; import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module";
import {CuratorsModule} from "../curators/curators.module"; import {CuratorsModule} from "../curators/curators.module";
import {AffiliationsModule} from "../affiliations/affiliations.module"; import {AffiliationsModule} from "../affiliations/affiliations.module";
import {MatSelectModule} from "@angular/material";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, RouterModule, CommonModule, FormsModule, RouterModule,
SubscribeModule, StatisticsModule, ManageModule, InviteModule, SubscribeModule, StatisticsModule, ManageModule, InviteModule,
SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule,
SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, MatSelectModule
], ],
declarations: [ declarations: [

2
src/assets/env-properties.json
View File

@ -47,7 +47,7 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools", "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsCommunity" :"connect", "adminToolsCommunity" :"connect",
"datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/", "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",