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

Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2020-10-27 18:08:35 +02:00
parent 4c60b2bb06 7792bed7f6
commit 35fe6a75fe
5 changed files with 74 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,8 +170,8 @@
<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> </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" class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
<button mat-raised-button class="invite-btn"> <button mat-raised-button class="invite-btn" (click)="openShareDialog(dataset.dmp.id, dataset.dmp.label)">
<mat-icon>group_add</mat-icon> <mat-icon>group_add</mat-icon>
{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} {{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}
</button> </button>

8
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
View File

@ -6,7 +6,7 @@
<div class="row m-0"> <div class="row m-0">
<h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1> <h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1>
</div> </div>
<div mat-dialog-content class="row content pb-2"> <div mat-dialog-content class="row content">
<mat-form-field class="col pt-0 pb-2 mb-4 search" appearance="standard"> <mat-form-field class="col pt-0 pb-2 mb-4 search" appearance="standard">
<app-multiple-auto-complete [formControl]="formGroup.get('users')" <app-multiple-auto-complete [formControl]="formGroup.get('users')"
placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}" placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}"
@ -17,15 +17,15 @@
<mat-icon class="align-self-center mr-1">info_outlined</mat-icon> <mat-icon class="align-self-center mr-1">info_outlined</mat-icon>
{{'GENERAL.INVITATION-DIALOG.HINT' | translate}} {{'GENERAL.INVITATION-DIALOG.HINT' | translate}}
</p> </p>
<div class="col-12 d-flex justify-content-end align-items-center row m-0"> <div class="col-12 d-flex justify-content-end align-items-center row m-0 pt-1 pb-1">
<mat-form-field class="select-role"> <mat-form-field class="select-role">
<mat-select [formControl]="formGroup.get('role')"> <mat-select [formControl]="formGroup.get('role')">
<mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option> <mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option>
<mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option> <mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button mat-raised-button *ngIf="hasValue()" (click)="send()" type="button" class="invite-btn">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button> <button mat-raised-button *ngIf="hasValue()" (click)="send()" type="button" class="invite-btn mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
<button mat-raised-button *ngIf="!hasValue()" type="button" class="invite-btn-disabled">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button> <button mat-raised-button *ngIf="!hasValue()" type="button" class="invite-btn-disabled mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
</div> </div>
</div> </div>
</form> </form>

27
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
View File

@ -1,7 +1,7 @@
.form-container { .form-container {
width: 33em; width: 33em;
min-height: 14em; min-height: 14em;
padding: 0.28em 0.34em 0.875em 1.125em; padding: 0.28em 0.34em 0em 1.125em;
} }
.close-icon { .close-icon {
@ -23,14 +23,16 @@
} }
.mat-form-field { .mat-form-field {
background: #FAFAFA; background: #fafafa;
border: 1px solid #D1D1D1; border: 1px solid #d1d1d1;
border-radius: 4px; border-radius: 4px;
} }
.hint { .hint {
font-size: 0.875rem; font-size: 0.875rem;
font-weight: 500; font-weight: 500;
color: #212121;
opacity: 0.81;
} }
::ng-deep .mat-dialog-container { ::ng-deep .mat-dialog-container {
@ -62,7 +64,7 @@
font-size: 14px; font-size: 14px;
color: #848484; color: #848484;
height: min-content; height: min-content;
margin-right: 2.5rem; margin-right: 2rem;
border: none; border: none;
background-color: transparent; background-color: transparent;
} }
@ -74,10 +76,14 @@
border: none !important; border: none !important;
} }
.mat-select-arrow-wrapper { .mat-select-arrow-wrapper {
transform: none; transform: none !important;
} }
} }
::ng-deep .select-role .mat-form-field-wrapper {
padding-bottom: 0 !important;
}
.invite-btn { .invite-btn {
background: #ffffff 0% 0% no-repeat padding-box; background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #129d99; border: 1px solid #129d99;
@ -92,12 +98,17 @@
.invite-btn-disabled { .invite-btn-disabled {
width: 6.64em; width: 6.64em;
height: 2.93em; height: 2.93em;
background: #FFFFFF; background: #ffffff;
border: 1px solid #B5B5B5; border: 1px solid #b5b5b5;
border-radius: 30px; border-radius: 30px;
font-weight: bold; font-weight: bold;
letter-spacing: -0.35px; letter-spacing: -0.35px;
color: #B5B5B5; color: #b5b5b5;
margin-bottom: 0.25em; margin-bottom: 0.25em;
cursor: default; cursor: default;
} }
.invite-btn:hover {
background: #129d99;
color: #ffffff;
}

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

@ -204,8 +204,7 @@
</button> </button>
<div> <div>
<p class="authors-label">{{ user.name }} <p class="authors-label">{{ user.name }}
<span *ngIf="isUserAuthor(user.id)"> <span *ngIf="isUserAuthor(user.id)">({{ 'DMP-OVERVIEW.YOU' | translate }})</span>
({{ 'DMP-OVERVIEW.YOU' | translate }})</span>
</p> </p>
<p class="authors-role">{{ roleDisplay(user) }}</p> <p class="authors-role">{{ roleDisplay(user) }}</p>
</div> </div>
@ -213,8 +212,8 @@
<button *ngIf="isUserOwner && !dmp.status && user.role" (click)="removeUserFromDmp(user)" class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button> <button *ngIf="isUserOwner && !dmp.status && user.role" (click)="removeUserFromDmp(user)" class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button>
</div> </div>
</div> </div>
<div *ngIf="isUserOwner" (click)="openShareDialog(dmp.id,dmp.label)" class="row mt-3 mb-3 d-flex align-items-center justify-content-center"> <div *ngIf="isUserOwner" class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
<button mat-raised-button class="invite-btn"> <button mat-raised-button class="invite-btn" (click)="openShareDialog(dmp.id,dmp.label)">
<mat-icon>group_add</mat-icon> <mat-icon>group_add</mat-icon>
{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}} {{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}
</button> </button>

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

@ -314,7 +314,7 @@
margin-bottom: 0.2rem; margin-bottom: 0.2rem;
} }
::ng-deep mat-select .mat-select-arrow-wrapper { ::ng-deep .versions-select mat-select .mat-select-arrow-wrapper {
vertical-align: bottom; vertical-align: bottom;
} }