may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Uporabniki --> Nepotrjeni - popravki ikon za urejanje

Browse Source
This commit is contained in:
tejagerjovic 2022-05-04 03:07:52 +02:00
parent 46a3d11bdd
commit c2ba33cebf
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdminSettings.php
View File

@ -9431,12 +9431,12 @@ class SurveyAdminSettings {
echo '<table id="unconfirmed_mail_user_list" class="dataTable">'; echo '<table id="unconfirmed_mail_user_list" class="dataTable">';
echo '<thead><tr>'; echo '<thead><tr>';
echo '<th>'.$lang['edit2'].'</th>';
echo '<th>'.$lang['srv_survey_list_users_name'].'</th>'; echo '<th>'.$lang['srv_survey_list_users_name'].'</th>';
echo '<th>'.$lang['srv_survey_list_users_email'].'</th>'; echo '<th>'.$lang['srv_survey_list_users_email'].'</th>';
echo '<th>'.$lang['admin_type'].'</th>'; echo '<th>'.$lang['admin_type'].'</th>';
echo '<th>'.$lang['lang'].'</th>'; echo '<th>'.$lang['lang'].'</th>';
echo '<th>'.$lang['registered'].'</th>'; echo '<th>'.$lang['registered'].'</th>';
echo '<th style="width: 90px;">'.$lang['edit2'].'</th>';
echo '</tr></thead>'; echo '</tr></thead>';
echo '</table>'; echo '</table>';
} }

6
admin/survey/classes/class.Dostop.php
View File

@ -1516,7 +1516,7 @@ class Dostop {
} }
// kopirano iz user_to_be v users // 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) { if (mysqli_num_rows($result) > 0) {
$r = mysqli_fetch_assoc($result); $r = mysqli_fetch_assoc($result);
@ -1593,13 +1593,13 @@ class Dostop {
$seznam = []; $seznam = [];
foreach ($nepotrjeni as $uporabnik) { foreach ($nepotrjeni as $uporabnik) {
$seznam[] = [ $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->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), iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email),
$this->userTypeToText($uporabnik->type), $this->userTypeToText($uporabnik->type),
$admin_languages[$uporabnik->lang], $admin_languages[$uporabnik->lang],
$uporabnik->registriran, $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>',
]; ];
} }
} }

8
public/css/admin_new.css
View File

@ -29748,11 +29748,19 @@ table.usersTable tbody td {
font-size: 14px !important; font-size: 14px !important;
} }
table.dataTable {
/*tbody td.sorting_1 {
text-align: center;
}*/
}
table.dataTable.no-footer { table.dataTable.no-footer {
border-bottom: none !important; border-bottom: none !important;
} }
table.dataTable thead th { table.dataTable thead th {
border-bottom: none !important; border-bottom: none !important;
font-weight: 600 !important;
background-color: #F8F8F8 !important;
padding: 8px 10px !important;
} }
/* datatables popravki */ /* datatables popravki */

7
resources/sass/admin_new/pages/users/users.scss
View File

@ -131,7 +131,14 @@ table.dataTable{
thead th { thead th {
border-bottom: none !important; 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 */ /* datatables popravki */