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

[Redizajn 1KA] - Uporabniki --> Moji uporabniki -v1

Browse Source
This commit is contained in:
tejagerjovic 2022-04-28 23:41:35 +02:00
parent 67ca1504b5
commit df8de19225
8 changed files with 179 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
admin/survey/SurveyAdminSettings.php
View File

@ -9123,6 +9123,8 @@ class SurveyAdminSettings {
if( !($admin_type == 1 || $admin_type == 0) ) if( !($admin_type == 1 || $admin_type == 0) )
return ''; return '';
echo '<p class="bottom16 caps semi-bold">'.$lang['srv_users_add_assigned'].'</p>';
// Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET
if(false && isVirtual() && $admin_type == 1){ if(false && isVirtual() && $admin_type == 1){
@ -9138,56 +9140,85 @@ class SurveyAdminSettings {
$managed_accounts_count = mysqli_num_rows($sql); $managed_accounts_count = mysqli_num_rows($sql);
echo '<p class="bold" style="padding-left:0px;">'; echo '<p class="bold bottom16">';
echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2']; echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2'].'</p>';
// Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje // Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje
if($managed_accounts_count >= $managed_accounts_limit){ if($managed_accounts_count >= $managed_accounts_limit){
echo '<br /><br />'; echo '<p>';
echo $lang['srv_users_add_assigned_max_reached']; echo $lang['srv_users_add_assigned_max_reached'];
echo '</p>'; echo '</p>';
return; return;
} }
elseif($managed_accounts_count > 0){ elseif($managed_accounts_count > 0){
echo '<br /><br />'; echo '<p>';
echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span>'; echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span></p>';
} }
echo '</p>';
} }
echo '<div id="dodajanje">'; echo '<div id="dodajanje">';
echo '<div id="dodajanje_horizontal">';
// Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail // Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail
echo '<div id="dodajanje_left">';
echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">'; echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
echo '<h3><b>'.$lang['srv_users_add_assigned_title'].'</b></h3>';
echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>';
echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>';
echo '<p><div class="buttonwrapper floatLeft">'; echo '<p class="semi-bold">'.$lang['srv_users_add_assigned_title'].'</p>';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.manager_add_user.submit();">'.$lang['create_add'].'</a>';
echo '</div></p>';
echo '<div class="add_user_fields_wrapper">';
echo '<div class="setting_holder">';
echo '<p>'.$lang['email'].':</p>';
echo '<input type="email" class="text large" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'');
echo '</div>';
echo '<div class="setting_holder">';
echo '<p>'.$lang['name'].':</p>';
echo '<input type="text" class="text large" id="name" name="name">';
echo '</div>';
echo '<div class="setting_holder">';
echo '<p>'.$lang['surname'].':</p>';
echo '<input type="text" class="text large" id="surname" name="surname">';
echo '</div>';
echo '<div class="setting_holder">';
echo '<p>'.$lang['password'].':</p>';
echo '<input type="password" class="text large" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'');
echo '</div>';
echo '<div class="setting_holder">';
echo '<p>'.$lang['again'].':</p>';
echo '<input type="password" class="text large" id="password2" name="password2">';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>';
echo '</div>';
echo '</form>'; echo '</form>';
echo '</div>'; // #dodajaje_left
echo '<div id="dodajanje_right">';
// admini si lahko dodajajo ze obstojece uporabnike // admini si lahko dodajajo ze obstojece uporabnike
if ($admin_type == 0) { if ($admin_type == 0) {
echo '<br /><br /><br />';
echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">'; echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>'; echo '<p class="bottom8 semi-bold">'.$lang['srv_manager_add_user2'].'</p>';
echo '<p><select name="uid" class="js-obstojeci-uporabniki-admin-ajax" style="width: 500px;"></select></p>';
//echo '<p><button type="submit">'.$lang['add'].'</button></p>'; echo '<div class="setting_holder">';
echo '<p><div class="buttonwrapper floatLeft">'; echo '<p class="bottom4">'.$lang['srv_manager_add_user_label'].':</p>';
echo ' <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_dostop.submit();">'.$lang['add'].'</a>'; echo '<select name="uid" class="js-obstojeci-uporabniki-admin-ajax drowpdown large" style="width: 460px;"></select>';
echo '</div></p>'; echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium blue" onCclick="document.admin_add_dostop.submit();">'.$lang['add'].'</button>';
echo '</div>';
echo '</form>'; echo '</form>';
} }
@ -9207,6 +9238,9 @@ class SurveyAdminSettings {
}*/ }*/
echo '</div>'; echo '</div>';
echo '</div>';
echo '</div>';
} }
/** /**
@ -9260,9 +9294,18 @@ class SurveyAdminSettings {
$sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'"); $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
$rowU = mysqli_fetch_array($sqlU); $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
// Naslov // Naslov
echo '<h2 style="margin-bottom:30px;">'; /*echo '<h2 style="margin-bottom:30px;">';
if($admin_type == 0) if($admin_type == 0)
echo $lang['administrator']; echo $lang['administrator'];
@ -9275,15 +9318,15 @@ class SurveyAdminSettings {
echo ' <a href="#" onclick="edit_user(\''.$global_user_id.'\'); return false;" title="Uredi"><i class="fa fa-pencil-alt link-moder"></i></a>'; echo ' <a href="#" onclick="edit_user(\''.$global_user_id.'\'); return false;" title="Uredi"><i class="fa fa-pencil-alt link-moder"></i></a>';
echo '</h2>'; echo '</h2>'; */
echo '<p class="bottom16 caps semi-bold">'.$lang['srv_users_assigned_title'].'</p>';
// Tabela // Tabela
echo '<fieldset style="max-width: 100% !important;"><legend>'.$lang['srv_users_assigned_title'].'</legend>';
//echo '<h4 style="margin-bottom: 10px;">'.$lang['srv_users_assigned_title'].'</h4>';
echo '<table id="my_users_list" class="usersTable">'; echo '<table id="my_users_list" class="usersTable">';
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>';
@ -9294,22 +9337,9 @@ class SurveyAdminSettings {
echo '<th>' . $lang['users_gdpr_title'] . '</th>'; echo '<th>' . $lang['users_gdpr_title'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>'; echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
echo '</tr></thead>'; echo '</tr></thead>';
echo '</table>'; echo '</table>';
echo '</fieldset>';
// Dodajanje uporabnikov
echo '<div class="add_user">';
// Manager ali admin lahko doda novega uporabnika pod pregled
echo '<fieldset class="assign_user"><legend>'.$lang['srv_users_add_assigned'].'</legend>';
$this->dodeljeniUporabniki();
echo '</fieldset>';
echo '</div>';
} }
/** /**

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

@ -1311,6 +1311,9 @@ class Dostop {
foreach ($vsi as $uporabnik) { foreach ($vsi as $uporabnik) {
$seznam[] = [ $seznam[] = [
'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>',
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),
(!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)), (!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), $this->userTypeToText($uporabnik->type),
@ -1320,10 +1323,7 @@ class Dostop {
(!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0), (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
$lang["users_gdpr".$uporabnik->gdpr_agree], $lang["users_gdpr".$uporabnik->gdpr_agree],
$uporabnik->registriran, $uporabnik->registriran,
$uporabnik->last_login, $uporabnik->last_login
'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
]; ];
} }

2
admin/survey/classes/tracking/CrossRoad.php
View File

@ -519,7 +519,7 @@ class CrossRoad {
// Uporabniki // Uporabniki
if($_GET['t'] == 'uporabniki'){ if($_GET['t'] == 'uporabniki'){
$layout_width = 'narrow'; $layout_width = 'narrow';
if($_GET['m'] == 'all'){ if($_GET['m'] == 'all' || $_GET['m'] == ''){
$layout_width = 'fullwidth'; $layout_width = 'fullwidth';
} }
} }

9
lang/1.php
View File

@ -5845,9 +5845,10 @@ $lang = array (
"srv_demografija_text" => 'Na konec ankete lahko dodate že pripravljena demografska vprašanja', "srv_demografija_text" => 'Na konec ankete lahko dodate že pripravljena demografska vprašanja',
"srv_demografska_vprasanja" => 'Demografska vprašanja', "srv_demografska_vprasanja" => 'Demografska vprašanja',
"srv_head_demografska_vprasanja" => 'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)', "srv_head_demografska_vprasanja" => 'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)',
"srv_manager_add_user" => 'Dodajte novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail</span>', "srv_manager_add_user_label" => 'Izberite uporabnika',
"srv_manager_add_user2" => 'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>', "srv_manager_add_user" => 'Dodajte novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail.</span>',
"srv_manager_add_user3" => 'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)', "srv_manager_add_user2" => 'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
"srv_manager_add_user3" => 'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
"srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>', "srv_manager_add_user4" => '<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
"srv_manager_rem_user2" => 'Odstranite uporabnika iz svojega pregleda', "srv_manager_rem_user2" => 'Odstranite uporabnika iz svojega pregleda',
"srv_manager_manager" => 'Uporabniki, ki imajo managerski pregled nad vašimi anketami', "srv_manager_manager" => 'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
@ -6544,7 +6545,7 @@ $lang = array (
'srv_users_add_assigned_max_reached' => 'Dosegli ste maksimalno število uporabnikov v pregledu.', 'srv_users_add_assigned_max_reached' => 'Dosegli ste maksimalno število uporabnikov v pregledu.',
'srv_users_add_assigned_max_1' => 'Dostop do vaše domene lahko dodelite največ', 'srv_users_add_assigned_max_1' => 'Dostop do vaše domene lahko dodelite največ',
'srv_users_add_assigned_max_2' => 'uporabnikom.', 'srv_users_add_assigned_max_2' => 'uporabnikom.',
"srv_users_add_assigned_title" => 'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>', "srv_users_add_assigned_title" => 'Ustvarite novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
"srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled', "srv_users_assigned_title" => 'Uporabniki nad katerimi imate pregled',
'srv_uredniske_nastavitve' => 'Uredniške nastavitve', 'srv_uredniske_nastavitve' => 'Uredniške nastavitve',
'srv_q_inicialke' => 'Respondenti naj vnesejo tudi svoje inicialke', 'srv_q_inicialke' => 'Respondenti naj vnesejo tudi svoje inicialke',

1
lang/2.php
View File

@ -5740,6 +5740,7 @@ $lang = array (
"srv_demografija_text" => 'You can add demographic questions to the end of the survey', "srv_demografija_text" => 'You can add demographic questions to the end of the survey',
"srv_demografska_vprasanja" => 'Demographic questions', "srv_demografska_vprasanja" => 'Demographic questions',
"srv_head_demografska_vprasanja" => 'We recommend using standard socio-demographic questions (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Details</span></a>)', //NEJC "srv_head_demografska_vprasanja" => 'We recommend using standard socio-demographic questions (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Details</span></a>)', //NEJC
"srv_manager_add_user_label" => 'Select user',
"srv_manager_add_user" => 'Add new user', "srv_manager_add_user" => 'Add new user',
"srv_manager_add_user2" => 'Add existing user', "srv_manager_add_user2" => 'Add existing user',
"srv_manager_add_user3" => 'Add existing user (you can add users with email %s)', "srv_manager_add_user3" => 'Add existing user (you can add users with email %s)',

55
public/css/admin_new.css
View File

@ -9208,7 +9208,7 @@ label.empty {
font-size: 0; font-size: 0;
} }
input[type=text], input[type=password], input[type=number] { input[type=text], input[type=email], input[type=password], input[type=number] {
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
box-sizing: border-box; box-sizing: border-box;
border-radius: 2px; border-radius: 2px;
@ -9216,40 +9216,40 @@ input[type=text], input[type=password], input[type=number] {
margin-top: 4px; margin-top: 4px;
font-family: Source Sans Pro, sans-serif; font-family: Source Sans Pro, sans-serif;
} }
input[type=text].w200, input[type=password].w200, input[type=number].w200 { input[type=text].w200, input[type=email].w200, input[type=password].w200, input[type=number].w200 {
width: 200px; width: 200px;
} }
input[type=text].w300, input[type=password].w300, input[type=number].w300 { input[type=text].w300, input[type=email].w300, input[type=password].w300, input[type=number].w300 {
width: 300px; width: 300px;
} }
input[type=text].w400, input[type=password].w400, input[type=number].w400 { input[type=text].w400, input[type=email].w400, input[type=password].w400, input[type=number].w400 {
width: 400px; width: 400px;
} }
input[type=text].wauto, input[type=password].wauto, input[type=number].wauto { input[type=text].wauto, input[type=email].wauto, input[type=password].wauto, input[type=number].wauto {
width: auto; width: auto;
} }
input[type=text].large, input[type=password].large, input[type=number].large { input[type=text].large, input[type=email].large, input[type=password].large, input[type=number].large {
height: 40px; height: 40px;
font-size: 16px; font-size: 16px;
padding: 9px 7px; padding: 9px 7px;
} }
input[type=text].medium, input[type=password].medium, input[type=number].medium { input[type=text].medium, input[type=email].medium, input[type=password].medium, input[type=number].medium {
height: 32px; height: 32px;
font-size: 14px; font-size: 14px;
padding: 6px 7px; padding: 6px 7px;
} }
input[type=text].small, input[type=password].small, input[type=number].small { input[type=text].small, input[type=email].small, input[type=password].small, input[type=number].small {
height: 26px; height: 26px;
font-size: 14px; font-size: 14px;
padding: 3px 7px; padding: 3px 7px;
} }
input[type=text]:focus, input[type=password]:focus, input[type=number]:focus { input[type=text]:focus, input[type=email]:focus, input[type=password]:focus, input[type=number]:focus {
outline-style: none; outline-style: none;
box-shadow: none; box-shadow: none;
border-color: transparent; border-color: transparent;
border-color: #1E88E5; border-color: #1E88E5;
} }
input[type=text][readonly=true], input[type=password][readonly=true], input[type=number][readonly=true] { input[type=text][readonly=true], input[type=email][readonly=true], input[type=password][readonly=true], input[type=number][readonly=true] {
cursor: pointer; cursor: pointer;
} }
input[type=radio], input[type=checkbox] { input[type=radio], input[type=checkbox] {
@ -10480,6 +10480,41 @@ div.subpage_uporabniki .data_table_top_holder #end {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
div.subpage_uporabniki div.users_list_box {
padding: 0 12px;
}
div.subpage_uporabniki div.add_user {
margin-bottom: 32px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
display: flex;
flex-direction: row;
gap: 64px;
width: fit-content;
align-self: center;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
align-items: flex-end;
width: fit-content;
margin-top: 8px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.button_holder {
margin: 32px 0 0 0;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder {
margin-bottom: 16px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type {
margin-bottom: 0;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown {
width: 500px;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 {
margin-bottom: 4px;
}
div#user_info_segment_narocila { div#user_info_segment_narocila {
background-color: #F8F8F8; background-color: #F8F8F8;

1
resources/sass/admin_new/components/form/input.scss
View File

@ -18,6 +18,7 @@ label{
input { input {
&[type="text"], &[type="text"],
&[type="email"],
&[type="password"], &[type="password"],
&[type="number"] { &[type="number"] {
border: 1px solid $dark-gray; border: 1px solid $dark-gray;

49
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -77,4 +77,53 @@ div.subpage_uporabniki {
justify-content: flex-end; justify-content: flex-end;
} }
} }
//Pregled in dodajanje
div.users_list_box {
padding: 0 12px;
}
div.add_user {
margin-bottom: 32px;
div#dodajanje_horizontal {
display: flex;
flex-direction: row;
gap: 64px;
width: fit-content;
align-self: center;
div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
align-items: flex-end;
width: fit-content;
margin-top: 8px;
}
div.button_holder {
margin: 32px 0 0 0;
}
.setting_holder {
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0;
}
select.dropdown {
width: 500px;
}
p.bottom4 {
margin-bottom: 4px;
}
}
}
}
} }