diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 57ca7034d..3996dd255 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -7386,8 +7386,9 @@ class Branching { } // Pogoj pri npr. obvescanju elseif($vrednost == -3){ - echo '

'.$lang['urejanje_pogoj_popup'].'

'; + echo 'IF'.$lang['urejanje_pogoj_popup'].''; echo ''; + echo ''; } // Validacija elseif($vrednost == -4){ diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 3b97b76a5..5bf35d840 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -2201,6 +2201,7 @@ class SurveyAdmin // Prikazemo levi meni po potrebi private function displayLeftMenu(){ + global $lang; $hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null); @@ -2298,14 +2299,14 @@ class SurveyAdmin // Arhiv levi meni elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){ - echo '
'; + echo ''.$lang['srv_arhivi'].''; + echo ''; - echo '
'; } } diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index aed4bbcc3..8b51c045f 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -1539,7 +1539,7 @@ class SurveyAdminSettings { echo '
'.$lang['srv_extra_translations'].' '; if ($row['multilang'] == 1) { - echo ' '; $lang_id = (int)$_GET['lang_id']; if ($lang_id > 0) @@ -1563,33 +1563,26 @@ class SurveyAdminSettings { if ($row['multilang'] == 1 && $lang_id > 0) { //echo '

'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'

'; } - echo '

'.$lang['srv_info_language'].'

'; - echo '
'; echo ''; // da vemo, da nastavljamo ta besedila + + // Tabela standardnih besed + echo ''; + echo ''; - echo '

 '.($lang_id>0?$lang['srv_multilang']:$lang['srv_language_respons_1']).':'; - + echo '

'; + echo ''; + + // nazaj na administrativni jezik $file = '../../lang/'.$lang_admin.'.php'; include($file); - - echo '

'; - - echo ''.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).''; - echo ''.$lang['srv_std_second'].''; - echo ''; - echo ''.$lang['srv_std_translation'].' '; - - echo '


'; - - echo '

'; + echo '

'; + echo ''; // jezik nastavimo na nastavitev za respondente, ker ta text dejansko nastavljamo $file = '../../lang/'.$lang_resp.'.php'; @@ -1641,16 +1634,18 @@ class SurveyAdminSettings { $this->extra_translation('srv_survey_non_active_notStarted', 1); $this->extra_translation('srv_survey_non_active_expired', 1); $this->extra_translation('srv_survey_non_active_voteLimit', 1); - - - echo '

'; - + // nastavimo jezik nazaj $file = '../../lang/'.$lang_admin.'.php'; include($file); - + + echo '
'.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).''.$lang['srv_std_second'].': '; $file = '../../lang/'.$lang_resp.'.php'; include($file); - echo ' '.$lang['language'].'

'; - - // nazaj na administrativnega + echo $lang['language'].'
'.$lang['srv_std_translation'].'
'; + echo '
'; - + + //Link na zavihek Jezik + echo '

'.$lang['srv_info_language'].'

'; + echo '
'; @@ -2252,16 +2247,17 @@ class SurveyAdminSettings { if($text == 'srv_nextpage_uvod') $next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc']; - echo '
'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '('.$next_uvod.')' : '').' '; - echo ''.$lang[$text].' '; - echo '
'.$value.'
'; - + echo ''; + echo ''.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '('.$next_uvod.')' : '').' '; + echo ''.$lang[$text].''; + echo '
'.$value.'
'; + if($editor == 1) echo ''; echo ''; - echo '
'; + echo ''; } function anketa_nice_links () { @@ -4156,33 +4152,59 @@ class SurveyAdminSettings { function arhivi() {//OSTANE global $lang; - echo '
'; + echo '
'; echo '' . $lang['srv_questionnaire_archives'] . ''; - - echo '

' . $lang['srv_backup_label'] . '

'; - echo '

'.$lang['srv_note'].':

'; - - echo ''; - - echo '

'; + + echo '

'.$lang['srv_questionnaire_archives_text'].'

'; + + echo '
'; + echo $lang['srv_questionnaire_archives_note'].':'; + echo ''; + echo '
'; + + echo '
'; + echo ''; + echo '
'; // Seznam ustvarjenih arhivov $sql = sisplet_query("SELECT a.id, a.naslov, a.intro_opomba, a.insert_time, a.edit_time, CONCAT(i.name, ' ', i.surname) AS insert_name, CONCAT(e.name, ' ', e.surname) AS edit_name FROM srv_anketa a, users i, users e WHERE a.insert_uid=i.id AND a.edit_uid=e.id AND a.backup = '$this->anketa' AND a.active>='0' ORDER BY a.insert_time DESC"); if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - if (mysqli_num_rows($sql) > 0) - echo '
' . $lang['srv_backup_list'] . ':'; - - while ($row = mysqli_fetch_array($sql)) { - echo '
'; - echo '' . $row['naslov'] . ' '.($row['intro_opomba']!='' ? ' - '.$row['intro_opomba'].'' : ''); - echo '
(' . $lang['sent_by'] . ': ' . $row['insert_name'].' ' . datetime($row['insert_time']) . ', ' . $lang['edit_by'] . ': ' . $row['edit_name'].' ' . datetime($row['edit_time']) . ')'; - echo '
' . $lang['srv_survey_archives_delete_survey'] . ', ' . $lang['srv_anketarestore'] . ''; - echo '
'; + if (mysqli_num_rows($sql) > 0) { + echo '

' . $lang['srv_backup_list'] . ':

'; + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + while ($row = mysqli_fetch_array($sql)) { + echo ''; + echo ''; + echo ''; + echo ''; + + //Ikone + echo ''; + + echo ''; + } + + echo '
'.$lang['srv_questionnaire_archives_date'].''.$lang['srv_questionnaire_archives_by'].''.$lang['srv_questionnaire_archives_note2'].'
'.datetime($row['insert_time']).''.$row['insert_name'].''.($row['intro_opomba']!='' ? $row['intro_opomba'] : '/').''; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + } + + echo '
'; } diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php index 874e26e83..30ebe9610 100644 --- a/admin/survey/classes/class.SurveyStaticHtml.php +++ b/admin/survey/classes/class.SurveyStaticHtml.php @@ -168,52 +168,56 @@ class SurveyStaticHtml $this->survey_type = $sa->getSurvey_type($this->sid); echo '