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

[Redizajn 1KA v2] - Uporabniki --> Dodaj uporabnika - v delu

Browse Source 
Page + menu setup (vključno z mobilnimi)
This commit is contained in:
tejagerjovic 2022-08-26 03:07:24 +02:00
parent b1bbd635c6
commit 02845c5af4
6 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/SurveyAdmin.php
View File

@ -3553,6 +3553,9 @@ class SurveyAdmin
elseif($_GET['m'] == 'all'){
$sas->allUsersList();
}
elseif($_GET['m'] == 'add'){
$sas->dodeljeniUporabniki();
}
else {
$sas->assignedUsersList();
}

16
admin/survey/SurveyAdminSettings.php
View File

@ -9093,6 +9093,9 @@ class SurveyAdminSettings {
global $lang;
global $global_user_id;
// Dodajanje uporabnikov
echo '<div class="add_user">';
// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
if( !($admin_type == 1 || $admin_type == 0) )
return '';
@ -9219,6 +9222,9 @@ class SurveyAdminSettings {
echo '</div>';
echo '</div>';
echo '</div>'; //.add_user
}
/**
@ -9272,16 +9278,6 @@ class SurveyAdminSettings {
$sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
$rowU = mysqli_fetch_array($sqlU);
// Dodajanje uporabnikov
echo '<div class="add_user">';
// Manager ali admin lahko doda novega uporabnika pod pregled
$this->dodeljeniUporabniki();
echo '</div>';
// PREGLED NAD UPORABNIKI - TABELA
echo '<div class="my_users_list_holder">';

14
admin/survey/classes/class.SurveyList.php
View File

@ -247,11 +247,17 @@ class SurveyList {
if ($admin_type == 0) {
echo '<ul class="secondNavigation">';
#zavihek osnovni pregled uporabnikov
#zavihek moji uporabniki
echo '<li class="'.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';
#zavihek dodajanje uporabnikov
echo '<li class="'.($_GET['m'] == 'add' ? 'active' : '').'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=add" title="'.$lang['n_users_list_add'].'">';
echo $lang['n_users_list_add'].'</a>';
echo '</li>';
#zavihek seznam vseh uporabnikov
echo '<li class="'.($_GET['m'] == 'all' ? 'active' : '').'">';
@ -291,9 +297,9 @@ class SurveyList {
echo '<ul class="secondNavigation">';
#zavihek osnovni pregled uporabnikov
#zavihek moji uporabniki
echo '<li class="active">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';

10
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -368,6 +368,11 @@ class MobileSurveyAdmin{
'url' => 'index.php?a=diagnostics&t=uporabniki',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m'])? 'active' : '')
),
array(
'title' => $lang['n_users_list_add'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
),
array(
'title' => $lang['n_users_list_all'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=all',
@ -410,6 +415,11 @@ class MobileSurveyAdmin{
'url' => 'index.php?a=diagnostics&t=uporabniki',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m']) ? 'active' : '')
),
array(
'title' => $lang['n_users_list_add'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
)
);
}

3
lang/1.php
View File

@ -726,7 +726,8 @@ $lang = array (
"n_list" => "Spisek prejemnikov",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oziroma popravite prejemnike.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Spisek prejemnikov</b></i><br><br>",
"n_list_users" => "Uporabniki",
"n_users_list" => "Pregled",
"n_users_list" => "Moji uporabniki",
"n_users_list_add" => "Dodajanje uporabnikov",
"n_users_list_all" => "Vsi",
"n_deleted_users" => "Izbrisani",
"n_unsigned_users" => "Odjavljeni",

3
lang/2.php
View File

@ -715,7 +715,8 @@ $lang = array (
"n_n_users" => "Notify users",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>You requested listing of recipients. Check it<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and confirm or change the receivers.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>List of email recipients</b></i><br><br>",
"n_list_users" => "Users",
"n_users_list" => "Overview",
"n_users_list" => "My users",
"n_users_list_add" => "Add users",
"n_users_list_all" => "All users",
"n_deleted_users" => "Deleted users",
"n_unsigned_users" => "Unsigned users",