diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index c4febcab3..9f054498c 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -37,6 +37,7 @@
* slideshow (prezentacija)
* social_network (socialna omrežja - generator imen)
* quiz (kviz s pravilnimi/napacnimi odgovori)
+ * voting (volitve z anonimnimi vabili)
* uporabnost (evalvacija strani - split screen)
* panel (povezovanje ankete s panelom - npr. Valicon, GFK...)
* 360_stopinj (adecco)
@@ -1168,6 +1169,18 @@ class SurveyAdmin
echo '';
echo '';
echo '';
+ }
+ # volitve
+ if (isset($modules['voting'])) {
+ $css = ($this->first_action == A_VOTING) ? 'on' : 'off';
+
+ echo '
';
+
+ echo '';
+ echo '';
+ echo '';
+ echo '';
+ echo '';
}
# napredni parapodatki
if (isset($modules['advanced_paradata'])) {
@@ -1776,6 +1789,14 @@ class SurveyAdmin
|| isset($modules['slideshow'])) ? '' : ' side-right';
echo '';
echo '' . $lang['srv_kviz'] . '';
+ }
+ #volitve
+ if (isset($modules['voting'])) {
+ $_active = ($_GET['a'] == A_VOTING) ? ' active' : '';
+ $_right = (isset($modules['social_network'])
+ || isset($modules['slideshow'])) ? '' : ' side-right';
+ echo '';
+ echo '' . $lang['srv_voting'] . '';
}
#napredni parapodatki
if (isset($modules['advanced_paradata'])) {
@@ -2183,6 +2204,7 @@ class SurveyAdmin
|| $_GET['a'] == 'uporabnost'
|| ($_GET['a'] == 'hierarhija_superadmin' && $hierarhija_type < 5)
|| $_GET['a'] == 'kviz'
+ || $_GET['a'] == 'voting'
|| $_GET['a'] == 'slideshow'
|| $_GET['a'] == 'vnos'
|| $_GET['a'] == A_TELEPHONE
@@ -2433,6 +2455,7 @@ class SurveyAdmin
elseif ($_GET['a'] == 'uporabnost'
|| ($_GET['a'] == 'hierarhija_superadmin' && $hierarhija_type < 5)
|| $_GET['a'] == 'kviz'
+ || $_GET['a'] == 'voting'
|| $_GET['a'] == 'slideshow'
|| $_GET['a'] == 'vnos'
|| $_GET['a'] == A_TELEPHONE
@@ -3143,6 +3166,10 @@ class SurveyAdmin
echo '';
echo 'checkUserAccess($what='kviz') ? 'class="user_access_locked"' : '').'>' . $lang['srv_vrsta_survey_type_6'] . ' ';
+ # Volitve
+ echo '';
+ echo 'checkUserAccess($what='voting') ? 'class="user_access_locked"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . ' ';
+
# Socialna omrezja
echo '';
echo 'checkUserAccess($what='social_network') ? 'class="user_access_locked"' : '').'>' . $lang['srv_vrsta_survey_type_8'] . ' ';
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 531cfa638..3e598b140 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6119,6 +6119,11 @@ class SurveyAdminAjax {
$sq = new SurveyQuiz($this->anketa);
$sq->displaySettings();
}
+ elseif ($what == 'voting' && $value == '1'){
+ // volitve
+ $sv = new SurveyVoting($this->anketa);
+ $sv->displaySettings();
+ }
elseif ($what == 'advanced_paradata' && $value == '1'){
// kviz
$sap = new SurveyAdvancedParadata($this->anketa);
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 04edbc78d..502edd6a2 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -8697,6 +8697,22 @@ class SurveyAdminSettings {
}
echo '';
}
+ elseif ($_GET['a'] == 'voting'){
+
+ echo '';
+
+ echo '
';
+
+ echo '';
+ if(isset($modules['voting'])){
+ $sv = new SurveyVoting($this->anketa);
+ $sv->displaySettings();
+ }
+ echo '
';
+ }
elseif ($_GET['a'] == 'advanced_paradata'){
echo '