diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 081b24952..15ba7dc6a 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -971,7 +971,7 @@ class Branching { echo '' . $lang['srv_new_question_icon'] . ''; echo '
'; echo '
' . $lang['srv_tip_sample_t21'] . '
'; - echo '
'; + echo '
'; echo '
'; echo ''; @@ -3987,8 +3987,11 @@ class Branching { $num = mysqli_num_rows($sql1); $size = $num * 50; + + echo '
'; + //zaslon razdelimo na dva dela - izris leve strani - echo '
'; + echo '
'; while ($row1 = mysqli_fetch_array($sql1)) { @@ -4017,17 +4020,21 @@ class Branching { if ($length > 30) $class = 'ranking_long'; $class = 'ranking'; echo '
'; + echo ''; + + + echo '
lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
'; + + echo '
'; echo ' '; echo ' '; echo ' '; echo ' '; echo '
'; - - echo '
lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
'; - + // koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; @@ -4039,18 +4046,20 @@ class Branching { if ($this->condition_check($row1['if_id']) != 0) echo ' '; } - echo '
'; + echo '
'; } + echo '
'; + //izris desne strani************************************************************************************** //***********za skatlasto obliko $display_drag_and_drop_new_look = ($spremenljivkaParams->get('display_drag_and_drop_new_look') ? $spremenljivkaParams->get('display_drag_and_drop_new_look') : 0); //za checkbox //***********za skatlasto obliko - konec - echo '
'; + echo '
'; $sql2 = sisplet_query("SELECT id, naslov, variable, vrstni_red FROM srv_grid WHERE spr_id='$spremenljivka' AND other=0 ORDER BY vrstni_red"); $row2 = mysqli_fetch_array($sql2); @@ -4119,12 +4128,11 @@ class Branching { echo ''; - echo '
'; //half2_$spremenljivka + echo '
'; // half2_$spremenljivka - echo '
'; + echo '
'; // end ranking_holder; //***********************Drag and drop grid konec************************************************************* - } //Image hot spot******************************************************************************************************** elseif( ($row['tip'] == 6) && $row['enota'] == 10){ //image hot spot @@ -8831,22 +8839,22 @@ class Branching { echo ''; + echo '
'; - echo '
'; + echo '
'; // kalkulacija kot spremenljivka (lahko jo zbrisemo) - if ($condition < 0) { - echo ''; - } + if ($condition < 0) + echo ' '; - echo ''; - - echo ''; - echo '
'; + echo ' '; + echo ' '; + echo '
'; echo '
'; + echo '
'.$lang['srv_more'].'
'; ?>'; + + echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; echo ''; - echo ''; + echo ''; + echo ''; - echo ''; - echo ''; - #echo '
'; + + echo ''; + + echo ''; + + echo '
'; + //Izvoz v PDF / RTF / XLS $_url1 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode( serialize( @@ -3369,14 +3378,18 @@ class SurveyDataDisplay{ array( 'b'=>'export', 'a'=>'list_xls', 'anketa'=>$anketa))); - echo '
'; - echo '  '; + + + echo '
'; + + /*echo '  '; echo '  '; - echo ''; + echo '';*/ - echo '
'; echo $lang['srv_data_print_preview']; + echo '
'; + self::$printPreview = true; self::$_VARS[VAR_DATA] = 1; @@ -3391,27 +3404,23 @@ class SurveyDataDisplay{ unset(self::$_SVP_PV['invitation']); } - - # ponastavimo nastavitve- filter + + # ponastavimo nastavitve- filter self::setUpFilter(); self::DisplayDataTable(); + echo '
'; - echo '