Ui fixes on landpage (static pages)
This commit is contained in:
parent
e486169ae5
commit
d878562d3d
|
@ -7,7 +7,6 @@ import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/mu
|
||||||
import { map, takeUntil } from 'rxjs/operators';
|
import { map, takeUntil } from 'rxjs/operators';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service';
|
import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service';
|
||||||
import { isNullOrUndefined } from 'util';
|
|
||||||
import { MatDialog } from '@angular/material';
|
import { MatDialog } from '@angular/material';
|
||||||
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
|
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
|
||||||
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
|
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
|
||||||
|
@ -21,8 +20,6 @@ import { Router, Params, ActivatedRoute } from '@angular/router';
|
||||||
import { RequestItem } from '@app/core/query/request-item';
|
import { RequestItem } from '@app/core/query/request-item';
|
||||||
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
|
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
|
||||||
import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model';
|
import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model';
|
||||||
import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model';
|
|
||||||
import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
|
|
||||||
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
|
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
|
||||||
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
|
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@ import { GrantTabModel } from '@app/ui/dmp/editor/grant-tab/grant-tab-model';
|
||||||
import { ProjectFormModel } from '@app/ui/dmp/editor/grant-tab/project-form-model';
|
import { ProjectFormModel } from '@app/ui/dmp/editor/grant-tab/project-form-model';
|
||||||
import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
|
import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
|
||||||
import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent';
|
import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent';
|
||||||
import { BaseComponent } from '@common/base/base.component';
|
|
||||||
import { FormService } from '@common/forms/form-service';
|
import { FormService } from '@common/forms/form-service';
|
||||||
import { FormValidationErrorsDialogComponent } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component';
|
import { FormValidationErrorsDialogComponent } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component';
|
||||||
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
|
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
|
||||||
|
@ -47,7 +46,6 @@ import { DatasetService } from '@app/core/services/dataset/dataset.service';
|
||||||
import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component';
|
import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component';
|
||||||
import { GrantEditorModel } from '@app/ui/grant/editor/grant-editor.model';
|
import { GrantEditorModel } from '@app/ui/grant/editor/grant-editor.model';
|
||||||
import { MatomoService } from '@app/core/services/matomo/matomo-service';
|
import { MatomoService } from '@app/core/services/matomo/matomo-service';
|
||||||
import { HttpClient } from '@angular/common/http';
|
|
||||||
import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
|
import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
|
||||||
import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component';
|
import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component';
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
|
||||||
setIsUserOwner() {
|
setIsUserOwner() {
|
||||||
if (this.dmp) {
|
if (this.dmp) {
|
||||||
const principal: Principal = this.authentication.current();
|
const principal: Principal = this.authentication.current();
|
||||||
if (principal) this.isUserOwner = principal.id === this.dmp.users.find(x => x.role === Role.Owner).id;
|
if (principal) this.isUserOwner = !!this.dmp.users.find(x => (x.role === Role.Owner) && (principal.id === x.id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -257,7 +257,7 @@ section.media-kit-logo {
|
||||||
|
|
||||||
.eosc{
|
.eosc{
|
||||||
margin-top: 8.5em;
|
margin-top: 8.5em;
|
||||||
margin-bottom: 5em;
|
/* margin-bottom: 5em; */
|
||||||
}
|
}
|
||||||
.eosc-row{
|
.eosc-row{
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
|
@ -271,6 +271,7 @@ section.media-kit-logo {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
margin-bottom: 4em;
|
||||||
}
|
}
|
||||||
.eosc_logo{
|
.eosc_logo{
|
||||||
height: 117px;
|
height: 117px;
|
||||||
|
|
|
@ -101,21 +101,21 @@
|
||||||
<section class="page-section eosc" id="eosc">
|
<section class="page-section eosc" id="eosc">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row align-items-center eosc-row">
|
<div class="row align-items-center eosc-row">
|
||||||
<div class="col-12 col-md-3 mb-4">
|
<div class="col-12 col-md-3 mb-4 d-flex d-md-block justify-content-center">
|
||||||
<div class="european-open-cloud">
|
<div class="european-open-cloud">
|
||||||
<img src="assets/img/eosc_logo.png" class="eosc_logo" alt="EOSC logo">
|
<img src="assets/img/eosc_logo.png" class="eosc_logo img-sharp" alt="EOSC logo">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-5">
|
<div class="col-12 col-md-5 mb-4">
|
||||||
<h2 class="eosc-header">Connect with <b>OpenAIRE & <span class="eosc-tag">EOSC</span></b></h2>
|
<h2 class="eosc-header">Connect with <b>OpenAIRE & <span class="eosc-tag">EOSC</span></b></h2>
|
||||||
<p class="eosc-desc">
|
<p class="eosc-desc">
|
||||||
Link your plan directly to underlying OpenAIRE and EOSC services,
|
Link your plan directly to underlying OpenAIRE and EOSC services,
|
||||||
soures and semantics and trace the quality of your research. Use Argos
|
sources and semantics and trace the quality of your research. Use Argos
|
||||||
templates that incorporate the fullest collections of repositories, datasets,
|
templates that incorporate the fullest collections of repositories, datasets,
|
||||||
metadata standards and other resources to choose from when completing your DMP's.
|
metadata standards and other resources to choose from when completing your DMP's.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="">
|
<a href="./about/how-it-works.html">
|
||||||
<button class="eosc-learn-more">Learn More</button>
|
<button class="eosc-learn-more">Learn More</button>
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
Loading…
Reference in New Issue