From 1c4d19198f245c33430b3599deeb266b0875c98a Mon Sep 17 00:00:00 2001 From: jonaswinkler <jonas.winkler@jpwinkler.de> Date: Sat, 12 Dec 2020 22:56:44 +0100 Subject: [PATCH] a couple adjustments for the document viewer. --- .../document-detail/document-detail.component.html | 6 +++--- .../document-detail/document-detail.component.scss | 2 -- .../components/document-detail/document-detail.component.ts | 4 ++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 6f1aacdf5..f9f6e57ef 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -35,7 +35,7 @@ <div class="row"> - <div class="col-md-6 col-xl-4 mb-4"> + <div class="col mb-4"> <form [formGroup]='documentForm' (ngSubmit)="save()"> @@ -172,8 +172,8 @@ </div> <div class="col-md-6 col-xl-8 mb-3"> - <div class="pdf-viewer-container"> - <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="false"></pdf-viewer> + <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'"> + <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true"></pdf-viewer> </div> </div> </div> diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss index b4d720018..998653bab 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.scss +++ b/src-ui/src/app/components/document-detail/document-detail.component.scss @@ -2,7 +2,5 @@ height: calc(100vh - 160px); top: 70px; position: sticky; - padding: 10px; background-color: gray; - overflow-y: scroll; } diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 329077693..c80a8b1ce 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -59,6 +59,10 @@ export class DocumentDetailComponent implements OnInit { private documentListViewService: DocumentListViewService, private titleService: Title) { } + getContentType() { + return this.metadata?.has_archive_version ? 'application/pdf' : this.metadata?.original_mime_type + } + ngOnInit(): void { this.documentForm.valueChanges.subscribe(wow => { Object.assign(this.document, this.documentForm.value)