diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 894c74679..84a5505e6 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -132,44 +132,39 @@ class Branching {
$gl = new Glasovanje($this->anketa);
- //div z nastavitvami za glasovanje
- echo '
';
- //$this->display_glasovanje_settings();
+ // div z nastavitvami za glasovanje
+ echo '
';
+ echo '
';
$gl->display_glasovanje_settings();
- echo '
';
+ echo '
';
+ echo '
';
echo '';
- echo '
';
-
- //$this->branching_struktura();
+ echo '
';
$gl = new Glasovanje($this->anketa);
$gl->vprasanja();
+ echo '
'; // #branching
- echo '
'; // #branching
-
- //$this->vprasanje_float_editing();
- echo '
';
+ echo '
';
echo '
'; // #placeholder
-
- $this->toolbox();
}
// Navadna anketa ali forma
else{
+
+ Common::Init($this->anketa);
+
echo '';
- echo '
'; // #branching
-
- $this->vprasanje_float_editing();
+ echo '
';
echo '
'; // #placeholder
@@ -177,11 +172,11 @@ class Branching {
}
// forma in glasovanje - hitre nastavitve na desni - ce imamo odprto knjiznico ne prikazemo zaradi prekrivanja
- if ( ($this->survey_type == 1 || $this->survey_type == 0) && ($row['toolbox'] < 3) ) {
+ if ( $this->survey_type == 1 || $this->survey_type == 0 ) {
echo 'survey_type==0 ? ' class="glas_quick_settings"':'').'>';
- echo '
survey_type==0 ? ' class="glas_quick_settings"':'').'>';
+ echo '
survey_type==0 ? ' class="glas_quick_settings"':'').'>';
$this->toolbox_settings();
- echo '
';
+ echo '
';
echo '
';
}
@@ -193,18 +188,6 @@ class Branching {
}
?>';
- echo 'alert(document.getElementsByTagName("*").length);';
- echo '';*/
-
- }
-
-
- function vprasanje_float_editing () {
-
- echo '
';
-
}
@@ -314,8 +297,7 @@ class Branching {
echo '';
- if($this->survey_type != 0)
- $this->toolbox_basic2();
+ $this->toolbox_basic2();
echo '';
@@ -324,6 +306,7 @@ class Branching {
echo '
';
+
// Mobile add question
MobileSurveyAdmin::displayAddQuestion($this->anketa);
}
@@ -1576,7 +1559,7 @@ class Branching {
$emailDiv = SurveySetting::getInstance()->getSurveyMiscSetting('srvtoolbox_form_email');
- //OBVESCANJE
+ // OBVESCANJE
$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$this->anketa'");
if (!$sqlAlert)
echo mysqli_error($GLOBALS['connect_db']);
@@ -1584,52 +1567,49 @@ class Branching {
$rowAlert['finish_other'] == 1 || ($rowAlert['finish_other_emails'] && $rowAlert['finish_other'] != 0) ? $checked = true : $checked = false;
- echo '';
- $alertDiv == 1 ? $obvescanje = 0 : $obvescanje = 1;
- echo '';
+ $alertDiv == 1 ? $obvescanje = 0 : $obvescanje = 1;
- $img = ($status1 == 'none') ? ' class="faicon icon-blue plus"' : ' class="faicon icon-blue minus"';
- echo ' ';
- echo '' . $lang['srv_alert_link_form'] . ' ';
- echo '
';
+ echo '';
+
- //echo '' . $lang['srv_alert_prejemnik'] . ' ';
$sas = new SurveyAdminSettings();
echo '';
}
/**
@@ -7706,7 +7686,7 @@ class Branching {
echo ''.$lang['srv_zapri'].' ';
echo '';
echo '';
- echo ''.$lang['srv_if_rem'].' '."\n\r";
+ echo 'aaa'.$lang['srv_if_rem'].' '."\n\r";
echo ' ';
}
diff --git a/admin/survey/Glasovanje.php b/admin/survey/Glasovanje.php
index ac2b28bdb..60e92185d 100644
--- a/admin/survey/Glasovanje.php
+++ b/admin/survey/Glasovanje.php
@@ -100,222 +100,238 @@ class Glasovanje {
global $site_path;
global $admin_type;
- echo '