diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index e46d4ac42..754528b58 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7759,7 +7759,7 @@ class Branching {
if ( ! ( mysqli_num_rows($sql1)==1 && $spr_id==0 ) ) {
- echo '
'.$lang['srv_add_cond'].' '.Help::display('srv_if_operator').':
+ echo '
'.$lang['srv_add_cond'].' '.Help::display('srv_if_operator').':
AND ,
AND NOT ,
@@ -8580,11 +8580,12 @@ class Branching {
$prev_grupa = 0;
- echo '
';
+ echo '';
+ echo '
';
- echo '
';
+ echo '';
- echo $lang['srv_loop_for'].' ';
+ echo $lang['srv_loop_for'].' ';
echo ' ';
$sql1 = sisplet_query("SELECT s.id, s.naslov, s.variable, s.gru_id, g.naslov AS grupa_naslov
@@ -8613,7 +8614,10 @@ class Branching {
if ($spremenljivka > 0 && ($tip==2 || $tip==3))
echo $lang['srv_loop_for_when'].(!$advanced?' '.$lang['srv_loop_when_checked']:'');
- echo '
';
+ echo '';
+
+
+ echo '';
if ($spremenljivka > 0 && ($tip==2 ||$tip==3)) { // spremenljivka je izbrana in ne gre za sn-imena
@@ -8656,18 +8660,24 @@ class Branching {
} elseif ($tip == 9) { //SN-imena - uporabimo vedno vseh 20 vrednosti
}
- echo '
';
+ echo '
';
+
if (!$advanced && $spremenljivka>0 && ($tip==2 || $tip==3)) {
- echo '
';
+
+ echo ' '.$lang['srv_advanced_options'].' ';
+ }); return false;">'.$lang['srv_advanced_options'].'';
+
+ echo '
';
}
- echo '
';
+ echo '
';
+ echo '
';
if ($spremenljivka > 0) {
$sql2 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id='$spremenljivka'");
@@ -8678,12 +8688,12 @@ class Branching {
if ($max == 0) $max = 20;
}
- echo ''.$lang['srv_loop_max'].': ';
+ echo ''.$lang['srv_loop_max'].': ';
if ($tip != 7)
echo ''.$lang['srv_all'].' ';
for ($i=1; $i<=$count; $i++)
echo ''.$i.' ';
- echo ' ';
+ echo '
';
}
}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index fe988c6bb..3459e7b59 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13203,17 +13203,17 @@ div.drop_setting_transition {
border-bottom: none;
}
.toolbox_holder .toolbox #locked_toolbar {
+ cursor: default;
position: absolute;
- top: 1px;
- left: 1px;
- width: 45px;
- height: 194px;
- padding: 140px 0 0 3px;
+ top: 0px;
+ left: 0px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 240px;
+ height: 450px;
background: rgba(30, 136, 229, 0.85);
}
-.toolbox_holder .toolbox #locked_toolbar span.lock_big {
- margin-left: 13px;
-}
.toolbox_holder .toolbox#toolbox_basic.forma {
height: 266px;
top: 235px;
@@ -13395,6 +13395,9 @@ div.drop_setting_transition {
.toolbox_holder.closed .toolbox_expand {
left: 55px !important;
}
+.toolbox_holder.closed #locked_toolbar {
+ width: 40px;
+}
@media only screen and (max-width: 1200px) {
.toolbox_holder {
width: 40px !important;
@@ -13409,6 +13412,9 @@ div.drop_setting_transition {
.toolbox_holder .toolbox_expand {
left: 55px !important;
}
+ .toolbox_holder #locked_toolbar {
+ width: 40px !important;
+ }
}
.mobile_add_question {
@@ -16592,13 +16598,18 @@ and open the template in the editor.
margin: 0;
width: auto;
}
-#branching li.if.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators,
-#branching li.block.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner #div_condition_editing_operators {
+#branching li.if.if_editing .if_content #div_condition_editing_inner .div_condition_bottom,
+#branching li.block.if_editing .if_content #div_condition_editing_inner .div_condition_bottom,
+#branching li.loop.if_editing .if_content #div_condition_editing_inner .div_condition_bottom {
margin: 4px 0 0 22px;
font-size: 14px;
font-weight: 400;
}
+#branching li.if.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom,
+#branching li.block.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom,
+#branching li.loop.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom {
+ margin: 12px 0 0 0;
+}
#branching li.endif:hover,
#branching li.endblock:hover,
#branching li.endloop:hover,
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index 29e096e44..9f353bab0 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -275,11 +275,15 @@ and open the template in the editor.
}
}
- #div_condition_editing_operators {
+ .div_condition_bottom {
margin: 4px 0 0 22px;
font-size: 14px;
font-weight: 400;
+
+ &.loop_bottom{
+ margin: 12px 0 0 0;
+ }
}
}
}
diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
index a81b3b687..68b3d2836 100644
--- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss
+++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
@@ -116,16 +116,19 @@
// Zaklenjen toolbox
#locked_toolbar {
+ cursor: default;
position: absolute;
- top: 1px;
- left: 1px;
- width: 45px;
- height: 194px;
- padding: 140px 0 0 3px;
+ top: 0px;
+ left: 0px;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ width: $branching_toolbox_size_big;
+ height: 450px;
+
background: rgba($blue, 0.85);
- span.lock_big {
- margin-left: 13px;
- }
}
toolbox_basic.forma {
@@ -368,6 +371,10 @@
.toolbox_expand{
left: 55px !important;
}
+
+ #locked_toolbar {
+ width: $branching_toolbox_size_small;
+ }
}
@media only screen and (max-width: 1200px) {
@@ -385,6 +392,10 @@
.toolbox_expand{
left: 55px !important;
}
+
+ #locked_toolbar {
+ width: $branching_toolbox_size_small !important;
+ }
}
}