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

[Redizajn 1KA v2] - Uporabniki --> Dodaj uporabnika v1

Browse Source
This commit is contained in:
tejagerjovic 2022-09-29 13:40:18 +02:00
parent 706d6db6ac
commit d260e70f12
3 changed files with 35 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/survey/SurveyAdminSettings.php
View File

@ -9161,8 +9161,6 @@ class SurveyAdminSettings {
echo '<div id="new_user_option">'; echo '<div id="new_user_option">';
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 '<div class="add_user_fields_wrapper">';
echo '<div class="setting_holder horizontal">'; echo '<div class="setting_holder horizontal">';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['name'].':</span>'; echo '<span class="setting_title">'.$lang['name'].':</span>';
@ -9192,9 +9190,7 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '<div class="button_holder top16">';
echo '<div class="button_holder">';
echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>'; echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>';
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';

52
public/css/admin_new.css
View File

@ -11545,55 +11545,41 @@ div.subpage_uporabniki .data_table_top_holder #end {
div.subpage_uporabniki div.users_list_box { div.subpage_uporabniki div.users_list_box {
padding: 0 12px; padding: 0 12px;
} }
div.subpage_uporabniki div.add_user { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder,
margin-bottom: 32px; div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder {
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
display: flex;
flex-direction: row;
width: fit-content;
align-self: center;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div#dodajanje_left {
padding-right: 32px;
margin-right: 32px;
border-right: 1px solid #E5E5E5;
}
div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
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; margin-bottom: 16px;
} }
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder:last-of-type,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder:last-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: 16px; gap: 16px;
margin-bottom: 0; margin-bottom: 16;
} }
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder.horizontal .setting_holder { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.horizontal .setting_holder,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.horizontal .setting_holder {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 16px; margin-bottom: 0;
} }
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown {
width: 500px; width: 500px;
} }
div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 { div.subpage_uporabniki .users_list_box #new_user_option .setting_holder p.bottom4,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder p.bottom4 {
margin-bottom: 4px; margin-bottom: 4px;
} }
div.subpage_uporabniki .users_list_box #new_user_option div.button_holder,
table#unconfirmed_mail_user_list { div.subpage_uporabniki .users_list_box #existing_user_option div.button_holder {
margin: 32px 0 0 0;
}
div.subpage_uporabniki table#unconfirmed_mail_user_list {
border-left: 1px solid #E5E5E5; border-left: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5; border-right: 1px solid #E5E5E5;
} }

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

@ -86,32 +86,10 @@ div.subpage_uporabniki {
// Dodajanje // Dodajanje
div.add_user { .users_list_box {
margin-bottom: 32px;
div#dodajanje_horizontal { #new_user_option,
display: flex; #existing_user_option {
flex-direction: row;
width: fit-content;
align-self: center;
div#dodajanje_left {
padding-right: 32px;
margin-right: 32px;
border-right: 1px solid $gray;
}
div.add_user_fields_wrapper {
display: flex;
flex-direction: column;
width: fit-content;
margin-top: 8px;
}
div.button_holder {
margin: 32px 0 0 0;
}
.setting_holder { .setting_holder {
margin-bottom: 16px; margin-bottom: 16px;
@ -124,12 +102,12 @@ div.subpage_uporabniki {
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: 16px; gap: 16px;
margin-bottom: 0; margin-bottom: 16;
.setting_holder { .setting_holder {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 16px; margin-bottom: 0;
} }
} }
@ -142,12 +120,15 @@ div.subpage_uporabniki {
} }
} }
div.button_holder {
margin: 32px 0 0 0;
}
} }
} }
} table#unconfirmed_mail_user_list {
table#unconfirmed_mail_user_list {
border-left: 1px solid $gray; border-left: 1px solid $gray;
border-right: 1px solid $gray; border-right: 1px solid $gray;
}
} }