Merge branch 'dev' into CSCEXAM-1150

CSCfi · Sep 26, 2024 · 2c73e37 · 2c73e37
2 parents d67a177 + f72b85e
commit 2c73e37
Showing 1 changed file with 21 additions and 24 deletions.
diff --git a/ui/src/app/examination/navigation/examination-toolbar.component.html b/ui/src/app/examination/navigation/examination-toolbar.component.html
@@ -33,14 +33,34 @@
         <div class="row mt-3 ms-2">
             <div class="col-12">
                 <button
-                    class="btn btn-success"
+                    class="btn btn-success me-2 mb-2"
                     [ngClass]="!activeSection ? '' : 'notactive'"
                     (click)="selectGuidePage()"
                     (keydown.enter)="selectGuidePage()"
                 >
                     {{ 'i18n_exam_guide' | translate }}
                     <i class="bi bi-info-square ps-2"></i>
                 </button>
+                <!-- ROOM INSTRUCTIONS -->
+                <button
+                    class="btn btn-success me-2 mb-2"
+                    ngbPopover="{{ displayRoomInstructions() }}"
+                    popoverTitle="{{ 'i18n_instructions' | translate }}"
+                    [hidden]="!room"
+                >
+                    {{ 'i18n_room_guidance' | translate }}
+                    <i class="bi bi-info-square ps-2"></i>
+                </button>
+                <!-- MATURITY INSTRUCTIONS -->
+                <button
+                    class="btn btn-success"
+                    (click)="showMaturityInstructions()"
+                    [hidden]="exam.executionType.type !== 'MATURITY'"
+                >
+                    {{ 'i18n_maturity_instructions' | translate }}
+                    <i class="bi bi-info-square ps-2"></i>
+                </button>
+
                 <a
                     class="skip"
                     id="skip-button-instructions"
@@ -97,29 +117,6 @@
                 </div>
             </div>
         }
-
-        <div class="row mt-3 ms-2" [hidden]="!room">
-            <div class="col-12">
-                @if (exam.examType.type !== 'MATURITY') {
-                    <!-- ROOM INSTRUCTIONS -->
-                    <button
-                        class="btn btn-success"
-                        ngbPopover="{{ displayRoomInstructions() }}"
-                        popoverTitle="{{ 'i18n_instructions' | translate }}"
-                    >
-                        {{ 'i18n_room_guidance' | translate }}
-                        <i class="bi bi-info-square ps-2"></i>
-                    </button>
-                } @else {
-                    <!-- MATURITY INSTRUCTIONS -->
-                    <button class="btn btn-success" (click)="showMaturityInstructions()">
-                        {{ 'i18n_maturity_instructions' | translate }}
-                        <i class="bi bi-info-square ps-2"></i>
-                    </button>
-                }
-            </div>
-        </div>
-
         <!-- EXIT PREVIEW -->
         <div class="row mt-3 ms-2" [hidden]="!isPreview">
             <div class="col-md-12">