';
# naslovna vrstica
@@ -1708,7 +1713,7 @@ class SurveyAnalysis {
# variabla - en odgovor
echo '';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -1936,7 +1941,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '
'; //options
@@ -2099,7 +2104,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '
'; //options
@@ -2324,7 +2329,7 @@ class SurveyAnalysis {
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -2537,7 +2542,7 @@ class SurveyAnalysis {
# variabla - več odgovorov
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '
'; //options
@@ -2695,7 +2700,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '
'; //options
@@ -2881,7 +2886,7 @@ class SurveyAnalysis {
# variabla - tabela en odgovor
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -3197,7 +3202,7 @@ class SurveyAnalysis {
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -3580,7 +3585,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -3816,7 +3821,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -4097,7 +4102,7 @@ class SurveyAnalysis {
# variabla - število
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -4401,7 +4406,7 @@ class SurveyAnalysis {
# variabla
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -4758,7 +4763,7 @@ class SurveyAnalysis {
# variabla - besedilo
echo ' ';
// self::showIcons($spid,$spremenljivka,$_from);
- echo ' ';
+ echo ' ';
echo '';
self::showIcons($spid,$spremenljivka,$_from);
echo '
'; //options
@@ -5918,11 +5923,22 @@ class SurveyAnalysis {
echo '';
}
+ if ($options['desc'] == true) {
+ echo '';
+ }
+
if ($options['freq'] == true) {
echo '';
}
- if ($options['desc'] == true) {
- echo '';
- }
// Ikona za prikaz grafa
if($showChart == true && in_array($spremenljivka['tip'],array(1,2,3,6,7,8,16,17,18,20,22)) && $_from != 'charts'){
@@ -5976,7 +5983,7 @@ class SurveyAnalysis {
echo '';
echo ' Tortni grafikon
';
+ echo ' Tortni grafikon
';
echo ' ';
echo '';
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index b9c44700e..abf919188 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -145,6 +145,7 @@ class CrossRoad {
case A_MISSING:
case A_METADATA:
case A_MOBILESETTINGS:
+ case A_TABLESETTINGS:
case A_JEZIK: # nastavitve jezik
case A_UREJANJE: # nastavitve komentarjev
case A_PRIKAZ: # nastavitve komentarjev
diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php
index e2608a876..b57d4aae9 100644
--- a/admin/survey/classes/tracking/UserTrackingClass.php
+++ b/admin/survey/classes/tracking/UserTrackingClass.php
@@ -40,7 +40,7 @@ class UserTrackingClass
echo '';
echo '
';
- echo '' . $lang['srv_survey_archives_tracking'] . ' ';
+ echo '' . $lang['srv_survey_archives_tracking_history'] . ' ';
// Izvoz v Excel
echo ''.$lang['srv_survey_archives_tracking_last_changes'].'
';
diff --git a/admin/survey/definition.php b/admin/survey/definition.php
index 50206f69a..b7864bf4b 100644
--- a/admin/survey/definition.php
+++ b/admin/survey/definition.php
@@ -241,6 +241,7 @@
define('A_FORMA', 'forma'); # urejanje ankete - manjkajoče vrednosti
define('A_METADATA', 'metadata'); # urejanje ankete - prikaz metapodatkov
define('A_MOBILESETTINGS', 'mobile_settings'); # urejanje ankete - nastavitve prikaza pri mobitelih
+ define('A_TABLESETTINGS', 'table_settings'); # urejanje ankete - nastavitve prikaza tabel
define('A_PRIKAZ', 'prikaz'); # prikaz podatkov in analiz
define('A_MAILING', 'advanced_email'); # nastavitve email strežnika
define('A_SKUPINE', 'skupine'); # skupine
diff --git a/admin/survey/export/latexclasses/class.LatexDocument.php b/admin/survey/export/latexclasses/class.LatexDocument.php
index 827ba3c12..64f8b9af6 100644
--- a/admin/survey/export/latexclasses/class.LatexDocument.php
+++ b/admin/survey/export/latexclasses/class.LatexDocument.php
@@ -1419,6 +1419,8 @@ class LatexDocument{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
+ $text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string , to se je uredilo za rešiti ]*)?>/i", "", $text); //remove anchor tag from string , to se je uredilo za rešiti ";
+ //echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
- //echo $posSpace2Mail."";
+ //echo "pozicijo zadnjega presledka v besedilu pred e-naslovom: ".$posSpace2Mail."";
+
+
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."";
@@ -1502,15 +1507,17 @@ class LatexSurvey{
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
-
+ //echo "posKonec: ".$posKonec."";
+
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
$text = substr_replace($text, '}', $posKonec, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
- //substr_replace(string_name, replacement_string, start_pos, length)
- $text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
+ //substr_replace(string_name, replacement_string, start_pos, length)
+ $text = substr_replace($text, ' \url{', $posSpace2Mail, 0);
//echo $text."";
+
}
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec
diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
index f32704732..ce293aec7 100644
--- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php
+++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
@@ -1060,11 +1060,13 @@ class LatexSurveyElement{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
+ $text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string , to se je uredilo za rešiti ";
+ //echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js
index 33e155c4c..4f39f6b1f 100644
--- a/admin/survey/script/GDPR_seznam_anket.js
+++ b/admin/survey/script/GDPR_seznam_anket.js
@@ -21,42 +21,42 @@ var text_box3_p = document.getElementById("p_num_of_surveys3");
//green row
if (green_row_count == 1){
- text_box1_p.innerHTML = ' '+green_row_count+' anketa vsebuje GDPR občutljive podatke';
+ text_box1_p.innerHTML = ' '+green_row_count+' anketa vsebuje GDPR občutljive podatke';
}
else if (green_row_count == 2){
- text_box1_p.innerHTML = ' '+green_row_count+' anketi vsebujeta GDPR občutljive podatke';
+ text_box1_p.innerHTML = ' '+green_row_count+' anketi vsebujeta GDPR občutljive podatke';
}
else if (green_row_count == 3){
- text_box1_p.innerHTML = ' '+green_row_count+' ankete vsebujejo GDPR občutljive podatke';
+ text_box1_p.innerHTML = ' '+green_row_count+' ankete vsebujejo GDPR občutljive podatke';
}
else {
- text_box1_p.innerHTML = ' '+green_row_count+' anket vsebuje GDPR občutljive podatke';
+ text_box1_p.innerHTML = ' '+green_row_count+' anket vsebuje GDPR občutljive podatke';
}
//red row
if (red_row_count == 1){
- text_box2_p.innerHTML = ' '+red_row_count+' anketa lahko vsebuje GDPR občutljive podatke';
+ text_box2_p.innerHTML = ' '+red_row_count+' anketa lahko vsebuje GDPR občutljive podatke';
}
else if (red_row_count == 2){
- text_box2_p.innerHTML = ' '+red_row_count+' anketi lahko vsebujeta GDPR občutljive podatke';
+ text_box2_p.innerHTML = ' '+red_row_count+' anketi lahko vsebujeta GDPR občutljive podatke';
}
else if (red_row_count == 3){
- text_box2_p.innerHTML = ' '+red_row_count+' ankete lahko vsebujejo GDPR občutljive podatke';
+ text_box2_p.innerHTML = ' '+red_row_count+' ankete lahko vsebujejo GDPR občutljive podatke';
}
else {
- text_box2_p.innerHTML = ' '+red_row_count+' anket lahko vsebuje GDPR občutljive podatke';
+ text_box2_p.innerHTML = ' '+red_row_count+' anket lahko vsebuje GDPR občutljive podatke';
}
//grey row
if (grey_row_count == 1){
- text_box3_p.innerHTML = ' '+grey_row_count+' anketa lahko vsebuje GDPR občutljive podatke';
+ text_box3_p.innerHTML = ' '+grey_row_count+' anketa ne vsebuje GDPR občutljivih podatkov';
}
else if (grey_row_count == 2){
- text_box3_p.innerHTML = ' '+grey_row_count+' anketi lahko vsebujeta GDPR občutljive podatke';
+ text_box3_p.innerHTML = ' '+grey_row_count+' anketi ne vsebujeta GDPR občutljivih podatkov';
}
else if (grey_row_count == 3){
- text_box3_p.innerHTML = ' '+grey_row_count+' ankete lahko vsebujejo GDPR občutljive podatke';
+ text_box3_p.innerHTML = ' '+grey_row_count+' ankete ne vsebujejo GDPR občutljivih podatkov';
}
else {
- text_box3_p.innerHTML = ' '+grey_row_count+' anket lahko vsebuje GDPR občutljive podatke';
+ text_box3_p.innerHTML = ' '+grey_row_count+' anket ne vsebuje GDPR občutljivih podatkov';
}
// Seznam anket - togle checkbox prikaz anket
@@ -147,7 +147,49 @@ function test_function() {
}
}
+function gdpr_ankete(){
+ var check_gdpr_ankete = document.getElementById('gdpr_ankete_check');
+
+ //GDOR ANKETE
+ if (check_gdpr_ankete.checked){
+ check_gdpr_ankete.checked = false;
+ test_function();
+ }
+ else {
+ check_gdpr_ankete.checked = true;
+ test_function();
+ }
+}
+function potenc_gdpr_ankete(){
+
+ var check_potenc_gdpr = document.getElementById('potenc_gdpr_ankete_check');
+
+ //POTENCGDOR ANKETE
+ if (check_potenc_gdpr.checked){
+ check_potenc_gdpr.checked = false;
+ test_function();
+ }
+ else {
+ check_potenc_gdpr.checked = true;
+ test_function();
+ }
+}
+
+function ne_gdpr_ankete(){
+
+ var check_negdpr_ankete = document.getElementById('ne_gdpr_ankete');
+
+ //NE GDPR ANKETE
+ if (check_negdpr_ankete.checked){
+ check_negdpr_ankete.checked = false;
+ test_function();
+ }
+ else {
+ check_negdpr_ankete.checked = true;
+ test_function();
+ }
+}
function teme_options(){
var toggle = document.getElementsByClassName('buttons-window');
diff --git a/admin/survey/script/js-lang.php b/admin/survey/script/js-lang.php
index 82b4b8833..39521d84c 100644
--- a/admin/survey/script/js-lang.php
+++ b/admin/survey/script/js-lang.php
@@ -205,6 +205,7 @@ lang('for');
lang('alternative_email_delete');
lang('srv_anketa_deleted_restore_confirm');
lang('srv_data_deleted_restore_confirm');
+lang('more2');
//LOKACIJA
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 6ccbac630..1575cfd30 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -1504,7 +1504,20 @@ function normalmode_spremenljivka (spremenljivka) {
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
function create_editor (id, focus) {
- CKEDITOR.replace(id);
+ editor = CKEDITOR.replace(id);
+
+ // Dodamo gumb vec
+ editor.addCommand("advanced_editor_show", {
+ exec: function(edt) {
+ advanced_editor_show();
+ }
+ });
+
+ editor.ui.addButton('More', {
+ label: lang['more2'],
+ command: 'advanced_editor_show',
+ name: "More",
+ });
//namestitev editorja za tekst pri obveščanju
if(gup('a') == 'alert' && focus == false){
@@ -1644,35 +1657,40 @@ function remove_editor (id) {
// prikaze editor za spremenljivko (definiran mora biti textarea za idjem naslov_$spremenljivka
function editor_display (spremenljivka) {
- //if (editor_init != true) {
- CKEDITOR.replace( 'naslov_'+spremenljivka );
+ editor = CKEDITOR.replace( 'naslov_'+spremenljivka );
- //v kolikor je default vrednost potem naredimo selectAll
- var def = $('#naslov_'+spremenljivka).attr("default");
- if( def == 1) {
- CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
- this.execCommand('selectAll');
- });
- }
- // editor_init = true;
- //}
+ // Dodamo gumb vec
+ editor.addCommand("advanced_editor_show", {
+ exec: function(edt) {
+ advanced_editor_show();
+ }
+ });
+ editor.ui.addButton('More', {
+ label: lang['more2'],
+ command: 'advanced_editor_show',
+ name: "More",
+ });
+
+ //v kolikor je default vrednost potem naredimo selectAll
+ var def = $('#naslov_'+spremenljivka).attr("default");
+ if( def == 1) {
+ CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
+ this.execCommand('selectAll');
+ });
+ }
}
function editor_display_hotspot (vre_id) {
- //if (editor_init != true) {
- CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
+ CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
- //v kolikor je default vrednost potem naredimo selectAll
- var def = $('#hotspot_image_'+vre_id).attr("default");
- //if( def == 1) {
- CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
- this.execCommand('selectAll');
- });
- //}
- // editor_init = true;
- //}
+ //v kolikor je default vrednost potem naredimo selectAll
+ var def = $('#hotspot_image_'+vre_id).attr("default");
+
+ CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
+ this.execCommand('selectAll');
+ });
}
// odstrani editor (treba preden se odstrani html)
@@ -5512,13 +5530,13 @@ function toggleParapodatki(){
if(survey_ip == '0') {
$("#save_IP_warning").removeClass('displayNone');
- $("#save_IP").removeClass('no_margin');
+ $("#save_IP").removeClass('bottom0');
$("#connect_IP").removeClass('displayNone');
}
else {
$("#save_IP_warning").addClass('displayNone');
- $("#save_IP").addClass('no_margin');
+ $("#save_IP").addClass('bottom0');
$("#connect_IP").addClass('displayNone');
}
@@ -5656,4 +5674,15 @@ function show_gdpr_messeage(id_sporocila){
$("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id});
console.log(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');
}
\ No newline at end of file
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 0f9c89c5c..11d6e1c48 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -759,6 +759,11 @@ function comment_on_comment (id, user, date, spr_id) {
''+lang['srv_comment_comment']+' '+
' Zahtevali ste spisek prejemnikov. Preverite ga, ter potrditeSpisek prejemnikov Prenos vrednosti .Vpišite labelo spremenljivke z izračunano vrednostjo, obdano z lojtro, npr.: #rezultat# ",
"srv_missing_profile_title1" => "Označeni odgovori se ne upoštevajo pri analizah, in se obravnavajo kot manjkajoče vrednosti!",
"srv_missing_profile_title2" => "Manjkajoče vrednosti – neopredeljeni odgovori",
@@ -4012,12 +4014,17 @@ $lang = array (
"srv_add_lang" => "Omogoči večjezično podporo v anketi",
"srv_prevajanje" => "Prevajanje",
"srv_mobile_settings" => "Mobilne nastavitve",
- "srv_mobile_settings_title" => "Nastavitve prikaza pri mobilnih napravah",
+ "srv_mobile_settings_title" => "Prikaz ankete na mobilnih napravah",
"srv_mobile_survey" => "Anketa ustvarjena v mobilni aplikaciji",
"srv_mobile_add_question" => "Dodaj vprašanje",
+ "srv_table_settings" => "Nastavitve tabel",
+ "srv_table_settings_title" => "Prikaz vprašanj tipa tabela",
+ 'srv_table_settings_mobile_tables' => "Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
+ 'srv_table_settings_pc_tables' => "Prilagoditev vprašanj tipa 'Tabela' na računalniku",
"srv_standardne_besede" => "Standardne besede",
"srv_prevajanje_dodaj" => "Dodaj nov prevod za",
"srv_base_lang" => "Osnovni jezik",
+ "srv_multi_lang" => "Večjezične ankete",
"srv_lang_elements" => "Standardne besede",
"srv_trans_lang" => "Prevod",
"srv_trans_langs" => "Prikaži dodatni jezik",
@@ -4249,6 +4256,8 @@ $lang = array (
"srv_survey_archives_ie_data" => "Vprašalnik in podatki",
"srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov",
"srv_survey_archives_tracking" => "Spremembe",
+ "srv_survey_archives_tracking_history" => "Zgodovina sprememb",
+ "srv_survey_archives_tracking_archive" => "Arhiv sprememb",
"srv_survey_archives_tracking_survey" => "Spremembe vprašalnika",
"srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb",
"srv_survey_archives_tracking_survey_text_appendmerge" => "povezanih z dodajanjem ali združevanjem podatkov",
@@ -4580,9 +4589,9 @@ $lang = array (
"srv_comments_link" => "Pregled komentarjev",
"srv_comments_user" => "Uporabnik ",
"srv_comments_user2" => " je komentiral:",
- "srv_comments_archive" => "Arhiviraj komentar",
+ "srv_comments_archive" => "Razreši",
"srv_comments_unarchive" => "Označi kot nerešeno",
- "srv_comments_archived" => "Komentar je arhiviran",
+ "srv_comments_archived" => "Komentar je razrešen",
"srv_comments_new" => "Komentiraj",
"srv_zanka_profile_all" => "Brez",
"srv_zanka_profile_session" => "Začasno",
@@ -4604,9 +4613,9 @@ $lang = array (
"srv_export_questionnare_2" => "Pozor: pri večjih anketah zaradi obsežnosti tovrsten izpis morda ni smiselen! Za več kot 300 izpisov morate zato imeti status administratorja.",
//"srv_export_pagebreak" => "Vsak respondent na novi strani",
"srv_export_pagebreak" => "Vsak respondent na novi strani (le za PDF)",
- "srv_export_if" => "Prikaz if-ov",
+ "srv_export_if" => "Prikaz pogojev (IF)",
"srv_export_font" => "Velikost pisave (le za PDF)",
- "srv_export_show_recnum" => "Prikaz recnuma",
+ "srv_export_show_recnum" => "Prikaz recnuma oz. zaporedne številke respondenta",
"srv_export_results_settings" => "Izpis odgovorov respondentov",
"srv_export_survey_settings" => "Izpis vprašalnika",
"srv_export_intro" => "Prikaz uvoda",
@@ -4654,6 +4663,7 @@ $lang = array (
"srv_done" => "Končano",
"srv_not_relevant" => "Nerelevantno",
"srv_comment_comment" => "Odgovori",
+ "srv_comment_delete" => "Izbriši",
"srv_edit_data_title" => "Uredi podatke vprašanja",
"srv_edit_data_row" => "Uredi celotno anketo respondenta",
"srv_edit_data_row_quick" => "Hitro urejanje celotne ankete respondenta",
@@ -6393,7 +6403,7 @@ $lang = array (
'srv_aapor_show_calculation' => 'Prikaz izračunov:',
'srv_aapor_show_approximate_calculation' => 'Prikaz približnih izračunov:',
'srv_aapor_show_approximate' => 'Prikaži približke',
- 'srv_show_continue_later' => 'Opcija za nadaljevanje kasneje',
+ 'srv_show_continue_later' => 'Možnost kasnejšega nadaljevanja izpolnjevanja ankete',
'srv_themes_select' => 'Izbira teme',
'srv_themes_mod' => 'Prilagoditev teme',
'srv_themes_mod2' => 'Trenutno urejate temo',
@@ -6411,7 +6421,7 @@ $lang = array (
'srv_new_theme_alert' => 'Dodana je nova prilagoditev teme %s . Uredite jo lahko spodaj.',
'srv_new_theme_alert_css' => 'Dodana je nova CSS tema %s . Uredite jo lahko spodaj.',
'srv_js_tracking' => 'JavaScript koda za sledenje',
- 'js_tracking_note' => 'Skopirajte celotno kodo (iz npr. Google Analytics), vključno s <script> blokom.',
+ 'js_tracking_note' => 'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s <script> blokom.',
'srv_editing_mode' => 'Napredna 1KA',
'srv_editing_mode_0' => 'Enostavno',
'srv_editing_mode_1' => 'Napredno',
@@ -6426,6 +6436,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Napredni način',
'srv_email_example_txt' => 'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
'srv_prikaz_default_valid' => 'Privzeta izbira ustreznih enot:',
+ 'srv_prikaz_default_valid1' => 'Delno izpolnjene in končane enote/ankete (s statusoma 5, 6)',
+ 'srv_prikaz_default_valid2' => 'Samo končane enote/ankete (s statusom 6)',
'srv_prikaz_showItime' => 'Prikaži datum respondenta:',
'srv_prikaz_showLineNumber' => 'Prikaži številko vrstice respondenta:',
'srv_global_settnig_access_respondents' => 'Dostop respondenti',
@@ -6620,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 Uporabnik bo obveščen na e-mail, da je bil registriran v sistem. ',
+ 'srv_users_add_new_type' => 'Način dodajanja uporabnika:',
+ 'srv_users_add_new_type1' => 'Ustvarite novega uporabnika v sistemu (Uporabnik bo obveščen na e-mail, da je bil registriran v sistem, in da je pod vašim pregledom) ',
+ 'srv_users_add_new_type2' => 'Aktivirajte pregled nad obstoječim uporabnikom (Uporabnik bo obveščen na e-mail, da je pod vašim pregledom) ',
+ "srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu Uporabnik bo obveščen na e-mail, da je bil registriran v sistem in, da je pod vašim pregledom. ',
'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.',
@@ -6822,7 +6837,6 @@ $lang = array (
'srv_parapodatki' => 'Napredni parapodatki',
'pasteFromWordAlert' => 'Kopiranje besedila močno odsvetujemo! Več >> ',
'srv_interaktivni_elementi' => 'Interaktivni elementi',
- 'srv_hint' => 'Namig',
'srv_para_label_variables' => 'Spremenljivke',
'srv_para_label_details' => 'Podrobno',
'srv_para_label_breaks' => 'Prekinitve',
@@ -7126,7 +7140,7 @@ $lang = array (
'one_click_create' => "Enklik kreiranje",
'edit_hide' => "Skrij",
'edit_show' => "Prikaži",
- 'srv_show_title' => "Naslov ankete za uporabnike",
+ 'srv_show_title' => "Naslov ankete je viden respondentom",
'srv_create_show_intro' => "Uvod je viden respondentom",
'srv_create_show_concl' => "Zaključek je viden respondentom",
'srv_create_show_title' => "Naslov ankete je viden respondentom",
@@ -7147,10 +7161,10 @@ $lang = array (
'srv_tip_sample_t6_5_v4' => "alergeni",
'srv_tip_sample_t6_5_c1' => "Najbolj pomemben",
'srv_tip_sample_t6_5_c2' => "Najmanj pomemben",
- 'srv_settings_mobile_img' => "Prikaz slik na mobilniku",
- 'srv_settings_mobile_tables' => "Prilagoditev tabel na mobilniku",
+ 'srv_settings_mobile_img' => "Prikaz slik na mobilnih napravah",
+ 'srv_settings_mobile_tables' => "Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
'srv_settings_mobile_tables_slide' => "Da, z razpiranjem",
- 'srv_settings_mobile_friendly' => "Prilagojen prikaz za mobilnike",
+ 'srv_settings_mobile_friendly' => "Prilagojen prikaz ankete na mobilnih napravah",
'srv_settings_mobile_friendly_off' => "Prilagojen prikaz za mobilnike je izklopljen",
'srv_mySurvey_unallocated' => "Nerazporejene ankete",
'srv_mySurvey_delete_folder' => "Pobriši mapo",
@@ -7190,7 +7204,7 @@ $lang = array (
'srv_orientacija_tabela_da_ne' => "Tabela DA/NE",
'srv_privacy_0' => "Brez potrditve (povezava v nogi ankete)",
'srv_privacy_1' => "Potrditev s klikom naprej",
- 'srv_privacy_2' => "Potrditev s checkboxom",
+ 'srv_privacy_2' => "Potrditev s potrditvenim poljem (checkbox)",
'cookiePopupTitle' => 'Uporaba piškotkov',
'cookiePopupText' => '
Za izboljšanje uporabniške izkušnje, vam bomo kot prijavljenim uporabnikom dodelili piškotke (pojasnilo ).
Ali se želite prijaviti?
',
'aaiPopupTitle' => 'AAI-prijava',
diff --git a/lang/2.php b/lang/2.php
index da68a8ca9..4047e3053 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -715,7 +715,8 @@ $lang = array (
"n_n_users" => "Notify users",
"n_desc_list" => " You requested listing of recipients. Check itList of email recipients Data piping to display final score.Use question label for computed value, embraced with hash, #score# ",
"srv_missing_profile_title1" => "Selected values are not used in the analysis and are treated as missing values!",
"srv_missing_profile_title2" => "Missing values - undefined answers",
@@ -3982,10 +3984,15 @@ $lang = array (
"srv_prevajanje" => "Translations",
"srv_standardne_besede" => "Standard words",
"srv_mobile_settings" => "Mobile settings",
- "srv_mobile_settings_title" => "Display settings for mobile devices",
+ "srv_mobile_settings_title" => "Survey display on mobile devices",
"srv_mobile_survey" => "Survey created with mobile app",
"srv_mobile_add_question" => "Add question",
+ "srv_table_settings" => "Table settings",
+ "srv_table_settings_title" => "Table questions settings",
+ 'srv_table_settings_mobile_tables' => "Optimization of 'Table' type questions on mobile devices",
+ 'srv_table_settings_pc_tables' => "Optimization of 'Table' type questions on desktop computer",
"srv_prevajanje_dodaj" => "Add translation for",
+ "srv_multi_lang" => "Multilanguage surveys",
"srv_base_lang" => "Basic language",
"srv_lang_elements" => "Standard text",
"srv_trans_lang" => "Translation",
@@ -4229,6 +4236,8 @@ $lang = array (
"srv_survey_archives_ie_data" => "Survey and data",
"srv_survey_archives_ie_data_title" => "Survey and data import / export",
"srv_survey_archives_tracking" => "Changes",
+ "srv_survey_archives_tracking_history" => "Change history",
+ "srv_survey_archives_tracking_archive" => "Change archive",
"srv_survey_archives_tracking_survey" => "Survey changes",
"srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes",
"srv_survey_archives_tracking_survey_text_appendmerge" => "related to adding or merging data",
@@ -4556,9 +4565,9 @@ $lang = array (
"srv_comments_anketa_resp" => "Respondent comments to the survey",
"srv_comments_user" => "User ",
"srv_comments_user2" => " commented:",
- "srv_comments_archive" => "Archive comment",
- "srv_comments_unarchive" => "Unarchive",
- "srv_comments_archived" => "Comment has already been archived",
+ "srv_comments_archive" => "Resolve",
+ "srv_comments_unarchive" => "Mark as unresolved",
+ "srv_comments_archived" => "Comment has been resolved",
"srv_comments_new" => "Comment",
"srv_zanka_profile_all" => "Without",
"srv_zanka_profile_session" => "Temporary",
@@ -4580,9 +4589,9 @@ $lang = array (
"srv_export_questionnare_2" => "Warning: Export for survey with more than 300 respondents is possible only for administrators!",
//"srv_export_pagebreak" => "Every respondent starts with a new page",
"srv_export_pagebreak" => "Every respondent starts with a new page (PDF only)",
- "srv_export_if" => "Show if clauses",
+ "srv_export_if" => "Show conditions (IF)",
"srv_export_font" => "Font size (PDF only)",
- "srv_export_show_recnum" => "Show recnum",
+ "srv_export_show_recnum" => "Show recnum (respondent's consecutive number)",
"srv_export_results_settings" => "Answers export",
"srv_export_survey_settings" => "Survey export",
"srv_export_intro" => "Show intro",
@@ -4629,6 +4638,7 @@ $lang = array (
"srv_done" => "Done",
"srv_not_relevant" => "Not relevant",
"srv_comment_comment" => "Reply",
+ "srv_comment_delete" => "Delete",
"srv_edit_data_title" => "Edit question data",
"srv_edit_data_row" => "Edit respondents survey",
"srv_edit_data_row_quick" => "Quick edit respondents survey",
@@ -6286,7 +6296,7 @@ $lang = array (
'srv_aapor_show_calculation' => 'Show calculations:',
'srv_aapor_show_approximate_calculation' => 'Show approximate calculations:',
'srv_aapor_show_approximate' => 'Show approximate',
- 'srv_show_continue_later' => 'Display continue later option',
+ 'srv_show_continue_later' => 'Option to continue the survey at a later date',
'srv_themes_select' => 'Theme selection',
'srv_themes_mod' => 'Theme modifiation',
'srv_themes_mod2' => 'Currently editing',
@@ -6304,7 +6314,7 @@ $lang = array (
'srv_new_theme_alert' => 'New modification theme %s has been added. You can edit it below.',
'srv_new_theme_alert_css' => 'New CSS theme %s has been added. You can edit it below.',
'srv_js_tracking' => 'JavaScript code for tracking',
- 'js_tracking_note' => 'Copy the entire code (e.g. from Google Analytics), including the <script> block.',
+ 'js_tracking_note' => 'Enter the full tracking code (from e.g. Google Analytics), including the <script> block:',
'srv_editing_mode' => 'Advanced 1KA',
'srv_editing_mode_0' => 'Basic',
'srv_editing_mode_1' => 'Advanced',
@@ -6319,6 +6329,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Advanced mode',
'srv_email_example_txt' => 'To use this e-mail for sending invitations, you need to mark it as system variable in advanced settings.',
'srv_prikaz_default_valid' => 'The default selection of appropriate units:',
+ 'srv_prikaz_default_valid1' => 'Partially completed and completed units/surveys (with statuses 5, 6)',
+ 'srv_prikaz_default_valid2' => 'Completed units/surveys only (with status 6)',
'srv_prikaz_showItime' => 'Show respondent date:',
'srv_prikaz_showLineNumber' => 'Display the row number of the respondent:',
'srv_global_settnig_access_respondents' => 'Respondent access',
@@ -6508,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 (The user will be notified via e-mail that they have been registered under your overview) ',
+ 'srv_users_add_new_type2' => 'Activate an overview of an existing user (The user will be notified via e-mail that they are under your overview) ',
"srv_users_add_new_title" => 'Create new user in the systemUser will be notified about this registration with an e-mail. ',
'srv_users_add_assigned' => 'Add assigned users',
'srv_users_add_assigned_current' => 'Number of assigned users:',
@@ -6704,7 +6719,6 @@ $lang = array (
'srv_parapodatki' => 'Advanced paradata',
'pasteFromWordAlert' => 'Text copying is strongly discouraged! More >> ',
'srv_interaktivni_elementi' => 'Interactive elements',
- 'srv_hint' => 'Hint',
'srv_para_label_variables' => 'Variables',
'srv_para_label_details' => 'Details',
'srv_para_label_breaks' => 'Breaks',
@@ -7009,7 +7023,7 @@ $lang = array (
'one_click_create' => "Oneclick create",
'edit_hide' => "Hide",
'edit_show' => "Show",
- 'srv_show_title' => "Survey title for respondents",
+ 'srv_show_title' => "Survey title is visible to respondents",
'srv_create_show_intro' => "Intro is visible to respondents",
'srv_create_show_concl' => "Conclusion is visible to respondents",
'srv_create_show_title' => "Title is visible to respondents",
@@ -7031,9 +7045,9 @@ $lang = array (
'srv_tip_sample_t6_5_c1' => "Most important",
'srv_tip_sample_t6_5_c2' => "Least important",
'srv_settings_mobile_img' => "Display images on mobile devices",
- 'srv_settings_mobile_tables' => "Adjusted tables on mobile devices",
+ 'srv_settings_mobile_tables' => "Optimization of 'Table' type questions on mobile devices",
'srv_settings_mobile_tables_slide' => "Yes, with expanding",
- 'srv_settings_mobile_friendly' => "Mobile friendly",
+ 'srv_settings_mobile_friendly' => "Optimized survey display on mobile devices",
'srv_settings_mobile_friendly_off' => "Mobile friendly survey is turned off",
'srv_mySurvey_unallocated' => "Unallocated survey",
'srv_mySurvey_delete_folder' => "Deleter folder",
@@ -7072,7 +7086,7 @@ $lang = array (
'srv_select_box_vse' => "all",
'srv_orientacija_tabela_da_ne' => "Table YES/NO",
'srv_privacy_0' => "Without confirmation (link in footer)",
- 'srv_privacy_1' => "Confirmation with button next",
+ 'srv_privacy_1' => "Confirmation with 'Next' button",
'srv_privacy_2' => "Confirmation with checkbox",
'cookiePopupTitle' => 'Cookie usage',
'cookiePopupText' => '
This site uses cookies to improve user experience for logged in users.
Do you wish to proceed?
',
diff --git a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
index c121fd6e7..30696f9e7 100644
--- a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
+++ b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
@@ -61,7 +61,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+ $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -95,7 +95,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
- echo '';
+ echo '
';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -169,14 +169,14 @@ class MultigridMobileController extends Controller{
echo '
';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '
';
echo '
'.($grid_id != '' ? $grid_data_value : '').'
';
}
@@ -386,7 +386,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+ $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -439,7 +439,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
- echo '';
+ echo '
';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -512,7 +512,7 @@ class MultigridMobileController extends Controller{
echo '
';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- /*if($mobile_tables == 2)
+ /*if($tables_setting == 2)
echo '
';*/
echo '
';
+ echo '
';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -819,7 +819,7 @@ class MultigridMobileController extends Controller{
echo '
';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '
';
echo '
';
+ echo '
';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1059,11 +1059,7 @@ class MultigridMobileController extends Controller{
echo '
';
-
- // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- /*if($mobile_tables == 2)
- echo '
';*/
+ echo '
';
+ echo '
';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1397,7 +1393,7 @@ class MultigridMobileController extends Controller{
echo '
';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '
';
echo '
