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

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git into Development

This commit is contained in:
George Kalampokis 2020-10-29 17:13:15 +02:00
parent 2354d9bb5c 992999a596
commit ba5c295187
25 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss
View File

@ -10,7 +10,7 @@
.align-arrow-right { .align-arrow-right {
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; // bottom: 0;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
align-self: center; align-self: center;

2
dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
View File

@ -1,4 +1,6 @@
.dataset-profile-editor { .dataset-profile-editor {
margin-top: 6.3rem;
.full-width { .full-width {
width: 100%; width: 100%;
} }

2
dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.html
View File

@ -1,4 +1,4 @@
<div class="main-content"> <div class="main-content dataset-profile-listing">
<div class="container-fluid"> <div class="container-fluid">
<h3>{{titlePrefix}} {{'DATASET-PROFILE-LISTING.TITLE' | translate}}</h3> <h3>{{titlePrefix}} {{'DATASET-PROFILE-LISTING.TITLE' | translate}}</h3>

4
dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss
View File

@ -1,3 +1,7 @@
.dataset-profile-listing {
margin-top: 6rem;
}
.mat-table { .mat-table {
margin: 24px; margin: 24px;
} }

2
dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss
View File

@ -1,4 +1,6 @@
.dmp-profile-editor { .dmp-profile-editor {
margin-top: 6.3rem;
.centered-row-item { .centered-row-item {
align-items: center; align-items: center;
display: flex; display: flex;

2
dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss
View File

@ -3,6 +3,8 @@
} }
.dmp-profile-listing { .dmp-profile-listing {
margin-top: 6.3rem;
.mat-row { .mat-row {
cursor: pointer; cursor: pointer;
} }

13
dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.html
View File

@ -1,10 +1,13 @@
<div class="main-content"> <div class="main-content">
<div class="container-fluid user-listing"> <div class="container-fluid user-listing">
<h3>{{'USERS.LISTING.TITLE' | translate}}</h3> <div class="d-flex align-items-center">
<h3>{{'USERS.LISTING.TITLE' | translate}}</h3>
<div class="d-flex mb-3"><button mat-raised-button type="button" class="export-btn ml-auto" (click)="exportUsers()"> <div class="col-auto ml-auto">
<mat-icon class="mr-2 export-icon">save_alt</mat-icon>{{'USERS.LISTING.EXPORT' | translate}} <button mat-raised-button type="button" class="export-btn" (click)="exportUsers()">
</button></div> <mat-icon class="mr-2 export-icon">save_alt</mat-icon>{{'USERS.LISTING.EXPORT' | translate}}
</button>
</div>
</div>
<app-user-criteria-component></app-user-criteria-component> <app-user-criteria-component></app-user-criteria-component>
<mat-card class="mat-card"> <mat-card class="mat-card">
<mat-table [dataSource]="dataSource" matSort> <mat-table [dataSource]="dataSource" matSort>

4
dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss
View File

@ -3,12 +3,14 @@
} }
.user-listing { .user-listing {
margin-top: 6rem;
.mat-card { .mat-card {
margin: 1em 0; margin: 1em 0;
} }
mat-row:hover { mat-row:hover {
background-color: lightgray; // background-color: lightgray;
} }
mat-row:nth-child(odd) { mat-row:nth-child(odd) {

2
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
View File

@ -109,7 +109,7 @@ input[type="text"] {
.icon-align { .icon-align {
display: inline-flex; display: inline-flex;
vertical-align: middle; vertical-align: middle;
padding-bottom: 0.4rem; /* padding-bottom: 0.4rem; */
} }
.dataset-card-actions, .dataset-card-actions,

4
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
View File

@ -387,8 +387,10 @@
height: calc(100vh - 218px); height: calc(100vh - 218px);
} }
} }
form { form {
height: calc(100vh - 124px); height: calc(100vh - 124px);
margin-top: 6rem;
} }
.stepper-actions { .stepper-actions {

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

@ -1,4 +1,4 @@
<div class="main-content pl-5 pr-5"> <div class="main-content dataset-overview pl-5 pr-5">
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="dataset"> <div *ngIf="dataset">
<a class="row mb-2 pl-1" (click)="goBack()" role="button"> <a class="row mb-2 pl-1" (click)="goBack()" role="button">

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

@ -3,6 +3,10 @@
padding: 2em; padding: 2em;
} }
.dataset-overview {
margin-top: 5rem;
}
// ********ICONS******** // ********ICONS********
.back-icon { .back-icon {

1
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss
View File

@ -10,6 +10,7 @@
form { form {
height: calc(100vh - 124px); height: calc(100vh - 124px);
margin-top: 6rem;
} }
a { a {

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

@ -1,4 +1,4 @@
<div class="main-content pl-5 pr-5"> <div class="main-content dmp-overview pl-5 pr-5">
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="dmp"> <div *ngIf="dmp">
<a class="row mb-2 pl-1" (click)="goBack()" role="button"> <a class="row mb-2 pl-1" (click)="goBack()" role="button">

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

@ -3,6 +3,10 @@
padding: 2em; padding: 2em;
} }
.dmp-overview {
margin-top: 5rem;
}
// ********ICONS******** // ********ICONS********
.back-icon { .back-icon {

6
dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.html
View File

@ -1,6 +1,6 @@
<div class="user-guide-editor"> <div class="user-guide-editor">
<form (ngSubmit)="submit()" [formGroup]="formGroup"> <form (ngSubmit)="submit()" [formGroup]="formGroup">
<div class="row"> <div>
<mat-card class="col-md-8 offset-md-2"> <mat-card class="col-md-8 offset-md-2">
<mat-card-title><div>{{'GUIDE.TITLE' | translate}}</div></mat-card-title> <mat-card-title><div>{{'GUIDE.TITLE' | translate}}</div></mat-card-title>
<mat-card-content> <mat-card-content>
@ -21,8 +21,8 @@
}" formControlName="html"></editor> }" formControlName="html"></editor>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<button mat-fab class="mat-fab-bottom-right save-btn" type="submit"> <button mat-fab class="mat-fab-bottom-right save-btn" matTooltip="{{'GUIDE.SAVE' | translate}}" type="submit">
<mat-icon class="mat-24" title="save">save</mat-icon> <mat-icon class="mat-24">save</mat-icon>
</button> </button>
</div> </div>

3
dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss
View File

@ -1,6 +1,7 @@
.user-guide-editor { .user-guide-editor {
padding-top: 5em; padding-top: 5em;
padding-bottom: 2em; padding-bottom: 2em;
margin-top: 1em;
.save-btn { .save-btn {
padding-top: inherit !important; padding-top: inherit !important;
@ -8,6 +9,6 @@
width: 56px !important; width: 56px !important;
bottom: 10px; bottom: 10px;
position: fixed; position: fixed;
right: 10px; right: 40px;
} }
} }

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

@ -240,13 +240,13 @@
} }
span.zenodoIcon { span.zenodoIcon {
background: url("../../../assets/images/argos-login/zenodo-gradient-200.png") no-repeat; background: url("../../../assets/images/argos-login/zenodo-gradient-sm.png") no-repeat;
background-position: center; background-position: center;
float: right; float: right;
transform: scale(0.35); transform: scale(0.58);
width: 200px; width: 200px;
height: 80px; height: 45px;
margin-left: -57px; margin-left: -58px;
} }
} }

7
dmp-frontend/src/assets/i18n/de.json
View File

@ -611,7 +611,7 @@
"ERROR": { "ERROR": {
"DELETED-DMP": "Der angeforderte DMP ist gelöscht", "DELETED-DMP": "Der angeforderte DMP ist gelöscht",
"FORBIDEN-DMP": "Sie sind nicht berechtigt auf diesen DMP zuzugreifen" "FORBIDEN-DMP": "Sie sind nicht berechtigt auf diesen DMP zuzugreifen"
}, },
"MULTIPLE-DIALOG": { "MULTIPLE-DIALOG": {
"ZENODO-LOGIN": "Login with Zenodo", "ZENODO-LOGIN": "Login with Zenodo",
"USE-DEFAULT": "Use Default Token" "USE-DEFAULT": "Use Default Token"
@ -1108,7 +1108,7 @@
"SOURCES": "Quellen", "SOURCES": "Quellen",
"SOURCE:": "Quelle: ", "SOURCE:": "Quelle: ",
"NO-SOURCE": "Nicht mit Quelle verknüpfen", "NO-SOURCE": "Nicht mit Quelle verknüpfen",
"OUTPUT": "Output" , "OUTPUT": "Output",
"SELECT": "Select" "SELECT": "Select"
}, },
"DMP": { "DMP": {
@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "Benutzerhandbuch", "TITLE": "Benutzerhandbuch",
"TITLE-DASHED": "-Benutzerhandbuch-", "TITLE-DASHED": "-Benutzerhandbuch-",
"CLOSE": "Schließen" "CLOSE": "Schließen",
"SAVE": "Speichern"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Datenschutzrichtlinie-", "TITLE": "-Datenschutzrichtlinie-",

3
dmp-frontend/src/assets/i18n/en.json
View File

@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "User Guide", "TITLE": "User Guide",
"TITLE-DASHED": "-User Guide-", "TITLE-DASHED": "-User Guide-",
"CLOSE": "Close" "CLOSE": "Close",
"SAVE": "Save"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Privacy Policy-", "TITLE": "-Privacy Policy-",

3
dmp-frontend/src/assets/i18n/es.json
View File

@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "Guía de usuario", "TITLE": "Guía de usuario",
"TITLE-DASHED": "-Guía de usuario-", "TITLE-DASHED": "-Guía de usuario-",
"CLOSE": "Cerrar" "CLOSE": "Cerrar",
"SAVE": "Save"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Política de privacidad-", "TITLE": "-Política de privacidad-",

3
dmp-frontend/src/assets/i18n/gr.json
View File

@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "Οδηγός Χρήστη", "TITLE": "Οδηγός Χρήστη",
"TITLE-DASHED": "-Οδηγός Χρήστη-", "TITLE-DASHED": "-Οδηγός Χρήστη-",
"CLOSE": "Κλείσιμο" "CLOSE": "Κλείσιμο",
"SAVE": "Αποθήκευση"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Πολιτική Απορρήτου-", "TITLE": "-Πολιτική Απορρήτου-",

3
dmp-frontend/src/assets/i18n/sk.json
View File

@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "Používateľská príručka", "TITLE": "Používateľská príručka",
"TITLE-DASHED": "-Používateľská príručka-", "TITLE-DASHED": "-Používateľská príručka-",
"CLOSE": "Zavrieť" "CLOSE": "Zavrieť",
"SAVE": "Uložiť"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Zásady ochrany súkromných údajov-", "TITLE": "-Zásady ochrany súkromných údajov-",

3
dmp-frontend/src/assets/i18n/tr.json
View File

@ -1280,7 +1280,8 @@
"GUIDE": { "GUIDE": {
"TITLE": "Kullanıcı Rehberi", "TITLE": "Kullanıcı Rehberi",
"TITLE-DASHED": "-Kullanıcı Rehberi-", "TITLE-DASHED": "-Kullanıcı Rehberi-",
"CLOSE": "Kapat" "CLOSE": "Kapat",
"SAVE": "Kaydet"
}, },
"PRIVACY-POLICY": { "PRIVACY-POLICY": {
"TITLE": "-Gizlilik Politikası-", "TITLE": "-Gizlilik Politikası-",

BIN
dmp-frontend/src/assets/images/argos-login/zenodo-gradient-sm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB