From 85d08608a1ad294be48148148676439f082e6149 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Wed, 20 Jul 2022 03:07:16 +0200 Subject: [PATCH] [Redizajn 1KA v2] - Testiranje --> Diagnostika v3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Levi stolpec lastnosti + dodan span class na besedilo pri izpisih časov trajanja za styling --- admin/survey/SurveyAdminSettings.php | 25 +++--- .../classes/class.SurveyDiagnostics.php | 45 +++++----- lang/1.php | 4 +- lang/2.php | 2 + public/css/admin_new.css | 89 ++++++++++++++++++- .../pages/survey_testiranje/diagnostika.scss | 18 ++++ 6 files changed, 142 insertions(+), 41 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index aff2d3ef7..f50f9f3a7 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -5920,8 +5920,8 @@ class SurveyAdminSettings { return $total; } - $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; - $skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s'; + $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s'; if ($samo_izracunaj_skupini_cas == 1) return $skupni_cas; @@ -5949,7 +5949,7 @@ class SurveyAdminSettings { echo ''.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; echo ''; - echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; + echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; echo ''; echo ''; @@ -6030,7 +6030,7 @@ class SurveyAdminSettings { echo ''; } - echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'; + echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'; echo ''; echo '
'; @@ -6063,7 +6063,7 @@ class SurveyAdminSettings { echo ''.$block_labels_by_number[$vrstni_red+1].''; echo ''; - echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; + echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; echo ''; echo ''; @@ -6076,7 +6076,7 @@ class SurveyAdminSettings { echo ''; } - echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s'; + echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s'; echo ''; @@ -6148,7 +6148,7 @@ class SurveyAdminSettings { } } - echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'; + echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'; echo ''; echo '
'; @@ -6641,12 +6641,12 @@ class SurveyAdminSettings { if ($max == 0) return; if ($samo_izracunaj_skupini_cas == 1) - return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; // izpis - $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; - $predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0); + $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0); echo '
'.$lang['srv_total_trajanje'].''; echo '

'.$lang['srv_dejansko_trajanje_real'].':

'; @@ -6661,6 +6661,7 @@ class SurveyAdminSettings { echo ''; echo ''.$lang['srv_casi_po_straneh_stran'].''; echo ''.$lang['srv_neto_v_cas']; + if ($_GET['predvideni'] == 1) { echo ' / '.$lang['srv_testiranje_predvidenicas_1']; } @@ -6677,14 +6678,14 @@ class SurveyAdminSettings { echo ''; echo ''.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo ''.($time<60 ? round($time,1).'s ' : round($time/60,1).'min '); + echo ''.($time<60 ? round($time,1).'s ' : round($time/60,1).'min '); if ($_GET['predvideni'] == 1) { if ($rezanje_preskocene == 1) $time = $expected_time[$vrstni_red][0]; else $time = $expected_time[$vrstni_red][1]; - echo ' / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').''; + echo ' / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').''; } echo ''; diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php index 4f058e48f..fca05c0ee 100644 --- a/admin/survey/classes/class.SurveyDiagnostics.php +++ b/admin/survey/classes/class.SurveyDiagnostics.php @@ -472,6 +472,24 @@ class SurveyDiagnostics echo '
'; echo '
'; + + echo '
'; + echo '
'.$lang['srv_neto_v_cas'].'
'; + + // Dejansko trajanje + $sas = new SurveyAdminSettings(); + $dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1); + echo '

'.$dejanski_cas.'

'; + echo ''.$lang['srv_testiranje_cas_info'].''; + echo '
'; #box + + //Ocena trajanja + echo '
'; + echo '
'.$lang['srv_testiranje_predvidenicas'].'
'; + echo '

'.$skupni_cas.'

'; + echo ''.$lang['srv_testiranje_predvidenicas_info'].''; + echo '
'; #box + echo '
'; #lastnosti_left echo '
'; @@ -524,6 +542,7 @@ class SurveyDiagnostics echo '
'; #lastnosti_middle + //Ostale lastnosti ankete echo '
'; echo '
'; #lastnosti_right @@ -599,31 +618,7 @@ class SurveyDiagnostics echo '
'; - echo '
'; - # Trajanje - linki - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - $sas = new SurveyAdminSettings(); - $dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1); - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo '
'.$lang['srv_info_duration'].''.$lang['srv_diagnostika_table_title2'].'
'.$lang['srv_testiranje_predvidenicas'].''.$skupni_cas.'
'.$lang['srv_testiranje_cas'].''.$dejanski_cas.'
'; - echo '
'; echo '
'; @@ -807,7 +802,7 @@ class SurveyDiagnostics $sas = new SurveyAdminSettings(); $total = $sas->testiranje_predvidenicas(2); $this->time = array( $total, - (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s' + (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s' ); if ($total >= TIME_SOFT_LIMIT) { diff --git a/lang/1.php b/lang/1.php index e20f2ab9d..bc94f6aa6 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4019,8 +4019,10 @@ $lang = array ( "srv_lang_rem_confirm" => "Ali ste prepričani, da želite odstraniti ta prevod?", "srv_testiranje" => "Testiranje", "srv_testiranje_oblivanje" => "Testni podatki", - "srv_testiranje_cas" => "Dejanski časi", + "srv_testiranje_cas" => "Dejanski časi", + "srv_testiranje_cas_info" => "Več informacij o dejanskem trajanju", "srv_testiranje_predvidenicas" => "Ocenjevanje trajanja", + "srv_testiranje_predvidenicas_info" => "Več informacij o ocenjevanju trajanja", "srv_testiranje_predvidenicas_1" => "Predvideno trajanje", "srv_collectData" => "Priprava podatkov", "srv_testiranje_komentarji" => "Komentarji", diff --git a/lang/2.php b/lang/2.php index 79ef91eca..12a0b3d0a 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3990,7 +3990,9 @@ $lang = array ( "srv_testiranje" => "Test", // ime glavne navigacije 3. nivoja (gc 8.3.2012) "srv_testiranje_oblivanje" => "Test data", "srv_testiranje_cas" => "Actual time", + "srv_testiranje_cas_info" => "More info about actual time", "srv_testiranje_predvidenicas" => "Estimated duration", + "srv_testiranje_predvidenicas_info" => "More info about estimated duration", "srv_testiranje_predvidenicas_1" => "Expected duration", "srv_collectData" => "Data preparation", "srv_testiranje_komentarji" => "Comments", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f3ca2d031..f8eb2e3f8 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -24238,6 +24238,8 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box { padding: 16px; display: flex; flex-direction: column; + box-sizing: border-box; + height: 160px; } div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title, div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title, @@ -24275,6 +24277,24 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_gr font-size: 14px !important; white-space: nowrap; } +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time { + font-size: 40px; + margin-bottom: 12px; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .time span.time_text { + font-size: 14px !important; +} +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a, +div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box a { + text-decoration: none; + font-size: 14px !important; + white-space: nowrap; +} div#srv_diagnostic div.input_box { display: flex; width: 300px; @@ -25045,6 +25065,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; } @@ -29417,15 +29438,15 @@ iframe#ifmcontentstoprint { } .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 { @@ -32854,19 +32875,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; } @@ -32934,6 +32960,7 @@ body #main_holder #main .wide { width: 100%; margin: 0; } + fieldset { width: 100% !important; box-sizing: border-box !important; @@ -32963,36 +32990,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*/ @@ -33248,6 +33283,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; @@ -33269,6 +33305,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a { padding: 0; border: 0; } + /* Popup za vprasajcke */ .qtip { position: fixed !important; @@ -33279,6 +33316,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; @@ -33289,10 +33327,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; } @@ -33370,6 +33410,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; @@ -33453,6 +33494,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; } @@ -33465,16 +33507,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; @@ -33579,9 +33624,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; @@ -33601,6 +33648,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; @@ -33654,6 +33702,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; @@ -33706,6 +33755,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; @@ -33718,6 +33768,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 { @@ -33733,15 +33784,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; @@ -33759,6 +33813,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; } @@ -33785,6 +33840,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; } @@ -33792,6 +33848,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a { width: 100% !important; flex-wrap: wrap; } + #srv_diagnostic br { display: none; } @@ -33812,6 +33869,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; } @@ -33825,6 +33883,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; } @@ -33832,6 +33891,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; @@ -33856,6 +33916,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; @@ -33923,6 +33984,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, @@ -34006,6 +34068,7 @@ table.invitations_settings p label input[type=password], width: 100% !important; box-sizing: border-box; } + #surveyInvitationSetting, #surveyInvitationSettingServer { min-width: 100% !important; @@ -34013,6 +34076,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; @@ -34051,6 +34115,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, @@ -34071,6 +34136,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; @@ -34082,6 +34148,7 @@ table.invitations_settings p label input[type=password], width: 100%; box-sizing: border-box; } + .addthis_toolbox { line-height: 24px; } @@ -34096,9 +34163,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%; @@ -34110,6 +34179,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; @@ -34180,9 +34250,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, @@ -34223,6 +34295,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; } @@ -34242,6 +34315,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; } @@ -34251,13 +34325,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; @@ -34280,6 +34357,7 @@ table.invitations_settings p label input[type=password], display: block; clear: both; } + table.analysis_reports { border-spacing: 0px; } @@ -34296,12 +34374,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; } @@ -34323,11 +34403,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; @@ -34338,6 +34420,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, diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss index c039c4015..a36782dbe 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss @@ -80,7 +80,10 @@ div#srv_diagnostic { display: flex; flex-direction: column; + box-sizing: border-box; + height: 160px; + .title { text-transform: uppercase; font-weight: $semi-bold; @@ -111,6 +114,21 @@ div#srv_diagnostic { } } } + + .time { + font-size: 40px; + margin-bottom: 12px; + + span.time_text { + font-size: 14px !important; + } + } + + a { + text-decoration: none; + font-size: 14px !important; + white-space: nowrap; + } } }