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

Removes page of view plans for particular grant and removes unnecessary horizontal scrollbar on dataset description edit

This commit is contained in:
apapachristou 2019-10-30 10:54:41 +02:00
parent bb91873194
commit d9c338a6e0
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/ui/auth/login/login.component.scss
View File

@ -199,8 +199,6 @@ span.iconmedium {
float: left; float: left;
width: 100px; width: 100px;
height: 56px; height: 56px;
// margin-left: 1em;
// margin-right: 1em;
} }
span.orcidIconMedium { span.orcidIconMedium {
@ -209,8 +207,6 @@ span.orcidIconMedium {
float: right; float: right;
width: 56px; width: 56px;
height: 56px; height: 56px;
// margin-left: 1em;
// margin-right: 1em;
} }
span.openaireIcon { span.openaireIcon {
@ -219,8 +215,6 @@ span.openaireIcon {
float: right; float: right;
width: 80px; width: 80px;
height: 56px; height: 56px;
// margin-left: 1em;
// margin-right: 1em;
} }
.b2access-button { .b2access-button {

18
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
View File

@ -91,14 +91,16 @@
{{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}} {{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}}
</div> </div>
</ng-template> </ng-template>
<div class="row toc-pane-container" #boundary> <div class="col">
<div class="col-md-8 h-100 "> <div class="row toc-pane-container" #boundary>
<app-dataset-description-form class="w-100 h-100" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll"> <div class="col-md-8 h-100 ">
</app-dataset-description-form> <app-dataset-description-form class="w-100 h-100" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll">
</div> </app-dataset-description-form>
<div #spacer></div> </div>
<div class="col-md-4"> <div #spacer></div>
<table-of-contents class="toc-pane-container" [boundary]="boundary" [spacer]="spacer" stickyThing (stepFound)="onStepFound($event)"></table-of-contents> <div class="col-md-4">
<table-of-contents class="toc-pane-container" [boundary]="boundary" [spacer]="spacer" stickyThing (stepFound)="onStepFound($event)"></table-of-contents>
</div>
</div> </div>
</div> </div>
</mat-tab> </mat-tab>

15
dmp-frontend/src/app/ui/dmp/dmp.routing.ts
View File

@ -22,13 +22,14 @@ const routes: Routes = [
breadcrumb: true breadcrumb: true
}, },
}, },
{ // Uncomment to get dmp plans for grant with grantId
path: 'grant/:grantId', // {
component: DmpListingComponent, // path: 'grant/:grantId',
data: { // component: DmpListingComponent,
breadcrumb: true // data: {
}, // breadcrumb: true
}, // },
// },
{ {
path: 'edit/:id', path: 'edit/:id',
component: DmpEditorComponent, component: DmpEditorComponent,