may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravek visine popup okna za dodajanje pogojev (scroll)

Browse Source
This commit is contained in:
pero1203 2021-10-22 11:13:56 +02:00
parent 14d1cb1592
commit ab639578fb
4 changed files with 1387 additions and 1361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/survey/Branching.php
View File

@ -6828,6 +6828,9 @@ class Branching {
$spr_id = $row1['spr_id'];
}
echo '</div><!-- class="condition_editing_body"-->';
if ( ! ( mysqli_num_rows($sql1)==1 && $spr_id==0 ) ) {
echo '<div id="div_condition_editing_operators" style="padding-left:1%">'.$lang['srv_add_cond'].' '.Help::display('srv_if_operator').':
@ -6835,18 +6838,18 @@ class Branching {
<a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'1\', \''.$vrednost.'\'); return false;"><strong>&nbsp;AND NOT&nbsp;</strong></a>,
<a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'0\', \''.$vrednost.'\'); return false;"><strong>&nbsp;OR&nbsp;</strong></a>,
<a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'1\', \''.$vrednost.'\'); return false;"><strong>&nbsp;OR NOT&nbsp;</strong></a></div>';
}
echo '</div><!-- class="condition_editing_body"-->';
// blok
} elseif ($row['tip'] == 1) {
}
}
// blok
elseif ($row['tip'] == 1) {
//ko imamo BLOCK prikažemo začetek oklepaja
echo '<strong class="clr_bl">BLOCK</strong> <span class="colorblock">('.$row['number'].')</span>'.($row['enabled']==2?' FALSE ':'').($row['label']!=''?' <span class="if_comment">( '.$row['label'].' )</span>':'').'';
}
// zanka
} elseif ($row['tip'] == 2) {
elseif ($row['tip'] == 2) {
//začetni oklepaj za zanko
$this->loop_display($if);

3
admin/survey/script/branching.js
View File

@ -1303,8 +1303,7 @@ function condition_add(_if, conjunction, negation, vrednost) {
'noupdate': __vnosi + __analiza,
'anketa': srv_meta_anketa_id
}, function () {
$("#div_condition_editing_container").attr({scrollTop: $("#div_condition_editing_container").attr("scrollHeight")});
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
$(".condition_editing_body").animate({ scrollTop: $('.condition_editing_body').prop("scrollHeight")}, 1000);
});
}

2714
public/css/admin.css
View File

File diff suppressed because it is too large Load Diff

14
resources/sass/admin/branching/conditions.scss
View File

@ -65,6 +65,20 @@ span.endif {
background-color: $soft_blue_lighten;
padding-left: 6px;
}
.condition_editing_body{
max-height: 50vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
border: 1px $fieldset_border solid;
.tbl_condition_editing{
margin-bottom: 5px;
}
}
}
#div_condition_editing_operators {
padding: 5px 0;