diff --git a/lang/en.json b/lang/en.json index be8eb17dcba8da7524089bb32bcbdf958fbb276f..9a499c43aa60d11c36ca5c5b240508e1738c3b91 100755 --- a/lang/en.json +++ b/lang/en.json @@ -416,6 +416,9 @@ "since": "Since", "until": "Until", "resource": "Resource", - "manage_historyAdmin": "Administer history" + "manage_historyAdmin": "Administer history", + "manage_historyDesc": "Consult the various events of the application", + "loadingValidation": "Validation of the current document ...", + "workflowTemplateAdded": "Workflow template added" } } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index 9dc381e60134299937bbc7c1d7a339b244258d77..7e8953029cfd83cda19c258bb81163c9454e62a0 100755 --- a/lang/fr.json +++ b/lang/fr.json @@ -416,6 +416,7 @@ "resource": "Ressource", "manage_historyAdmin": "Consulter l'historique", "manage_historyDesc": "Consulter les différents événements de l'application", - "loadingValidation": "Validation du document en cours ..." + "loadingValidation": "Validation du document en cours ...", + "workflowTemplateAdded": "Modèle de circuit ajouté" } } diff --git a/src/frontend/app/document/document.component.html b/src/frontend/app/document/document.component.html index 85a1d2a891e0f27b56671950c443b307677354d2..d689a1a8fc7dc4053d6544ab8a18597109784847 100755 --- a/src/frontend/app/document/document.component.html +++ b/src/frontend/app/document/document.component.html @@ -112,8 +112,8 @@ {{docList[currentDoc].title}} </div> <div class="page-info-page" (click)="openSelect($event)">{{'lang.page' | translate}} {{ pageNum }} / {{ totalPages }}</div> - <ion-select interface="popover" [interfaceOptions]="{cssClass : this.totalPages > 10 ? 'popover-class' : 'custom-popover-class'}" style="max-height: 100%;" #pagesList (ionChange)='goTo($event.target.value)' hidden="true"> - <ion-select-option *ngFor="let page of pagesArray(this.totalPages);let i=index" [value]="page" [disabled]="i+1 === pageNum">{{ i + 1 }}</ion-select-option> + <ion-select interface="popover" [(ngModel)]="pageNum" [interfaceOptions]="{cssClass : this.totalPages > 10 ? 'popover-class' : 'custom-popover-class'}" style="max-height: 100%;" #pagesList (ionChange)='goTo($event.target.value)' hidden="true"> + <ion-select-option *ngFor="let page of pagesArray(this.totalPages);let i=index" [value]="i+1" [disabled]="i+1 === pageNum">{{ i + 1 }}</ion-select-option> </ion-select> </section> <ion-item *ngIf="mainDocument.isCertified" lines="none" class="certified"> diff --git a/src/frontend/app/document/document.component.ts b/src/frontend/app/document/document.component.ts index a4d8928f86e14430475a6f94f39fc7a637cdd4f4..704c0249a4636256ceecd374a548b0e83f7ab0eb 100755 --- a/src/frontend/app/document/document.component.ts +++ b/src/frontend/app/document/document.component.ts @@ -518,13 +518,6 @@ export class DocumentComponent implements OnInit { } prevPage() { - this.loadingController.create({ - message: this.translate.instant('lang.loadingDocument'), - spinner: 'dots' - }).then((load: HTMLIonLoadingElement) => { - this.load = load; - this.load.present(); - }); this.loadingImage = true; this.pageNum--; @@ -541,13 +534,6 @@ export class DocumentComponent implements OnInit { } nextPage() { - this.loadingController.create({ - message: this.translate.instant('lang.loadingDocument'), - spinner: 'dots' - }).then((load: HTMLIonLoadingElement) => { - this.load = load; - this.load.present(); - }); this.loadingImage = true; if (this.pageNum >= this.totalPages) { this.pageNum = this.totalPages; @@ -579,6 +565,7 @@ export class DocumentComponent implements OnInit { } // this.exportAsImage(); this.renderImage(); + this.load.dismiss(); } pagesArray(n: number): number[] { @@ -820,7 +807,7 @@ export class DocumentComponent implements OnInit { openSelect(event: any) { if (this.totalPages > 1) { - this.pagesList.interface = 'popover'; + this.pagesList.interface = 'popover'; this.pagesList.open(event); } }