minor fixes

This commit is contained in:
Timo 2021-07-20 12:37:44 +03:00
parent aaa9c51bbc
commit 973c12429d
4 changed files with 19 additions and 18 deletions

View File

@ -1,9 +1,6 @@
<div *ngIf="screen === 'dossier-overview'" [class.active]="actionMenuOpen" class="action-buttons">
<ng-container *ngTemplateOutlet="actions"></ng-container>
<redaction-status-bar
*ngIf="fileStatus.isWorkable"
[config]="statusBarConfig"
></redaction-status-bar>
<redaction-status-bar *ngIf="fileStatus?.isWorkable" [config]="statusBarConfig"></redaction-status-bar>
</div>
<ng-container *ngIf="screen === 'file-preview'">
@ -11,7 +8,7 @@
</ng-container>
<ng-template #actions>
<div class="file-actions">
<div class="file-actions" *ngIf="fileStatus">
<!-- delete-->
<redaction-circle-button
(action)="openDeleteFileDialog($event)"
@ -94,11 +91,7 @@
*ngIf="permissionsService.isReadyForApproval(fileStatus)"
[disabled]="!permissionsService.canApprove(fileStatus)"
[tooltipPosition]="tooltipPosition"
[tooltip]="
permissionsService.canApprove(fileStatus)
? 'dossier-overview.approve'
: 'dossier-overview.approve-disabled'
"
[tooltip]="permissionsService.canApprove(fileStatus) ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
[type]="buttonType"
icon="red:approved"
></redaction-circle-button>

View File

@ -133,7 +133,11 @@
<redaction-empty-state [horizontalPadding]="24" [verticalPadding]="40" icon="red:document" screen="file-preview">
<ng-container *ngIf="fileData?.fileStatus?.excludedPages?.includes(activeViewerPage)">
{{ 'file-preview.tabs.annotations.page-is' | translate }}
<a (click)="actionPerformed.emit('view-exclude-pages')" translate="file-preview.excluded-from-redaction">
<a
(click)="actionPerformed.emit('view-exclude-pages')"
class="with-underline"
translate="file-preview.excluded-from-redaction"
>
</a
>.
</ng-container>

View File

@ -9,13 +9,11 @@ export class RouterHistoryService {
private _lastDossiersScreen = '/main/dossiers';
constructor(private readonly _router: Router) {
this._router.events
.pipe(filter(event => event instanceof NavigationEnd))
.subscribe((event: NavigationEnd) => {
if (event.url.startsWith('/main/dossiers')) {
this._lastDossiersScreen = event.url;
}
});
this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
if (event.url.startsWith('/main/dossiers')) {
this._lastDossiersScreen = event.url;
}
});
}
navigateToLastDossiersScreen() {

View File

@ -9,6 +9,12 @@ a {
color: lighten($primary, 10%);
}
&.with-underline {
&:hover {
text-decoration: underline;
}
}
cursor: pointer;
}