MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Adds dashes on overview pages if fields are empty

This commit is contained in:
apapachristou 2020-09-10 18:36:46 +03:00
parent 0f126ec413
commit c0d3b471c0
7 changed files with 127 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
View File

@ -37,7 +37,8 @@
</div>
<span *ngIf="lockStatus" class="ml-2 mr-2">.</span>
<div class="d-flex mr-2">{{'GENERAL.STATUSES.EDIT' | translate}} :
{{dataset.modified | date:"longDate"}}
<!-- {{dataset.modified | date:'longDate':'+0200': this.language.store.currentLang }} -->
{{dataset.modified | date:'longDate'}}
</div>
<div class="d-flex ml-2 mr-4">
<div *ngIf="dataset.status" class="d-flex flex-row uppercase">
@ -47,19 +48,13 @@
</div>
</div>
<div class="row mb-4 pb-3">
<button *ngIf="isAuthenticated()" (click)="openDmpSearchDialogue()" mat-mini-fab
class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}"
matTooltipPosition="above">
<button *ngIf="isAuthenticated()" (click)="openDmpSearchDialogue()" mat-mini-fab class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
<mat-icon class="mat-mini-fab-icon">content_copy</mat-icon>
</button>
<button *ngIf="isDraftDataset(dataset) && !lockStatus"
(click)="editClicked(dataset)" mat-mini-fab class="mr-3 actions-btn"
matTooltip="{{'DMP-LISTING.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
<button *ngIf="isDraftDataset(dataset) && !lockStatus" (click)="editClicked(dataset)" mat-mini-fab class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
<mat-icon class="mat-mini-fab-icon">create</mat-icon>
</button>
<button *ngIf="isUserDatasetRelated() && !lockStatus" (click)="deleteClicked()" mat-mini-fab
class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.DELETE' | translate}}"
matTooltipPosition="above">
<button *ngIf="isUserDatasetRelated() && !lockStatus" (click)="deleteClicked()" mat-mini-fab class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.DELETE' | translate}}" matTooltipPosition="above">
<mat-icon class="mat-mini-fab-icon">delete</mat-icon>
</button>
</div>
@ -75,22 +70,26 @@
<div class="row header">{{'DMP-OVERVIEW.GRANT' | translate}}</div>
<div class="row dataset-label">{{ dataset.grant.label }}</div>
<div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div>
<div class="row">
<div *ngFor="let researcher of researchers; let last = last">
<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank"
class="researcher">
<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
<div class="id-btn">&nbsp;</div>
<div *ngIf="!last">{{ researcher.name }}, </div>
<div *ngIf="last">{{ researcher.name }}</div>
</a>
</div>
<span *ngIf="!researchers || researchers.length === 0" class="material-icons">horizontal_rule</span>
</div>
<div class="row header">{{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}</div>
<div class="row" *ngIf="dataset.description">
<p class="desc-txt">{{ dataset.description }}</p>
</div>
<div class="row" *ngIf="!dataset.description">
<span class="material-icons">horizontal_rule</span>
</div>
</div>
<div class="col-md-4 col-lg-4 p-0">
<div class="frame mb-3 pt-4 pl-3 pr-5 pb-1">
@ -162,13 +161,10 @@
<p class="authors-role">{{ roleDisplay(user) }}</p>
</div>
</div>
<button *ngIf="isUserOwner && !dataset.status && user.role"
(click)="removeUserFromDmp(user)"
class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button>
<button *ngIf="isUserOwner && !dataset.status && user.role" (click)="removeUserFromDmp(user)" class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button>
</div>
</div>
<div *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmp.id, dataset.dmp.label)"
class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
<div *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmp.id, dataset.dmp.label)" class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
<button mat-raised-button class="invite-btn">
<mat-icon>group_add</mat-icon>
{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}

2
dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
View File

@ -69,7 +69,7 @@
.dmp-btn,
.dmp-btn > mat-icon {
color: #ffffff;
opacity: 0.8;
// opacity: 0.8;
}
.show-more-btn {

7
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
View File

@ -72,11 +72,15 @@
<div *ngIf="last">{{ researcher.name }}</div>
</a>
</div>
<span *ngIf="!dmp.researchers || dmp.researchers.length === 0" class="material-icons">horizontal_rule</span>
</div>
<div class="row header">{{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}</div>
<div class="row" *ngIf="dmp.description">
<p class="desc-txt">{{ dmp.description }}</p>
</div>
<div class="row" *ngIf="!dmp.description">
<span class="material-icons">horizontal_rule</span>
</div>
<div class="row header">{{'DMP-OVERVIEW.DATASETS-USED' | translate}}</div>
<div class="d-flex flex-column">
<div *ngFor="let dataset of dmp.datasets">
@ -89,6 +93,9 @@
</button>
</a>
</div>
<div class="row" *ngIf="!dmp.datasets || dmp.datasets.length === 0">
<span class="material-icons">horizontal_rule</span>
</div>
</div>
<div class="row mt-2 add-dataset-txt">
<a class="add-dataset-btn" *ngIf="isDraftDmp(dmp)" [routerLink]="['/new/dataset/' + dmp.id]" target="_blank">

7
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
View File

@ -45,7 +45,7 @@
border-radius: 4px;
justify-content: space-between;
color: #212121;
opacity: 0.8;
// opacity: 0.8;
}
.show-more-btn {
@ -123,7 +123,6 @@
border-radius: 4px;
font-size: 0.875em;
color: #ffffff;
opacity: 0.8;
}
.label-txt {
@ -178,6 +177,10 @@
margin-right: 1em;
overflow: hidden;
text-overflow: ellipsis;
letter-spacing: 0px;
color: #212121;
opacity: 0.8;
font-style: normal;
}
.doi-label {

7
dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss
View File

@ -21,7 +21,6 @@
margin-right: 30px;
margin-left: 20px;
}
}
.progress-bar {
@ -31,7 +30,6 @@
width: 100%;
z-index: 4;
}
}
.two-line-mat-option {
// height: 3.5em;
@ -39,5 +37,8 @@
}
.buttonNav:hover {
color: aliceblue;
}
}
.login-label {
text-transform: uppercase;
}

2
dmp-frontend/src/app/ui/navbar/navbar.component.html
View File

@ -7,7 +7,7 @@
<div class="icon-bar2"></div>
<div class="icon-bar3"></div>
</div>
<a class="logo"><img src="../../../assets/splash/assets/img/argos-logo-2.svg"></a>
<a class="logo" [routerLink]="['home']"><img src="../../../assets/splash/assets/img/argos-logo-2.svg"></a>
<button class="navbar-toggler ml-auto" type="button" [matMenuTriggerFor]="toggleMenu" (mouseenter)="openMyMenu()">
<mat-icon class="toggle-icon">view_headline</mat-icon>
</button>

8
dmp-frontend/src/app/ui/navbar/navbar.component.scss
View File

@ -106,14 +106,18 @@ $mat-card-header-size: 40px !default;
}
.list {
list-style-type:none;
list-style-type: none;
padding-left: 0px;
}
.list >li {
.list > li {
padding: 5px;
}
.avatar {
cursor: pointer;
}
.login-label {
text-transform: uppercase;
}