From d9f2acad56bc42a05ae9c0b4fd25827fb6cea374 Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Thu, 26 May 2022 22:07:42 +0200
Subject: Ispravljen bug sa OK dugmetom (kod ucitanog dataseta)

---
 .../src/app/_elements/folder/folder.component.css  |  9 ++++--
 .../src/app/_elements/folder/folder.component.html | 35 +++++++++++-----------
 .../notifications/notifications.component.html     |  2 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index fe21e7b1..dd984918 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -184,14 +184,19 @@
 
 .file-bottom-buttons {
     position: relative;
-    position: relative;
-    top: -36px
+    display: flex;
+    flex-direction: row-reverse;
+    height: 0;
+
 }
 
+
 .file-bottom-buttons-helper {
     position: relative;
     display: flex;
     flex-direction: row-reverse;
+    width: fit-content;
+    height: 45px;
 }
 
 .file-button {
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index bf0bad10..eed0eb1e 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -72,10 +72,10 @@
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
                             <button *ngIf="selectedTab==TabType.MyDatasets" class="btn-clear file-button" (click)="downloadFile(file,$event)" style="display: inline-block;">
-                                <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
+                                <mat-icon matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon>
                             </button>
                             <button class="btn-clear file-button" (click)="deleteFile(file, $event)" style="display: inline-block;">
-                                <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
+                                <mat-icon matTooltip="Obriši" matTooltipPosition="above">delete</mat-icon>
                             </button>
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
@@ -114,6 +114,21 @@
             </div>
         </div>
     </div>
+    <div [ngSwitch]="newFileSelected" *ngIf="!listView">
+        <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+            <div class="file-bottom-buttons-helper">
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+                    <mat-icon matTooltip="Obriši" matTooltipPosition="above">delete</mat-icon>
+                </button>
+                <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
+                    <mat-icon matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon>
+                </button>
+            </div>
+            <!-- <button class="btn-clear file-button">
+                <mat-icon>zoom_out_map</mat-icon>
+            </button> -->
+        </div>
+    </div>
     <div id="footer" [ngSwitch]="newFileSelected" *ngIf="!listView">
         <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" [disabled]="saveDisabled" *ngSwitchCase="true">
             <div  class="f-row">
@@ -149,20 +164,6 @@
             </button>
         </ng-container>
     </div>
-    <div [ngSwitch]="newFileSelected" *ngIf="!listView">
-        <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
-            <div class="file-bottom-buttons-helper">
-                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
-                <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
-            </button>
-                <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
-                <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
-            </button>
-            </div>
-            <!-- <button class="btn-clear file-button">
-                <mat-icon>zoom_out_map</mat-icon>
-            </button> -->
-        </div>
-    </div>
+    
 
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/notifications/notifications.component.html b/frontend/src/app/_elements/notifications/notifications.component.html
index 3b2f4eaa..d3218a96 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.html
+++ b/frontend/src/app/_elements/notifications/notifications.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="notifications && notifications.length > 0" class="position-fixed card card-body p-1 m-3" style="bottom: 0; right: 0; width: 18rem;">
+<div *ngIf="notifications && notifications.length > 0" class="position-fixed card card-body p-1 m-3" style="bottom: 0; right: 0; width: 18rem; z-index: 5000;">
     <h2 class="m-auto" (click)="closed = !closed;" data-bs-toggle="collapse" href="#collapseNotifs" role="button" aria-expanded="true" aria-controls="collapseNotifs">
         Notifikacije
         <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-- 
cgit v1.2.3