diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index d353a8555..08955d1fa 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -9591,8 +9591,8 @@ class SurveyAdminSettings { echo '

'.$lang['srv_vrsta_survey_note_6_4'].'

'; echo '
'; - echo ''; - echo ''; + echo ' '; + echo ' '; echo '
'; echo ''; @@ -9614,19 +9614,22 @@ class SurveyAdminSettings { echo '
'.$lang['srv_voting'].''; - echo ''; - echo '
'.$lang['srv_voting_info'].''; + echo '

'.$lang['srv_voting_info'].'

'; + echo '

'.$lang['srv_voting_info_link'].'

'; + echo '

'.$lang['srv_voting_info_warning'].'

'; // Opozorilo, da so vabila ze vklopljena in zato modula ni mogoce vklopiti if(!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email')){ - echo '

'.$lang['srv_voting_info_error'].'
'; + echo '

'.$lang['srv_voting_info_error'].'

'; } + + echo '
'; + echo ' '; + echo ' '; + echo '
'; echo '
'; - - echo '
'; - + echo '
'; if(isset($modules['voting'])){ $sv = new SurveyVoting($this->anketa); @@ -9637,13 +9640,14 @@ class SurveyAdminSettings { elseif ($_GET['a'] == 'advanced_paradata'){ echo '
'.$lang['srv_advanced_paradata'].''; - echo ''; - //echo '
'.$lang['srv_vrsta_survey_note_6_4'].''; - echo '
'; - - echo '
'; - + + echo '
'; + echo ' '; + echo ' '; + echo '
'; + + echo ''; + echo '
'; if(isset($modules['advanced_paradata'])){ $sap = new SurveyAdvancedParadata($this->anketa); diff --git a/admin/survey/classes/class.SurveyStatistic.php b/admin/survey/classes/class.SurveyStatistic.php index 00c3cb9a5..c150f885d 100644 --- a/admin/survey/classes/class.SurveyStatistic.php +++ b/admin/survey/classes/class.SurveyStatistic.php @@ -807,7 +807,7 @@ class SurveyStatistic { echo '
'; // nimamo še vnosov - if ($allUserCount == 0 || $paradata_date == 1) { + if ($allUserCount == 0 || ($paradata_date == 1 && !SurveyInfo::getInstance()->checkSurveyModule('voting'))){ echo '
'; $this->DisplayInfoView(); diff --git a/admin/survey/modules/mod_voting/class.SurveyVoting.php b/admin/survey/modules/mod_voting/class.SurveyVoting.php index f551dcbdc..b1fdec9bc 100644 --- a/admin/survey/modules/mod_voting/class.SurveyVoting.php +++ b/admin/survey/modules/mod_voting/class.SurveyVoting.php @@ -47,15 +47,13 @@ class SurveyVoting{ echo '
'.$lang['settings'].''; - echo '
'; - - echo $lang['srv_voting_edit1'].' '.$lang['srv_voting_edit2'].'.'; + echo '

'; + echo $lang['srv_voting_edit1'].' '.$lang['srv_voting_edit2'].'.'; + echo '

'; - echo '

'; - - echo $lang['srv_voting_invitations1'].' '.$lang['srv_voting_invitations2'].'.'; - - echo '

'; + echo '

'; + echo $lang['srv_voting_invitations1'].' '.$lang['srv_voting_invitations2'].'.'; + echo '

'; echo '
'; } diff --git a/lang/1.php b/lang/1.php index 1fd55873f..c635bc130 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3162,6 +3162,7 @@ $lang = array ( "srv_vrsta_survey_type_14" => "Klepet", "srv_vrsta_survey_type_15" => "Panel", "srv_vrsta_survey_type_16" => "Napredni parapodatki", + "srv_vrsta_survey_type_16_on" => "Vklopi modul 'Napredni parapodatki'", "srv_vrsta_survey_type_17" => "JSON izvoz ankete", "srv_vrsta_survey_type_18" => "Volitve", "srv_vrsta_survey_with_pool" => "Dodajanje glasovanja", @@ -3244,7 +3245,10 @@ $lang = array ( "srv_zakljucek_vprasalnika" => "Zaključek vprašalnika", "srv_kviz_konec_note" => "Če ni izbrana nobena opcija, vidi rezultate samo administrator", "srv_voting" => "Volitve", - "srv_voting_info" => "Modul volitve omogoča pošiljanje vabil z izklopom vseh parapodatkov in brez kakršnekoli možnosti povezovanja podatkov z elektronskimi naslovi in drugimi identifikatorji.
Po vklopu, izklop modula ni več mogoč!", + "srv_voting_on" => "Vklopi modul 'Volitve'", + "srv_voting_info" => "Modul volitve omogoča pošiljanje vabil z izklopom vseh parapodatkov in brez kakršnekoli možnosti povezovanja podatkov z elektronskimi naslovi in drugimi identifikatorji.", + "srv_voting_info_link" => "Več informacij o modulu 'Volitve'", + "srv_voting_info_warning" => "Po vklopu, izklop modula na anketi ni več mogoč!", "srv_voting_info_error" => "V anketi so bila že vklopljena oziroma poslana email vabila, zato modula na tej anketi ni mogoče vklopiti.", "srv_voting_edit1" => "Vprašalnik urejate v zavihku", "srv_voting_edit2" => "Urejanje", diff --git a/lang/2.php b/lang/2.php index 4e433ef2b..67495cc30 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3135,6 +3135,7 @@ $lang = array ( "srv_vrsta_survey_type_14" => "Chat", "srv_vrsta_survey_type_15" => "Panel", "srv_vrsta_survey_type_16" => "Advanced paradata", + "srv_vrsta_survey_type_16_on" => "Activate 'Advanced paradata' module", "srv_vrsta_survey_type_17" => "JSON survey export", "srv_vrsta_survey_type_18" => "Voting", "srv_vrsta_survey_with_pool" => "Add vote", @@ -3215,7 +3216,10 @@ $lang = array ( "srv_zakljucek_vprasalnika" => "Survey end", "srv_kviz_konec_note" => "If no option is selected, only administrator can view results", "srv_voting" => "Voting", - "srv_voting_info" => "The Voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.
After switching on, switching off the module is no longer possible!", + "srv_voting_on" => "Activate the 'Voting' module", + "srv_voting_info" => "The Voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.", + "srv_voting_info_link" => "More info about 'voting' module", + "srv_voting_info_warning" => "After switching on, switching off the module is no longer possible!", "srv_voting_info_error" => "Email invitations have already been activated or sent, so the module cannot be activated in this survey.", "srv_voting_edit1" => "You can edit the questionnaire in a tab", "srv_voting_edit2" => "Edit",