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

This commit is contained in:
tejagerjovic 2022-08-26 04:50:25 +02:00
parent dae8e36598
commit 4bec9e77ad
6 changed files with 120 additions and 18 deletions

View File

@ -9093,13 +9093,37 @@ 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
// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
if( !($admin_type == 1 || $admin_type == 0) )
return '';
// Dodajanje uporabnikov
echo '<fieldset><legend>'.$lang['n_users_list_add'].'</legend>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_users_add_new_type'].'</span>';
echo '<div class="setting_item">';
echo '<input type="radio" id="user_add_type_1" name="user_add_type" value="1" checked="checked" onClick="toggleAddUser();">';
echo '<label for="user_add_type_1">'. $lang['srv_users_add_new_type1'] .'</label> ';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" id="user_add_type2" name="user_add_type" value="2" onClick="toggleAddUser();">';
echo '<label for="user_add_type2">'. $lang['srv_users_add_new_type2'] .'</label> ';
echo '</div>';
echo '</div>';
echo '<div id="new_user_option">';
echo 'new user!!!';
echo '</div>';
echo '<div id="existing_user_option" class="displayNone">';
echo 'existing user -----';
echo '</div>';
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
@ -9222,7 +9246,7 @@ class SurveyAdminSettings {
echo '</div>';
echo '</div>';
echo '</div>'; //.add_user
echo '</fieldset>';
}

View File

