diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 3dbf20d45..f5155dfb1 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -5795,56 +5795,65 @@ class SurveyAdminSettings { */ function anketa_nastavitve_predvidenicasi () { global $lang; - + global $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; + echo '
'; - echo $lang['srv_predvidenicasi_help']; - echo '
'; - echo '
'.$lang['srv_stran'].''; - echo '

'.$lang['srv_timing_page'].': s

'; - echo '
'; + echo '
'.$lang['srv_testiranje_predvidenicas'].''; + + echo '

'.$lang['srv_predvidenicasi_help'].'

'; + + echo '
'; + echo ''; + echo '  s'; + echo '
'; + + echo '

'.$lang['srv_predvidenicasi_note'].'

'; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; - echo '
'.$lang['srv_vprasanja'].''; - echo '
'.$lang['srv_question_type'].''.$lang['srv_timing_vprasanje'].''.$lang['srv_timing_kategorija'].''.$lang['srv_timing_kategorija_max'].'
'; - echo ''; - for ($tip=1; $tip<= 21; $tip++) { if ($tip <= 8 || $tip >= 16) { - - echo ''; - echo ''; + for ($tip=1; $tip<= 21; $tip++) { - if ($tip<=3 || $tip==6 || $tip==16 || $tip==17 || $tip==18 || $tip==19 || $tip==20) - echo ''; - - if ($tip==3){ - $kategorija_max = GlobalMisc::getMisc('timing_kategorija_max_'.$tip); - echo ''; - } - echo ''; - - } } + if ($tip <= 8 || $tip >= 16) { + echo ''; + echo ''; + echo ''; + + if ($tip<=3 || $tip==6 || $tip==16 || $tip==17 || $tip==18 || $tip==19 || $tip==20) + echo ''; + else + echo ''; + + if ($tip==3){ + $kategorija_max = GlobalMisc::getMisc('timing_kategorija_max_'.$tip); + echo ''; + } + else + echo ''; + + echo ''; + + } + } echo '
'.$lang['srv_timing_vprasanje'].''.$lang['srv_timing_kategorija'].''.$lang['srv_timing_kategorija_max'].'
'.$lang['srv_vprasanje_tip_'.$tip].' s s s' - /*. ''*/ - . '
'.$lang['srv_vprasanje_tip_'.$tip].'  s  s  s
'; echo '
'; - - echo '
'; - echo ''.$lang['edit1337'].''; - echo '
'; - - echo '
'; + + echo '
'; + echo ''; + echo ''; + echo '
'; echo '
'; diff --git a/lang/1.php b/lang/1.php index b9c82bd36..d3d2251ba 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3952,10 +3952,10 @@ $lang = array ( "srv_active_editing" => "Pozor, urejate anketo ki je aktivna!", "srv_no_comments" => "Anketa nima nobenih komentarjev.", "srv_no_comments_solved" => "Komentarji so vklopljeni, vendar anketa nima nerešenih komentarjev.", - "srv_timing_page" => "Čas za 1 stran", - "srv_timing_vprasanje" => "Čas za vprašanje (na 100 znakov besedila)", - "srv_timing_kategorija" => "Čas za kategorijo (na 100 znakov besedila)", - "srv_timing_kategorija_max" => "Najdaljši čas za izbiro kategorij", + "srv_timing_page" => "Predviden čas, ki ga respondent porabi za eno stran:", + "srv_timing_vprasanje" => "Čas za vprašanje (na 100 znakov)", + "srv_timing_kategorija" => "Čas za odgovor (na 100 znakov)", + "srv_timing_kategorija_max" => "Najdaljši čas za izbiro odgovora", "srv_pagebreak_all" => "Dodaj prelom strani med vsa vprašanja", "srv_bruto_cas" => "Bruto čas", "srv_neto_cas" => "Neto čas", @@ -6682,7 +6682,8 @@ $lang = array ( 'srv_para_graph_ustrezni' => 'Ustrezni', 'srv_para_graph_text' => 'Parapodatki beležijo tehnične lastnosti respondentove naprave, preko katere odgovarja na anketo. Več >>', 'srv_other_size' => 'Polje drugo', - 'srv_predvidenicasi_help' => '

Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite Center za pomoč.

', + 'srv_predvidenicasi_help' => 'Vsem uporabnikom lastne inštalacije 1KA odsvetujemo spreminjanje časovnih nastavitev, saj se bo z vsako posodobitvijo verzije vsebina prepisala. Za spremembo obvestite Center za pomoč.', + 'srv_predvidenicasi_note' => 'V spodnji tabeli je za vsak tip vprašanja predviden čas, ki ga respondent porabi za vprašanje in odgovore. Izračuni so narejeni glede na število znakov, ki jih vsebuje vprašanje.', 'srv_replay_to' => 'Odgovor za', 'srv_noSurvey_settings' => 'Vpiši osnovne značilnosti ankete', 'srv_noSurvey_skin' => 'Izberi vizualno predlogo ankete', diff --git a/lang/2.php b/lang/2.php index aea93961b..011e55e77 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3937,10 +3937,10 @@ $lang = array ( "srv_active_editing" => "Alert, you are editing an active survey!", "srv_no_comments" => "This survey has no comments.", "srv_no_comments_solved" => "Comments are turned on, but the survey does not have outstanding comments.", - "srv_timing_page" => "Time for 1 page", + "srv_timing_page" => "Estimated time spent by the respondent on one page:", "srv_timing_vprasanje" => "Time for question (per 100 characters)", "srv_timing_kategorija" => "Time for category (per 100 characters)", - "srv_timing_kategorija_max" => "Max time for choosing category", + "srv_timing_kategorija_max" => "Max time for choosing answer", "srv_pagebreak_all" => "Add page break between all of the questions", "srv_bruto_cas" => "Gross time", "srv_neto_cas" => "Net time", @@ -6569,7 +6569,8 @@ $lang = array ( 'srv_para_graph_ustrezni' => 'Appropriate', 'srv_para_graph_text' => 'Paradata records the technical characteristics of the respondent\'s device. More >>', 'srv_other_size' => 'Field other', - 'srv_predvidenicasi_help' => '

All users with their own 1KA installation are advised to keep default time settings, because the content will be overwritten with each update. For change inform Help center.

', + 'srv_predvidenicasi_help' => 'All users with their own 1KA installation are advised to keep default time settings, because the content will be overwritten with each update. For change inform Help center.', + 'srv_predvidenicasi_note' => 'The table below shows the estimated time spent by the respondent for each question type. The calculations are based on the number of characters contained in the question.', 'srv_replay_to' => 'Reply-to', 'srv_noSurvey_settings' => 'Enter basic survey data', 'srv_noSurvey_skin' => 'Choose skin', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 8bbc82205..9ea79ef06 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -19772,6 +19772,12 @@ div.osnovne_nastavitve div.osnovne_nastavitve_single select { font-size: 16px; } +table#timinganketa_table td input { + width: 100px; + height: 28px; + font-size: 14px; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates diff --git a/resources/sass/admin_new/pages/settings/osnovne_nastavitve.scss b/resources/sass/admin_new/pages/settings/osnovne_nastavitve.scss index bb894bb88..643e91238 100644 --- a/resources/sass/admin_new/pages/settings/osnovne_nastavitve.scss +++ b/resources/sass/admin_new/pages/settings/osnovne_nastavitve.scss @@ -1,3 +1,4 @@ +//Osnovne nastavitve div.osnovne_nastavitve { width: fit-content; //ne deluje, če želimo, da so nastavitve enako poravnane v vseh fieldsetih @@ -28,4 +29,16 @@ div.osnovne_nastavitve { } } +} + +// Ocenjevanje trajanja +table#timinganketa_table { + td { + input { + width: 100px; + height: 28px; + font-size: 14px; + } + } + } \ No newline at end of file