';
- echo ' |
'.$lang['srv_users_add_new'].'';
}
-
/**
* Uporabnik (administrator, manager) lahko dodajata nove uporabnike in jim dodelita dostop
*/
@@ -8509,38 +8295,76 @@ class SurveyAdminSettings {
global $admin_type;
global $lang;
global $global_user_id;
+ global $virtual_domain;
// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
if( !($admin_type == 1 || $admin_type == 0) )
return '';
+ // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov
+ if(/*$virtual_domain && */$admin_type == 1){
- echo '
'.$lang['srv_invitation_system_validateAndAdd'].'';
+ // Limit st. dodeljenih uporabnikov
+ $managed_accounts_limit = 5;
- echo '
';
@@ -962,7 +968,7 @@ class Dostop {
}
}
- //header("Location: index.php?a=diagnostics&t=uporabniki&m=my&error=" . ($error !== FALSE ? $error : ''));
+ header("Location: index.php?a=diagnostics&t=uporabniki".($error !== FALSE ? '&error='.$error : ''));
}
/**
@@ -1043,120 +1049,104 @@ class Dostop {
/**
* Seznam vseh uporabnikov znotrja 1ke
*/
- function ajax_all_users_list($my = null)
- {
+ function ajax_all_users_list(){
global $admin_languages;
global $global_user_id;
global $lang;
- global $admin_type;
+ global $admin_type;
+
$seznam = [];
$iskanjeSql = "";
if(!empty($_POST['search']['value'])){
$iskaniNiz = $_POST['search']['value'];
$iskanjeSql = " AND (u.name LIKE '%".$iskaniNiz."%' OR u.surname LIKE '%".$iskaniNiz."%' OR u.email LIKE '%".$iskaniNiz."%' OR d1.dostop_survey_count LIKE '%".$iskaniNiz."%' OR d2.dostop_survey_archive LIKE '%".$iskaniNiz."%')";
- }
-
- // Pridobimo vse uporabnike
- $sql ="SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
- " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
- " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
- " LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1) AS ue ON ue.user_id = u.id".
- " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
-
- // Filter samo po lastnih uporabnikih
- if(!empty($my)){
- // Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
- UserSetting :: getInstance()->Init($global_user_id);
- $domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
-
- $isciPoDomeni = '';
- if(!empty($domena)){
- $isciPoDomeni = " OR u.email LIKE '%".$domena."'";
}
+ // Pridobimo vse uporabnike
+ $sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
+ " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
+ " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
+ " LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1) AS ue ON ue.user_id = u.id".
+ " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
- $sql .= " AND (u.id = '".$global_user_id."' OR u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
- }
+ // Filtri, ki jih datatables pošilja in po katerih filtriramo
+ if($_POST['order'][0]['column'] < 10) {
+ $orderPolje = [
+ "u.name ".$_POST['order'][0]['dir'].", u.surname",
+ "u.email",
+ "u.type",
+ "u.lang",
+ "u.eduroam", //AAI
+ "d1.dostop_survey_count", //st_anket
+ "d2.dostop_survey_archive", //st_arhivskih
+ "u.gdpr_agree",
+ "u.when_reg",
+ "u.last_login"
+ ];
+ if($_POST['order'][0]['column'] == 7){
- // Filtri, ki jih datatables pošilja in po katerih filtriramo
- if($_POST['order'][0]['column'] < 10) {
- $orderPolje = [
- "u.name ".$_POST['order'][0]['dir'].", u.surname",
- "u.email",
- "u.type",
- "u.lang",
- "u.eduroam", //AAI
- "d1.dostop_survey_count", //st_anket
- "d2.dostop_survey_archive", //st_arhivskih
- "u.gdpr_agree",
- "u.when_reg",
- "u.last_login"
- ];
+ $vrednost='u.gdpr_agree desc';
+ if($_POST['order'][0]['dir'] == 'asc'){
+ $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
+ }
- if($_POST['order'][0]['column'] == 7){
+ $sql .= " ORDER BY ".$vrednost;
+ }
+ else {
+ $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
+ }
+ }
- $vrednost='u.gdpr_agree desc';
- if($_POST['order'][0]['dir'] == 'asc'){
- $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
- }
+ if($_POST['length'] != '-1') {
+ $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
+ }
- $sql .= " ORDER BY ".$vrednost;
- }else {
- $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
- }
- }
-
- if($_POST['length'] != '-1') {
- $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
- }
-
- $resultQuery = sisplet_query($sql);
+ $resultQuery = sisplet_query($sql);
$resultU = lazyLoadSqlObj($resultQuery);
- // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
- if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator() && !empty($my) )) {
+ // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
+ if (!empty($resultU)) {
- if (!empty($resultU->name)) {
- $vsi[] = $resultU;
- } else {
- $vsi = $resultU;
- }
+ if (!empty($resultU->name)) {
+ $vsi[] = $resultU;
+ }
+ else {
+ $vsi = $resultU;
+ }
- foreach ($vsi as $uporabnik) {
- $seznam[] = [
- 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),
- (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
- $this->userTypeToText($uporabnik->type),
- $admin_languages[$uporabnik->lang],
- (!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
- (!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
- (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
- $lang["users_gdpr".$uporabnik->gdpr_agree],
- $uporabnik->registriran,
- $uporabnik->last_login,
- '
'.
- ' |
'.
- ' |
'
- ];
+ foreach ($vsi as $uporabnik) {
+ $seznam[] = [
+ 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),
+ (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
+ $this->userTypeToText($uporabnik->type),
+ $admin_languages[$uporabnik->lang],
+ (!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
+ (!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
+ (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
+ $lang["users_gdpr".$uporabnik->gdpr_agree],
+ $uporabnik->registriran,
+ $uporabnik->last_login,
+ '
'.
+ ' |
'.
+ ' |
'
+ ];
+ }
+ }
- }
- }
+ $sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
+
+ // Število vseh zadetkov, ki jih imamo v bazi
+ $recordsTotal = 0;
+ if(!empty($sql_recordsTotal)) {
+ $recordsTotal = $sql_recordsTotal->stVseh;
+ }
- $sql_recordsTotal = sisplet_query("SELECT count(id) as stVseh FROM users WHERE email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%')", "obj");
- // Število vseh zadetkov, ki jih imamo v bazi
- $recordsTotal = 0;
- if(!empty($sql_recordsTotal) && is_null($my)) {
- $recordsTotal = $sql_recordsTotal->stVseh;
- } elseif(!is_null($my)) {
- $recordsTotal = sizeof($vsi);
- }
-
- // Število filtriranih zadetkov
- $recordFiltered = $recordsTotal;
- if(!empty($_POST['search']['value']))
- $recordFiltered = sizeof($vsi);
+ // Število filtriranih zadetkov
+ $recordFiltered = $recordsTotal;
+ if(!empty($_POST['search']['value']))
+ $recordFiltered = sizeof($vsi);
echo json_encode([
"draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
@@ -1164,7 +1154,126 @@ class Dostop {
"recordsFiltered" => $recordFiltered,
"data" => $seznam // polje z vsebino
]);
+ }
+
+ /**
+ * Seznam dodeljenih uporabnikov (manager in admin)
+ */
+ function ajax_all_users_list_my(){
+ global $admin_languages;
+ global $global_user_id;
+ global $lang;
+ global $admin_type;
+
+ $seznam = [];
+ $iskanjeSql = "";
+ if(!empty($_POST['search']['value'])){
+ $iskaniNiz = $_POST['search']['value'];
+ $iskanjeSql = " AND (u.name LIKE '%".$iskaniNiz."%' OR u.surname LIKE '%".$iskaniNiz."%' OR u.email LIKE '%".$iskaniNiz."%' OR d1.dostop_survey_count LIKE '%".$iskaniNiz."%' OR d2.dostop_survey_archive LIKE '%".$iskaniNiz."%')";
+ }
+
+ // Pridobimo vse uporabnike
+ $sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
+ " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
+ " LEFT OUTER JOIN ( SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
+ " LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1) AS ue ON ue.user_id = u.id".
+ " WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
+
+ // Filter samo po lastnih uporabnikih
+ $isciPoDomeni = '';
+
+ // Med lastne uporabnike prikažemo tudi, tiste ki so bili registrirani z isto domeno
+ /*UserSetting :: getInstance()->Init($global_user_id);
+ $domena = UserSetting :: getInstance()->getUserSetting('manage_domain');
+ if(!empty($domena)){
+ $isciPoDomeni = " OR u.email LIKE '%".$domena."'";
+ }*/
+
+ $sql .= " AND (u.id IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') ".$isciPoDomeni.")";
+
+
+ // Filtri, ki jih datatables pošilja in po katerih filtriramo
+ if($_POST['order'][0]['column'] < 10) {
+ $orderPolje = [
+ "u.name ".$_POST['order'][0]['dir'].", u.surname",
+ "u.email",
+ "u.type",
+ "u.lang",
+ "u.eduroam", //AAI
+ "d1.dostop_survey_count", //st_anket
+ "d2.dostop_survey_archive", //st_arhivskih
+ "u.gdpr_agree",
+ "u.when_reg",
+ "u.last_login"
+ ];
+
+ if($_POST['order'][0]['column'] == 7){
+
+ $vrednost='u.gdpr_agree desc';
+ if($_POST['order'][0]['dir'] == 'asc'){
+ $vrednost= ' FIELD (u.gdpr_agree, 0, \'-1\', 1)';
+ }
+
+ $sql .= " ORDER BY ".$vrednost;
+ }
+ else {
+ $sql .= " ORDER BY ".$orderPolje[$_POST['order'][0]['column']]." ".$_POST['order'][0]['dir'];
+ }
+ }
+
+ if($_POST['length'] != '-1') {
+ $sql .= " LIMIT ".$_POST['start'].", ".$_POST['length'];
+ }
+
+ $resultQuery = sisplet_query($sql);
+ $resultU = lazyLoadSqlObj($resultQuery);
+
+ // Seznam uporabnikov vrne za administratorje vse za ostale pa samo tiste, ki smo jih dodali k uporabniku.
+ if (!empty($resultU) && ($this->jeAdministrator() || !$this->jeAdministrator())) {
+
+ if (!empty($resultU->name)) {
+ $vsi[] = $resultU;
+ }
+ else {
+ $vsi = $resultU;
+ }
+
+ foreach ($vsi as $uporabnik) {
+ $seznam[] = [
+ 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),
+ (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding( $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding( $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
+ $this->userTypeToText($uporabnik->type),
+ $admin_languages[$uporabnik->lang],
+ (!empty($uporabnik->aai) ? $this->vrniDaNe($uporabnik->aai) : $lang['no1']),
+ (!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
+ (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
+ $lang["users_gdpr".$uporabnik->gdpr_agree],
+ $uporabnik->registriran,
+ $uporabnik->last_login,
+ '
'.
+ ' |
'.
+ ' |
'
+ ];
+
+ }
+ }
+
+ // Število vseh zadetkov, ki jih imamo v bazi
+ $recordsTotal = 0;
+ $recordsTotal = sizeof($vsi);
+
+ // Število filtriranih zadetkov
+ $recordFiltered = $recordsTotal;
+ if(!empty($_POST['search']['value']))
+ $recordFiltered = sizeof($vsi);
+
+ echo json_encode([
+ "draw" => (!empty($_POST['draw']) ? $_POST['draw'] : 1),
+ "recordsTotal" => $recordsTotal,
+ "recordsFiltered" => $recordFiltered,
+ "data" => $seznam // polje z vsebino
+ ]);
}
/**
@@ -1238,7 +1347,8 @@ class Dostop {
$type = $lang['admin_manager'];
break;
case 2:
- $type = $lang['admin_clan'];
+ case 3:
+ $type = $lang['admin_narocnik'];
break;
}
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 8f775d879..8606d6c78 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -239,14 +239,26 @@ class SurveyList {
echo '
';
if ($_GET['a']=='diagnostics') {
- if ($_GET['t'] == 'uporabniki') {
- if ($admin_type == 0) {
+
+ if ($_GET['t'] == 'uporabniki') {
+
+ // Admini imajo pregled nad vsemi zavihki uporabnikov
+ if ($admin_type == 0) {
echo '
';
+ }
+
+ // Menegerji imajo samo osnovni pregled svojih uporabnikov
+ if ($admin_type == 1) {
-
+ echo '
';
}
-
- } else {
+ }
+ else {
+
if ($admin_type == 0) {
echo '
';
#zavihek ankete
@@ -701,7 +726,7 @@ class SurveyList {
# ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete
echo '-
';
echo '- ';
- echo '';
+ echo '';
echo '
'. $lang['hour_users'] . '
';
echo '';
echo ' ';
diff --git a/admin/survey/index.php b/admin/survey/index.php
index 2a581d5a2..6c6076de3 100644
--- a/admin/survey/index.php
+++ b/admin/survey/index.php
@@ -113,7 +113,7 @@
if(isset($_GET['a']) && ($_GET['a'] == 'hierarhija_superadmin' || $_GET['a'] == 'hierarhija')){
echo '';
}
- elseif($_GET['a'] == 'narocila' || ($_GET['t'] == 'uporabniki' && in_array($_GET['m'], ['all', 'my', 'izbrisani', 'nepotrjeni', 'odjavljeni']))){
+ elseif($_GET['a'] == 'narocila' || $_GET['t'] == 'uporabniki'){
echo '';
}
else{
diff --git a/admin/survey/script/dostop.js b/admin/survey/script/dostop.js
index 9c3378152..de6712a70 100644
--- a/admin/survey/script/dostop.js
+++ b/admin/survey/script/dostop.js
@@ -293,41 +293,6 @@ $(document).ready(function () {
deferRender: true,
select: true,
buttons: [
- {
- extend: 'copy',
- exportOptions: {
- columns: ':visible'
- }
- },
- {
- extend: 'print',
- exportOptions: {
- columns: ':visible'
- }
- },
- {
- extend: 'csv',
- bom: true,
- exportOptions: {
- columns: ':visible'
- }
- },
- {
- extend: 'excel',
- bom: true,
- exportOptions: {
- columns: ':visible'
- }
- },
- {
- extend: 'pdf',
- orientation: 'landscape',
- pageSize: 'LEGAL',
- exportOptions: {
- columns: ':visible'
- }
- },
- 'colvis'
],
language: {
"url": siteUrl+"admin/survey/script/datatables/Slovenian.json"
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index c8440ed43..b79a1f5a8 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4229,10 +4229,6 @@ function add_to_library(anketa,where) {
$.post('ajax.php?a=add_to_library', {anketa:anketa, where:where});
}
-function refresh_user_diagnostic(field, type, show, limit) {
- $('#survey_list').load('ajax.php?a=refreshUserDiagnostic', {field:field, type:type, show:show, limit:limit});
-}
-
function create_archive_survey(anketa, msg) {
$('#fade').fadeTo('slow', 1);
$('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'});
diff --git a/lang/1.php b/lang/1.php
index 9d0ad0907..b60aae69b 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -174,7 +174,7 @@ $lang = array (
"logged_in_as" => "Prijavljeni ste kot",
"administrator" => "Administrator",
"manager" => "Manager",
- "user" => "član",
+ "user" => "Uporabnik",
"add_hor_link" => "Dodaj vodoravno povezavo",
"send" => "Pošlji",
"add_link" => "Dodaj povezavo",
@@ -715,11 +715,12 @@ $lang = array (
"n_list" => "Spisek prejemnikov",
"n_desc_list" => " Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite
oziroma popravite prejemnike.
Spisek prejemnikov
",
"n_list_users" => "Uporabniki",
- "n_users_list_all" => "Seznam vseh",
- "n_deleted_users" => "Izbrisani",
- "n_unsigned_users" => "Odjavljeni",
- "n_unconfirmed_users" => "Nepotrjeni",
- "n_n_users" => "Obvestiti uporabnike",
+ "n_users_list" => "Pregled",
+ "n_users_list_all" => "Vsi",
+ "n_deleted_users" => "Izbrisani",
+ "n_unsigned_users" => "Odjavljeni",
+ "n_unconfirmed_users" => "Nepotrjeni",
+ "n_n_users" => "Obvestiti uporabnike",
"n_no_users" => "Nihč ne bo prejel obvestila.",
"n_maa" => "Managerji in administratorji",
"n_no_admin" => "Noben manager ne bo prejel obvestila.",
@@ -5607,7 +5608,9 @@ $lang = array (
"srv_manager_add_user4" => 'Uporabnik bo obveščen na e-mail',
"srv_manager_rem_user2" => 'Odstranite uporabnika iz svojega pregleda',
"srv_manager_manager" => 'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
- "srv_library_left" => 'Standardna vprašanja lahko dodajate v anketo',
+ "create" => 'Ustvari',
+ "create_add" => 'Ustvari in dodaj',
+ "srv_library_left" => 'Standardna vprašanja lahko dodajate v anketo',
"srv_library_left_right" => 'Moja vprašanja, ki jih lahko dodajate v knjižnico in iz knjižnice v anketo',
"srv_language_settings" => 'Jezikovne nastavitve',
"srv_add_new_language" => 'Dodaj nov jezik',
@@ -6217,8 +6220,11 @@ $lang = array (
'srv_test_sett_txt' => 'Uredniške nastavitve testiranja in komentarjev',
'srv_users_viewing' => 'aktivnih urednikov',
'srv_users_viewing2' => 'Trenutno aktivni uredniki',
- 'srv_users_add_new' => 'Dodaj novega uporabnika',
- "srv_users_add_new_title" => 'Dodajte novega uporabnika v sistem
Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.',
+ 'srv_users_add_new' => 'Nov uporabnik',
+ "srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu
Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.',
+ 'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',
+ "srv_users_add_assigned_title" => 'Ustvarite novega uporabnika nad katerim boste imeli pregled
Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.',
+ "srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled',
'srv_uredniske_nastavitve' => 'Uredniške nastavitve',
'srv_q_inicialke' => 'Respondenti naj vnesejo tudi svoje inicialke',
'srv_q_inicialke_alert' => 'Opozorilo za inicialke',
diff --git a/lang/2.php b/lang/2.php
index 28484da09..0e961f0f9 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -703,12 +703,13 @@ $lang = array (
"n_n_users" => "Notify users",
"n_desc_list" => " You requested listing of recipients. Check it
and confirm or change the receivers.
List of email recipients
",
"n_list_users" => "Users",
- "n_users_list_all" => "All users",
- "n_deleted_users" => "Deleted users",
- "n_unsigned_users" => "Unsigned users",
- "n_unconfirmed_users" => "Unconfirmed users",
- "n_no_users" => "No one will receive the notification.",
- "n_maa" => "Managers and administrators",
+ "n_users_list" => "Overview",
+ "n_users_list_all" => "All users",
+ "n_deleted_users" => "Deleted users",
+ "n_unsigned_users" => "Unsigned users",
+ "n_unconfirmed_users" => "Unconfirmed users",
+ "n_no_users" => "No one will receive the notification.",
+ "n_maa" => "Managers and administrators",
"n_no_admin" => "None of the administrators / managers will receive the notification.",
"n_sent_admins" => "
Notification has been sent to administrators' emails.
",
"n_sent_now" => "
Notification has been sent to all active users.
",
@@ -5501,7 +5502,9 @@ $lang = array (
"srv_manager_add_user3" => 'Add existing user (you can add users with email %s)',
"srv_manager_add_user4" => 'User will be notified with an e-mail',
"srv_manager_rem_user2" => 'Remove user',
- "srv_manager_manager" => 'Users with managing view of your surveys',
+ "srv_manager_manager" => 'Users with managing view of your surveys',
+ "create" => 'Create',
+ "create_add" => 'Create and add',
"srv_library_left" => '',
"srv_library_left_right" => '',
"srv_language_settings" => 'Language settings',
@@ -6107,7 +6110,10 @@ $lang = array (
'srv_users_viewing' => 'active editors',
'srv_users_viewing2' => 'Currently active editors',
'srv_users_add_new' => 'Add new user',
- "srv_users_add_new_title" => 'Add new user to the sistem
User will be notified with an e-mail about this registration.',
+ "srv_users_add_new_title" => 'Create new user in the system
User will be notified about this registration with an e-mail.',
+ 'srv_users_add_assigned' => 'Add assigned users',
+ "srv_users_add_assigned_title" => 'Create new user you will have overview on
User will be notified about this registration with an e-mail.',
+ "srv_users_assigned_title" => 'Your assigned users',
'srv_uredniske_nastavitve' => 'Editor settings',
'srv_q_inicialke' => 'Respondents should enter their initials',
'srv_enter_inicialke' => 'Please enter your initials',
diff --git a/public/css/admin.css b/public/css/admin.css
index 4d3e0536a..956a600a6 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -12578,6 +12578,16 @@ ul #surveyList {
.users_list_box {
min-height: 250px !important;
}
+.users_list_box .add_user {
+ display: flex;
+ align-items: flex-start;
+}
+.users_list_box .add_user fieldset {
+ width: 500px;
+}
+.users_list_box .add_user fieldset.new_user {
+ margin: 40px 40px 0 0;
+}
#survey_list_inner {
padding: 10px;
@@ -17044,7 +17054,7 @@ form.manager_add_user label {
}
.dataTables_length {
- padding: 5px 0;
+ padding: 5px 0 15px 0;
}
button.dt-button {
diff --git a/resources/sass/admin/main_page/survey_list.scss b/resources/sass/admin/main_page/survey_list.scss
index 47917f945..de9fd661f 100644
--- a/resources/sass/admin/main_page/survey_list.scss
+++ b/resources/sass/admin/main_page/survey_list.scss
@@ -123,8 +123,24 @@ ul {
.survey_list_box {
min-height: 250px !important;
}
+
+// Seznami uporabnikov
.users_list_box {
- min-height: 250px !important;
+ min-height: 250px !important;
+
+
+ .add_user {
+ display: flex;
+ align-items: flex-start;
+
+ fieldset{
+ width: 500px;
+
+ &.new_user{
+ margin: 40px 40px 0 0;
+ }
+ }
+ }
}
#survey_list_inner {
diff --git a/resources/sass/admin/users.scss b/resources/sass/admin/users.scss
index a3b4c578f..05df956e3 100644
--- a/resources/sass/admin/users.scss
+++ b/resources/sass/admin/users.scss
@@ -68,7 +68,7 @@ form.manager_add_user {
margin-bottom: 10px;
}
.dataTables_length {
- padding: 5px 0;
+ padding: 5px 0 15px 0;
}
button.dt-button {
cursor: pointer;