@ -5678,4 +5678,11 @@ function show_gdpr_messeage(id_sporocila){
function toggleCommentOptions(id) {
$("#options_"+id).toggleClass("displayNone");
}
//Toggle za dodajanje uporabnika (admini in managerji)
function toggleAddUser(){
$("#new_user_option").toggleClass('displayNone');
$("#existing_user_option").toggleClass('displayNone');
}

View File

@ -6632,7 +6632,10 @@ $lang = array (
'srv_users_viewing2' => 'Trenutno aktivni uredniki',
'srv_users_viewing3' => 'Število aktivnih urednikov',
'srv_users_add_new' => 'Nov uporabnik',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <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>',
'srv_users_add_new_type' => 'Način dodajanja uporabnika:',
'srv_users_add_new_type1' => 'Ustvarite novega uporabnika v sistemu <span class="gray">(Uporabnik bo obveščen na e-mail, da je bil registriran v sistem, in da je pod vašim pregledom)</span>',
'srv_users_add_new_type2' => 'Aktivirajte pregled nad obstoječim uporabnikom <span class="gray">(Uporabnik bo obveščen na e-mail, da je pod vašim pregledom)</span>',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem in, da je pod vašim pregledom.</span>',
'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',
'srv_users_add_assigned_current' => 'Trenutno dodeljenih dostopov:',
'srv_users_add_assigned_max_reached' => 'Dosegli ste maksimalno število uporabnikov v pregledu.',

View File

@ -6520,6 +6520,9 @@ $lang = array (
'srv_users_viewing2' => 'Currently active editors',
'srv_users_viewing3' => 'Currently active editors',
'srv_users_add_new' => 'Add new user',
'srv_users_add_new_type' => 'Add user mode:',
'srv_users_add_new_type1' => 'Create a new user in the system <span class="gray">(The user will be notified via e-mail that they have been registered under your overview)</span>',
'srv_users_add_new_type2' => 'Activate an overview of an existing user <span class="gray">(The user will be notified via e-mail that they are under your overview)</span>',
"srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
'srv_users_add_assigned' => 'Add assigned users',
'srv_users_add_assigned_current' => 'Number of assigned users:',

View File

@ -10016,7 +10016,7 @@ textarea:focus {
}
.box-container .num_box {
border: 1px solid #E5E5E5;
background-color: white;
background-color: #FFFF;
border-radius: 2px;
cursor: pointer;
margin: 0px;
@ -10478,9 +10478,9 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
div.button_holder.editor_button_holder {
margin: 0;
padding: 8px 16px;
border-bottom: 1px rgb(204, 204, 204) solid;
border-left: 1px rgb(204, 204, 204) solid;
border-right: 1px rgb(204, 204, 204) solid;
border-bottom: 1px #cccccc solid;
border-left: 1px #cccccc solid;
border-right: 1px #cccccc solid;
border-radius: 0 0 2px 2px;
}
@ -20939,10 +20939,10 @@ div.page_tema div.theme_list div.options div.buttons-window {
position: absolute;
bottom: 20px;
max-width: 113px;
box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
box-shadow: 0px 0px 7px 0px #0000001F;
border-radius: 2px;
margin-right: 5px;
background-color: white;
background-color: #FFFF;
}
div.page_tema div.theme_list div.options div.buttons-window .button {
border: none;
@ -21237,7 +21237,7 @@ div#theme-edit-wrap div#theme-editor #picker {
left: 500px;
z-index: 999;
border-radius: 2px;
box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
box-shadow: 0px 0px 7px 0px #0000001F;
}
div#theme-edit-wrap div#theme-editor #picker .popup_close {
position: absolute !important;
@ -25912,6 +25912,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
.page_vabila #vabila .button_holder #nice_url_holder .buttons {
margin: 9px 0px 0px 0px !important;
}
div#vabila div.more div.more_block {
width: 89% !important;
}
@ -30067,7 +30068,7 @@ iframe#ifmcontentstoprint {
.analysis_icons_holder {
background-color: white;
border-radius: 2px;
box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
box-shadow: 0px 0px 7px 0px #0000001F;
}
.analysis_icons_holder .icon_box {
margin-left: 16px;
@ -30356,15 +30357,15 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
}
.rsdl_bck1 {
background-color: rgb(250, 226, 226) !important;
background-color: #fae2e2 !important;
}
.rsdl_bck2 {
background-color: rgb(255, 157, 157) !important;
background-color: #ff9d9d !important;
}
.rsdl_bck3 {
background-color: rgb(248, 66, 66) !important;
background-color: #f84242 !important;
}
.rsdl_bck4 {
@ -33852,19 +33853,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
#quick_comments_link.newCss {
display: none;
}
#firstNavigation ol.right-side {
display: none;
}
div.status_advanced {
flex-direction: column;
}
div.status_advanced_box {
width: 100%;
box-sizing: border-box;
}
a.status_advanced_link {
width: 95%;
}
.content_div_normalmode {
overflow-x: auto;
}
@ -33958,6 +33964,7 @@ body #main_holder #main .wide {
width: 100%;
margin: 0;
}
fieldset {
width: 100% !important;
box-sizing: border-box !important;
@ -33987,36 +33994,44 @@ fieldset textarea {
fieldset .setting {
height: auto !important;
}
.setting_horizontal_wrapper {
flex-direction: column !important;
}
#vnosi_paginacija div select {
display: inline-block;
width: fit-content;
margin: 0 5px;
text-align: center;
}
div.breadcrumbs {
display: block;
padding: 15px;
color: #1e88e5;
font-weight: 600;
}
button.small, submit.small {
min-width: auto;
padding: 5px 16px;
}
button.medium, submit.medium {
min-width: auto;
padding: 10px 24px;
}
button.large, submit.large {
min-width: auto;
padding: 12px 32px;
}
.top_note {
padding: 8px 16px;
}
header {
/* Mobile meni */
/* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@ -34272,6 +34287,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
header .mobile_settings .mobile_settings_content a .setting_text {
width: auto;
}
footer#srv_footer {
display: flex;
flex-direction: column;
@ -34293,6 +34309,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
padding: 0;
border: 0;
}
/* Popup za vprasajcke */
.qtip {
position: fixed !important;
@ -34303,6 +34320,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
left: 10% !important;
box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
}
.divPopUp {
width: calc(100% - 32px) !important;
max-width: calc(100% - 32px) !important;
@ -34313,10 +34331,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: calc(100% - 32px) !important;
max-width: calc(100% - 32px) !important;
}
/* Vse povezano s paketi in placili */
.dt-buttons {
display: none;
}
#main #moje_ankete_edit #anketa_edit {
padding: 0 !important;
}
@ -34391,6 +34411,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #moje_ankete_edit fieldset div.setting {
margin-bottom: 10px;
}
#new_anketa_div {
display: flex;
flex-direction: column;
@ -34474,6 +34495,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
border: 1px solid #c8e3f8 !important;
border-radius: 1px;
}
.dashboard_top_settings {
flex-direction: column;
}
@ -34486,16 +34508,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin-left: 0;
margin-right: 16px;
}
.dashboard_boxes {
flex-direction: column;
}
.dashboard_boxes .dashboard_box {
margin: 0 0 32px 0;
}
.locked .add-variable-mobile,
.spremenljivka_content .add-variable {
display: none !important;
}
#branching {
width: 100%;
margin: 0;
@ -34600,9 +34625,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin: 0;
padding: 0 12px;
}
.toolbox_holder {
display: none;
}
.mobile_add_question {
display: block;
position: fixed;
@ -34622,6 +34649,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
line-height: 15px;
font-weight: 600;
}
.mobile_add_question_popup {
z-index: 9999;
position: fixed;
@ -34675,6 +34703,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
font-size: 14px;
font-weight: 500;
}
#vprasanje_float_editing .vprasanje_edit_holder {
position: fixed;
z-index: 99999;
@ -34727,6 +34756,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
margin-left: 0 !important;
text-align: center;
}
#main #anketa #globalSetingsList {
max-width: 100% !important;
width: 100% !important;
@ -34739,6 +34769,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
width: 100%;
}
/* NASTAVITVE in ARHIVI */
/* OBLIKA */
#main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@ -34754,15 +34785,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: 100%;
height: auto;
}
#theme-editor {
width: 100% !important;
float: none !important;
}
#theme-preview {
width: 100% !important;
float: none !important;
margin-top: 80px !important;
}
/* ARHIVI */
#main #anketa #anketa_edit.page_arhivi {
flex-direction: column-reverse;
@ -34780,6 +34814,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
width: 100% !important;
}
div.page_tema .theme_list {
flex-wrap: wrap;
}
@ -34806,6 +34841,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
margin-right: 8px;
}
.page_theme-editor #theme-preview {
display: none;
}
@ -34813,6 +34849,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
width: 100% !important;
flex-wrap: wrap;
}
#srv_diagnostic br {
display: none;
}
@ -34833,6 +34870,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
#srv_diagnostic #srv_diagnostic_results_right table td + td {
width: auto !important;
}
.subpage_testnipodatki {
line-height: 20px;
}
@ -34846,6 +34884,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.subpage_testnipodatki form label input {
vertical-align: bottom;
}
.lastnosti_wrapper {
flex-direction: column !important;
}
@ -34853,6 +34892,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.lastnosti_wrapper .lastnosti_right {
width: 100% !important;
}
.page_vabila #vabila .button_holder {
flex-direction: column;
align-items: flex-start;
@ -34877,6 +34917,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.page_vabila #vabila .more_block {
width: 100%;
}
.page_invitations #inv_top_navi {
flex-direction: column;
align-items: flex-start;
@ -34944,6 +34985,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
.page_invitations .button_holder button {
margin-bottom: 8px;
}
#vabila > table,
table.invitations_settings,
#inv_msg_preview table,
@ -35027,6 +35069,7 @@ table.invitations_settings p label input[type=password],
width: 100% !important;
box-sizing: border-box;
}
#surveyInvitationSetting,
#surveyInvitationSettingServer {
min-width: 100% !important;
@ -35034,6 +35077,7 @@ table.invitations_settings p label input[type=password],
margin: 10px 0 !important;
box-sizing: border-box !important;
}
#inv_top_navi {
display: flex;
flex-direction: column;
@ -35072,6 +35116,7 @@ table.invitations_settings p label input[type=password],
#inv_top_navi > #inv_step_nav.yellow .inv_step_space {
display: none;
}
#inv_recipients_profiles_holder,
#inv_import_list_container,
#inv_messages_profiles_holder,
@ -35092,6 +35137,7 @@ table.invitations_settings p label input[type=password],
#inv_select_mail_preview textarea {
width: 100%;
}
#inv_msg_preview table th {
height: auto !important;
width: 100% !important;
@ -35103,6 +35149,7 @@ table.invitations_settings p label input[type=password],
width: 100%;
box-sizing: border-box;
}
.addthis_toolbox {
line-height: 24px;
}
@ -35117,9 +35164,11 @@ table.invitations_settings p label input[type=password],
.addthis_toolbox .addthis_separator {
font-size: 16px;
}
#inv_field_container ul li {
width: 45%;
}
/* grafika ko ni podatkov */
div.no_data_alert img {
width: 100%;
@ -35131,6 +35180,7 @@ table.invitations_settings p label input[type=password],
flex-direction: column;
align-items: center;
}
.page_data .data_table_top_holder {
flex-direction: column;
align-items: flex-start;
@ -35201,9 +35251,11 @@ table.invitations_settings p label input[type=password],
width: 100%;
margin-bottom: 16px;
}
body.data_fullscreen #analiza_data {
top: 68px;
}
.subpage_append .anketa_edit_main,
.subpage_merge .anketa_edit_main,
.subpage_calculation .anketa_edit_main,
@ -35244,6 +35296,7 @@ table.invitations_settings p label input[type=password],
clear: both;
margin: 40px 0 0 0 !important;
}
.subpage_quick_edit #quick_edit_top_line {
flex-direction: column-reverse;
}
@ -35263,6 +35316,7 @@ table.invitations_settings p label input[type=password],
.subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
justify-content: center;
}
.analysis_bottom_settings {
flex-wrap: wrap;
}
@ -35272,13 +35326,16 @@ table.invitations_settings p label input[type=password],
margin: 0 0 16px 0 !important;
border: 0;
}
.div_analiza_icons,
.div_analiza_scale {
opacity: 1 !important;
}
.analysis_icons_holder {
display: none;
}
.chart_holder {
width: 100%;
box-sizing: border-box;
@ -35301,6 +35358,7 @@ table.invitations_settings p label input[type=password],
display: block;
clear: both;
}
table.analysis_reports {
border-spacing: 0px;
}
@ -35317,12 +35375,14 @@ table.analysis_reports > tbody > tr > td {
table.analysis_reports fieldset {
margin-bottom: 0 !important;
}
.reports_holder {
flex-direction: column;
}
.reports_holder fieldset {
width: 100%;
}
.noSurvey_sequence {
padding: 0;
}
@ -35344,11 +35404,13 @@ table.analysis_reports > tbody > tr > td {
.noSurvey_sequence .buttons_holder a .button {
margin: 10px 30px;
}
#table-horizontal-scroll-wrapper1-userchanges {
display: table;
table-layout: fixed;
width: 100%;
}
#table-horizontal-scroll-wrapper2-userchanges {
display: table-cell;
overflow-x: auto;
@ -35359,6 +35421,7 @@ table.analysis_reports > tbody > tr > td {
border-collapse: collapse;
white-space: nowrap;
}
.page_arhivi .anketa_edit_left,
.page_tracking .anketa_edit_left,
.subpage_anal_arch .anketa_edit_left,

View File

@ -78,12 +78,14 @@ div.subpage_uporabniki {
}
}
//Pregled in dodajanje
//Moji uporabniki
div.users_list_box {
padding: 0 12px;
}
// Dodajanje
div.add_user {
margin-bottom: 32px;