From 7ee7626db42e7bb8ca70f15120e2f859bcb5e0b5 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 8 Aug 2022 11:19:28 +0200
Subject: [PATCH] Zamenjan vrstni red sklopov tipov vprasanj pri dodajanju v
 anketo

---
 admin/survey/Branching.php | 50 +++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 232370f24..c64a5606d 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -439,9 +439,11 @@ class Branching {
         // Vsebina okna
         echo '<div class="toolbox_expand_segments_holder">';
 
-		echo '<div class="toolbox_expand_segment">';
 
+        // Segment kategorije
+		echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna2'].'</p>';
+
 		echo '<p class="new_spr adv segment_option" tip="1">'.$lang['srv_vprasanje_tip_1'].'</p>';
 		echo '<p class="new_spr adv segment_option" tip="3">'.$lang['srv_vprasanje_tip_1'].' - '.$lang['srv_dropdown'].'</p>';
 		echo '<p class="new_spr adv segment_option" tip="2">'.$lang['srv_vprasanje_tip_2'].'</p>';
@@ -449,6 +451,18 @@ class Branching {
         echo '</div>';
 
 
+        // Segment vnos
+        echo '<div class="toolbox_expand_segment">';
+		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
+
+		echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
+		echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
+		echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
+
+        echo '</div>';
+
+
+        // Segment tabele
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_vprasanje_tables'].'</p>';
 
@@ -460,6 +474,19 @@ class Branching {
         echo '</div>';
 
 
+        // Segment ostale tabele
+        echo '<div class="toolbox_expand_segment">';
+        echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
+
+        echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
+        echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
+        echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
+        echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
+
+        echo '</div>';
+
+
+        // Segment posebna vprasanja
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_sklop_posebna'].'</p>';
 
@@ -473,27 +500,6 @@ class Branching {
 		echo '</div>';
 
 
-		echo '<div class="toolbox_expand_segment">';
-		echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
-
-		echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
-		echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
-
-        echo '</div>';
-
-
-        echo '<div class="toolbox_expand_segment">';
-		echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
-
-		echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
-		echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
-		echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
-
-        echo '</div>';
-
-
         echo '<div class="toolbox_expand_segment">';
 		echo '<p class="segment_title">'.$lang['srv_standardni_vnosi'].'</p>';