From c2ba33cebf98aff0a78f0332213f5c2954a239ff Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 4 May 2022 03:07:52 +0200
Subject: [PATCH] [Redizajn 1KA] - Uporabniki --> Nepotrjeni - popravki ikon za
 urejanje

---
 admin/survey/SurveyAdminSettings.php            | 2 +-
 admin/survey/classes/class.Dostop.php           | 6 +++---
 public/css/admin_new.css                        | 8 ++++++++
 resources/sass/admin_new/pages/users/users.scss | 7 +++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 549a2b5c0..afac005a4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -9431,12 +9431,12 @@ class SurveyAdminSettings {
 
 	    echo '<table id="unconfirmed_mail_user_list" class="dataTable">';
 	    echo '<thead><tr>';
+	    echo '<th>'.$lang['edit2'].'</th>';
 	    echo '<th>'.$lang['srv_survey_list_users_name'].'</th>';
 	    echo '<th>'.$lang['srv_survey_list_users_email'].'</th>';
 	    echo '<th>'.$lang['admin_type'].'</th>';
 	    echo '<th>'.$lang['lang'].'</th>';
 	    echo '<th>'.$lang['registered'].'</th>';
-	    echo '<th style="width: 90px;">'.$lang['edit2'].'</th>';
 	    echo '</tr></thead>';
 	    echo '</table>';
     }
diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php
index bc639064d..1fab9fd8d 100644
--- a/admin/survey/classes/class.Dostop.php
+++ b/admin/survey/classes/class.Dostop.php
@@ -1516,7 +1516,7 @@ class Dostop {
 		}
 
 		// kopirano iz user_to_be v users
-		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM users_to_be WHERE id='" . $uid . "'");
+		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM  WHERE id='" . $uid . "'");
 
 		if (mysqli_num_rows($result) > 0) {
 			$r = mysqli_fetch_assoc($result);
@@ -1593,13 +1593,13 @@ class Dostop {
 			$seznam = [];
 			foreach ($nepotrjeni as $uporabnik) {
 				$seznam[] = [
+					'<span onclick="potrdiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="' . $lang['confirm_user_in_db'] . '" class="faicon fa-check pointer blue"></span> | ' .
+					'<span onclick="izbrisiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="'.$lang['delete_user_in_db'].'" class="faicon fa-times pointer blue"></span>',
 					iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
 					iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email),
 					$this->userTypeToText($uporabnik->type),
 					$admin_languages[$uporabnik->lang],
 					$uporabnik->registriran,
-					'<a href="#" onclick="potrdiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="' . $lang['confirm_user_in_db'] . '"><i class="fa fa-check link-sv-moder"></i> <span class="no-print"> | </span>' .
-					'<a href="#" onclick="izbrisiNepotrjenegaUporabnika(' . $uporabnik->id . ')" title="'.$lang['delete_user_in_db'].'"><i class="fa fa-times link-sv-moder"></a>',
 				];
 			}
 		}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 74ecef20c..3327ae4d2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -29748,11 +29748,19 @@ table.usersTable tbody td {
   font-size: 14px !important;
 }
 
+table.dataTable {
+  /*tbody td.sorting_1 {
+      text-align: center;
+  }*/
+}
 table.dataTable.no-footer {
   border-bottom: none !important;
 }
 table.dataTable thead th {
   border-bottom: none !important;
+  font-weight: 600 !important;
+  background-color: #F8F8F8 !important;
+  padding: 8px 10px !important;
 }
 
 /* datatables popravki */
diff --git a/resources/sass/admin_new/pages/users/users.scss b/resources/sass/admin_new/pages/users/users.scss
index 109ffdd9f..d4a4dc54c 100644
--- a/resources/sass/admin_new/pages/users/users.scss
+++ b/resources/sass/admin_new/pages/users/users.scss
@@ -131,7 +131,14 @@ table.dataTable{
 
     thead th {
         border-bottom: none !important;
+        font-weight: $semi-bold !important;
+        background-color: $light-gray !important;
+        padding: 8px 10px !important;
     }
+
+    /*tbody td.sorting_1 {
+        text-align: center;
+    }*/
 }
 
 /* datatables popravki */