Redesign - urejanje vprasalnika - pogoji
This commit is contained in:
pero1203
parent
8b73d02c68
commit
587e40392d
@ -6863,48 +6863,49 @@ class Branching {
|
||||
echo ' ) ';
|
||||
|
||||
}
|
||||
//echo '</span>';
|
||||
|
||||
if ($row_if['label'] != '') {
|
||||
echo ' <span class="if_comment">(';
|
||||
echo ' '.$row_if['label'].' ';
|
||||
echo ')</span> ';
|
||||
|
||||
}
|
||||
|
||||
$condition_check = $this->condition_check($if);
|
||||
|
||||
if ($long_alert) {
|
||||
if ($c == 1 && $spr_id == 0)
|
||||
if ($this->count_spr_in_if($if) > 1) {
|
||||
|
||||
if ($c == 1 && $spr_id == 0){
|
||||
|
||||
if ($this->count_spr_in_if($if) > 1) {
|
||||
echo '<em>'.$lang['srv_edit_condition_question'].'</em>';
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$spr = $this->find_first_in_if($if);
|
||||
$r = Cache::srv_spremenljivka($spr);
|
||||
if (!$spr > 0) $r['variable'] = '';
|
||||
echo '<em>'.sprintf($lang['srv_edit_condition_question1'], '<span class="variable">'.$r['variable'].'</span>').'</em>';
|
||||
}
|
||||
//if ($condition_check >= 1 && $condition_check <= 5 ) {
|
||||
echo '<span class="error_display">';
|
||||
if ($condition_check == 1)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_oklepaji'].'</span>';
|
||||
if ($condition_check == 2) {
|
||||
if (mysqli_num_rows($sql) > 1) // ko nardimo nov if, ne prikazemo takoj errorja
|
||||
echo '<span class="faicon warning icon-orange"></span> <span style="color:red">'.$lang['srv_error_spremenljivka'].'</span>';
|
||||
} elseif ($condition_check == 3)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_vrednost'].'</span>';
|
||||
if ($condition_check == 4)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_numericno'].'</span>';
|
||||
if ($condition_check == 5)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_calculation'].'</span>';
|
||||
if ($condition_check == 6)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_date'].'</span>';
|
||||
echo '</span>';
|
||||
//}
|
||||
|
||||
} else {
|
||||
echo '<span class="error_display">';
|
||||
if ($condition_check == 1)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_oklepaji'].'</span>';
|
||||
if ($condition_check == 2) {
|
||||
if (mysqli_num_rows($sql) > 1) // ko nardimo nov if, ne prikazemo takoj errorja
|
||||
echo '<span class="faicon warning icon-orange"></span> <span style="color:red">'.$lang['srv_error_spremenljivka'].'</span>';
|
||||
} elseif ($condition_check == 3)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_vrednost'].'</span>';
|
||||
if ($condition_check == 4)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_numericno'].'</span>';
|
||||
if ($condition_check == 5)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_calculation'].'</span>';
|
||||
if ($condition_check == 6)
|
||||
echo '<span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_error_date'].'</span>';
|
||||
echo '</span>';
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ($condition_check != 0)
|
||||
echo ' <span class="faicon warning red"></span> <span class="red">'.$lang['srv_if_error'].'</span>';
|
||||
echo ' <span class="if_warning"><span class="faicon warning"></span>'.$lang['srv_if_error'].'</span>';
|
||||
|
||||
}
|
||||
|
||||
@ -7440,6 +7441,8 @@ class Branching {
|
||||
|
||||
echo '<div class="condition_header">';
|
||||
|
||||
echo '<span class="faicon edit"></span>';
|
||||
|
||||
if ($row['tip'] == 0)
|
||||
echo $lang['oblikovanje_if'];
|
||||
elseif ($row['tip'] == 1)
|
||||
@ -7756,12 +7759,12 @@ class Branching {
|
||||
|
||||
|
||||
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').':
|
||||
echo '<div id="div_condition_editing_operators">'.$lang['srv_add_cond'].' '.Help::display('srv_if_operator').':
|
||||
|
||||
<a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'0\', \''.$vrednost.'\'); return false;"><strong> AND </strong></a>,
|
||||
<a href="#" onclick="condition_add(\''.$if.'\', \'0\', \'1\', \''.$vrednost.'\'); return false;"><strong> AND NOT </strong></a>,
|
||||
<a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'0\', \''.$vrednost.'\'); return false;"><strong> OR </strong></a>,
|
||||
<a href="#" onclick="condition_add(\''.$if.'\', \'1\', \'1\', \''.$vrednost.'\'); return false;"><strong> OR NOT </strong></a></div>';
|
||||
<a href="#" class="noline" onclick="condition_add(\''.$if.'\', \'0\', \'0\', \''.$vrednost.'\'); return false;">AND</a>,
|
||||
<a href="#" class="noline" onclick="condition_add(\''.$if.'\', \'0\', \'1\', \''.$vrednost.'\'); return false;">AND NOT</a>,
|
||||
<a href="#" class="noline" onclick="condition_add(\''.$if.'\', \'1\', \'0\', \''.$vrednost.'\'); return false;">OR</a>,
|
||||
<a href="#" class="noline" onclick="condition_add(\''.$if.'\', \'1\', \'1\', \''.$vrednost.'\'); return false;">OR NOT</a></div>';
|
||||
}
|
||||
}
|
||||
// blok
|
||||
@ -7825,16 +7828,19 @@ class Branching {
|
||||
|
||||
if ($vrednost == 0) { // ce imamo obicn if v branchingu ali v DisplayData
|
||||
$vrstni_red = $this->vrstni_red($this->find_before_if($row['if_id']));
|
||||
} elseif ($vrednost == -1 or $vrednost == -2 or $vrednost == -3) { // filter v DisplayData.php (prikazemo vse spremenljivke)
|
||||
}
|
||||
elseif ($vrednost == -1 or $vrednost == -2 or $vrednost == -3) { // filter v DisplayData.php (prikazemo vse spremenljivke)
|
||||
$vrstni_red = PHP_INT_MAX;
|
||||
} elseif ($vrednost == -4) { // validacija
|
||||
}
|
||||
elseif ($vrednost == -4) { // validacija
|
||||
if (!$this->spremenljivka > 0) {
|
||||
$sqlv = sisplet_query("SELECT spr_id FROM srv_validation WHERE if_id = '$row[if_id]'");
|
||||
$rowv = mysqli_fetch_array($sqlv);
|
||||
$this->spremenljivka = $rowv['spr_id'];
|
||||
}
|
||||
$vrstni_red = $this->vrstni_red($this->spremenljivka);
|
||||
} else { // ce imamo podif na vrednosti
|
||||
}
|
||||
else { // ce imamo podif na vrednosti
|
||||
$sqlv = sisplet_query("SELECT spr_id FROM srv_vrednost WHERE if_id='$row[if_id]'");
|
||||
$rowv = mysqli_fetch_array($sqlv);
|
||||
$vrstni_red = $this->vrstni_red($rowv['spr_id']);
|
||||
@ -7844,44 +7850,13 @@ class Branching {
|
||||
if (!$sql_count) die();
|
||||
$row_count = mysqli_fetch_array($sql_count);
|
||||
|
||||
if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) {
|
||||
echo '<table class="tbl_condition_editing">';
|
||||
echo '<tr>';
|
||||
echo '<th style="text-align:center; width:50px">'.$lang['srv_oklepaji'].'</th>'; // gumbi oklepaji
|
||||
echo '<th style="width:70px"> </th>'; // logicni operatorji
|
||||
echo '<th style="width:50px"> </th>'; // oklepaji
|
||||
echo '<th > </th>';
|
||||
echo '<th style="text-align:center; width:50px;">'.$lang['srv_zaklepaji'].'</th>'; // gumbi zaklepaji
|
||||
echo '<th style="text-align:center; width:60px">'.$lang['edit2'].'</th>'; // move
|
||||
echo '</tr>';
|
||||
echo '</table>';
|
||||
|
||||
} elseif ($row['vrstni_red'] == 1) {
|
||||
echo '<table class="tbl_condition_editing"><tr><th> </th></tr></table>';
|
||||
}
|
||||
|
||||
// form
|
||||
echo '<form name="condition_'.$condition.'" action="" method="post" onsubmit="condition_edit(\''.$condition.'\'); return false;" id="condition_'.$condition.'">'."\n\r";
|
||||
|
||||
echo '<table class="tbl_condition_editing" style="margin-bottom:10px; background-color:white" >';
|
||||
echo '<tr>';
|
||||
|
||||
// left_bracket
|
||||
if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
|
||||
echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
|
||||
if ($row['left_bracket'] > 0)
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
|
||||
else
|
||||
echo '<span class="faicon delete_circle icon-grey_normal"></span>';
|
||||
} else {
|
||||
echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<form name="condition_'.$condition.'" action="" method="post" onsubmit="condition_edit(\''.$condition.'\'); return false;" id="condition_'.$condition.'">';
|
||||
|
||||
|
||||
// conjunction
|
||||
echo '<td class="tbl_ce_tb white" style="width:80px; text-align:center">';
|
||||
// Operator pred pogojem
|
||||
echo '<div class="condition_editing_row conjunction">';
|
||||
|
||||
$operator = $row['conjunction'].'_'.$row['negation'];
|
||||
|
||||
@ -7895,30 +7870,67 @@ class Branching {
|
||||
}
|
||||
else {
|
||||
|
||||
echo '<select name="conjunction_dropdown_'.$condition.'" id="conjunction_dropdown_'.$condition.'" onChange="conjunction_dropdown_edit(\''.$condition.'\'); return false;">';
|
||||
echo '<select name="conjunction_dropdown_'.$condition.'" id="conjunction_dropdown_'.$condition.'" class="dropdown medium" onChange="conjunction_dropdown_edit(\''.$condition.'\'); return false;">';
|
||||
echo ' <option value="0_0" '.($operator == '0_0' ? 'selected="selected"' : '').'>AND</option>';
|
||||
echo ' <option value="1_0" '.($operator == '1_0' ? 'selected="selected"' : '').'>OR</option>';
|
||||
echo ' <option value="0_1" '.($operator == '0_1' ? 'selected="selected"' : '').'>AND NOT</option>';
|
||||
echo ' <option value="1_1" '.($operator == '1_1' ? 'selected="selected"' : '').'>OR NOT</option>';
|
||||
echo '</select>';
|
||||
}
|
||||
|
||||
echo '</td>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Urejanje 1 vrstice pogoja
|
||||
echo '<div class="condition_editing_row">';
|
||||
|
||||
|
||||
// Move handle
|
||||
echo '<div class="move_holder">';
|
||||
if ($row_count['count'] != 1 )
|
||||
echo '<span class="faicon move_updown" title="'.$lang['srv_move'].'"></span>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Glavni del urejanja
|
||||
echo '<div class="white_holder">';
|
||||
|
||||
|
||||
// left_bracket
|
||||
echo '<div class="column bracket left">';
|
||||
|
||||
if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
|
||||
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
|
||||
|
||||
if ($row['left_bracket'] > 0)
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
|
||||
else
|
||||
echo '<span class="faicon delete_circle icon-grey_normal"></span>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// display bracket
|
||||
echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
|
||||
echo '<div class="column display_bracket left">';
|
||||
|
||||
for ($i=1; $i<=$row['left_bracket']; $i++) echo ' ( ';
|
||||
echo '</td>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// spremenljivka
|
||||
echo '<td class="tbl_ce_tb white" style="width:150px">'.($row['spr_id']=='0'?'<span class="red">'.$lang['srv_select_spr'].'!</span>':'').'<br />';
|
||||
echo '<select class="spremenljivka_select spaceRight" name="spremenljivka_'.$condition.'" id="spremenljivka_'.$condition.'" size="1" style="width:150px" onchange="javascript:fill_value(\''.$condition.'\', \''.$vrednost.'\');">'."\n\r";
|
||||
echo '<div class="column variable">';
|
||||
|
||||
if($row['spr_id']=='0')
|
||||
echo '<span class="red">'.$lang['srv_select_spr'].'!</span><br />';
|
||||
|
||||
echo '<select class="spremenljivka_select dropdown medium" name="spremenljivka_'.$condition.'" id="spremenljivka_'.$condition.'" size="1" style="width:150px" onchange="javascript:fill_value(\''.$condition.'\', \''.$vrednost.'\');">';
|
||||
|
||||
echo '<option value="0"></option>';
|
||||
echo '<option value="-1"'.($row['spr_id']==-1?' selected="selected"':'').' style="color:blue"> '.$lang['srv_random_groups'].'</option>';
|
||||
echo '<option value="-2"'.($row['spr_id']==-2?' selected="selected"':'').' style="color:blue"> '.$lang['srv_calc'].'</option>';
|
||||
// Kvota
|
||||
//if($admin_type == 0)
|
||||
echo '<option value="-3"'.($row['spr_id']==-3?' selected="selected"':'').' style="color:blue"> '.$lang['srv_quota'].'</option>';
|
||||
echo '<option value="-4"'.($row['spr_id']==-4?' selected="selected"':'').' style="color:blue"> '.$lang['srv_device'].'</option>';
|
||||
|
||||
@ -8116,14 +8128,15 @@ class Branching {
|
||||
}
|
||||
}
|
||||
|
||||
echo '</select><br /> '."\n\r";
|
||||
echo '</td>';
|
||||
echo '</select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// span, ki se updata ob spremembi spremenljivke
|
||||
echo '<td class="tbl_ce_tb white">';
|
||||
echo '<div class="column operator">';
|
||||
|
||||
echo '<span id="fill_vrednost_'.$condition.'">'."\n\r";
|
||||
echo '<span id="fill_vrednost_'.$condition.'">';
|
||||
|
||||
if ($edit_fill_value == $condition)
|
||||
$edit_value = true;
|
||||
@ -8137,18 +8150,24 @@ class Branching {
|
||||
$this->fill_value($condition, $row['spr_id'], $row['vre_id'], $row['grd_id'], $edit_value);
|
||||
|
||||
echo '</span>'."\n\r";
|
||||
echo '</td>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// display right bracket
|
||||
echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
|
||||
echo '<div class="column display_bracket right">';
|
||||
|
||||
if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
|
||||
for ($i=1; $i<=$row['right_bracket']; $i++) echo ' ) ';
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// right_bracket buttons
|
||||
echo '<div class="column bracket right">';
|
||||
|
||||
if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
|
||||
echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
|
||||
|
||||
if ($row['right_bracket'] > 0)
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
|
||||
@ -8156,30 +8175,24 @@ class Branching {
|
||||
echo '<span class="faicon delete_circle icon-grey_normal"></span>';
|
||||
|
||||
echo '<a href="#" onclick="javascript:bracket_edit_new(\''.$condition.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
|
||||
}
|
||||
else {
|
||||
echo '<td class="tbl_ce_tb white" style="width:50px; text-align:center" nowrap>';
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// move
|
||||
echo '<td class="tbl_ce_tb white" style="text-align:right; width:30px">';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Delete icon
|
||||
echo '<div class="delete_holder">';
|
||||
if ($row_count['count'] != 1 )
|
||||
echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />';
|
||||
echo '</td>';
|
||||
|
||||
// remove
|
||||
echo '<td class="tbl_ce_lor white" style="text-align:left; width:30px">';
|
||||
if ($row_count['count'] != 1 )
|
||||
echo '<a href="#" onclick="condition_remove(\''.$row['if_id'].'\', \''.$condition.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link"></span></a>'."\n";
|
||||
echo '</td>';
|
||||
echo '<a href="#" onclick="condition_remove(\''.$row['if_id'].'\', \''.$condition.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete"></span></a>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</tr>';
|
||||
echo '</table>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</form>'."\n\r";
|
||||
echo '</form>';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -8200,13 +8213,11 @@ class Branching {
|
||||
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="'.$row1['tip'].'" >';
|
||||
|
||||
// operator
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" style="width:45px">'."\n\r";
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
|
||||
echo ' <option value="0"'.($row['operator']==0?' selected="selected"':'').'>=</option>'."\n\r";
|
||||
echo ' <option value="1"'.($row['operator']==1?' selected="selected"':'').'>≠</option>'."\n\r";
|
||||
// echo ' <option value="1"'.($row['operator']==1?' selected':'').'>≠</option>'."\n\r";
|
||||
|
||||
if ($row1['tip'] == 7 || $row1['tip'] == 8 || $row1['tip'] == 22 || $row1['tip'] == 25 || $row1['tip'] == 20 || $row1['tip'] == 18) {
|
||||
// number in compute in tabela number ma dodatne operatorje
|
||||
echo ' <option value="2"'.($row['operator']==2?' selected="selected"':'').'><</option>'."\n\r";
|
||||
echo ' <option value="3"'.($row['operator']==3?' selected="selected"':'').'><=</option>'."\n\r";
|
||||
echo ' <option value="4"'.($row['operator']==4?' selected="selected"':'').'>></option>'."\n\r";
|
||||
@ -8418,7 +8429,7 @@ class Branching {
|
||||
// zato, da z JS vemo kaj poslat po AJAXu, ID vrednosti ali text
|
||||
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="-1" />'."\n\r";
|
||||
|
||||
echo $lang['srv_groups'].': <select name="modul_'.$condition.'" id="modul_'.$condition.'" style="width:40px" onchange="javascript:fill_ostanek(\''.$condition.'\');">'."\n\r";
|
||||
echo $lang['srv_groups'].': <select name="modul_'.$condition.'" id="modul_'.$condition.'" class="dropdown medium" onchange="javascript:fill_ostanek(\''.$condition.'\');">'."\n\r";
|
||||
|
||||
for ($i=2; $i<=64; $i++)
|
||||
echo '<option value="'.$i.'"'.($row['modul']==$i?' selected="selected"':'').'>'.$i.'</option>';
|
||||
@ -8441,10 +8452,9 @@ class Branching {
|
||||
echo ' <a href="#" onclick="calculation_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#calculation\').css({\'position\': \'absolute\'}); return false;">'.$text.'</a> ';
|
||||
|
||||
// operator
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" style="width:45px">'."\n\r";
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" class="dropdown medium">'."\n\r";
|
||||
echo ' <option value="0"'.($row['operator']==0?' selected':'').'>=</option>'."\n\r";
|
||||
echo ' <option value="1"'.($row['operator']==1?' selected':'').'>≠</option>'."\n\r";
|
||||
// echo ' <option value="1"'.($row['operator']==1?' selected':'').'>≠</option>'."\n\r";
|
||||
echo ' <option value="2"'.($row['operator']==2?' selected':'').'><</option>'."\n\r";
|
||||
echo ' <option value="3"'.($row['operator']==3?' selected':'').'><=</option>'."\n\r";
|
||||
echo ' <option value="4"'.($row['operator']==4?' selected':'').'>></option>'."\n\r";
|
||||
@ -8474,10 +8484,9 @@ class Branching {
|
||||
echo ' <a href="#" onclick="quota_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#quota\').css({\'position\': \'absolute\'}); return false;">'.$text.'</a> ';
|
||||
|
||||
// operator
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" style="width:45px">'."\n\r";
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" class="dropdown medium">'."\n\r";
|
||||
echo ' <option value="0"'.($row['operator']==0?' selected':'').'>=</option>'."\n\r";
|
||||
echo ' <option value="1"'.($row['operator']==1?' selected':'').'>≠</option>'."\n\r";
|
||||
// echo ' <option value="1"'.($row['operator']==1?' selected':'').'>≠</option>'."\n\r";
|
||||
echo ' <option value="2"'.($row['operator']==2?' selected':'').'><</option>'."\n\r";
|
||||
echo ' <option value="3"'.($row['operator']==3?' selected':'').'><=</option>'."\n\r";
|
||||
echo ' <option value="4"'.($row['operator']==4?' selected':'').'>></option>'."\n\r";
|
||||
@ -8500,7 +8509,7 @@ class Branching {
|
||||
// zato, da z JS vemo kaj poslat po AJAXu, ID vrednosti ali text
|
||||
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="-4" />'."\n\r";
|
||||
|
||||
echo $lang['srv_device_type'].': <select name="text_'.$condition.'" id="text_'.$condition.'" style="width:100px" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
|
||||
echo $lang['srv_device_type'].': <select name="text_'.$condition.'" id="text_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
|
||||
echo '<option value="-1"'.($row['text']=='' || $row['text']=='-1'?' selected="selected"':'').'>'.$lang['srv_device_type_select'].'</option>';
|
||||
echo '<option value="0"'.($row['text']=='0'?' selected="selected"':'').'>'.$lang['srv_para_graph_device0'].'</option>';
|
||||
echo '<option value="1"'.($row['text']=='1'?' selected="selected"':'').'>'.$lang['srv_para_graph_device1'].'</option>';
|
||||
|
||||
@ -3043,8 +3043,8 @@ $lang = array (
|
||||
"glasovanja_embed_off" => "Samostojna anketa",
|
||||
"glasovanja_theme" => "Izberi temo za anketo",
|
||||
"glasovanja_stat_theme" => "Izberi temo za statistiko",
|
||||
"oblikovanje_if" => "Urejanje pogojev",
|
||||
"oblikovanje_blok" => "Urejanje bloka",
|
||||
"oblikovanje_if" => "Nastavitve pogoja",
|
||||
"oblikovanje_blok" => "Nastavitve bloka",
|
||||
"sintaksa_if" => "Predogled pogojev",
|
||||
"urejanje_podif_alert" => "Urejate pogoj za prikaz izbrane vrstice (kategorije, podvprašanja) in ne celega vprašanja!",
|
||||
"urejanje_pogoj_popup" => "Uredi pogoj",
|
||||
@ -4346,7 +4346,7 @@ $lang = array (
|
||||
"no_stats_for_this_file" => "Za to povezavo ni statistik",
|
||||
"back_to_statistics" => "Nazaj na statistike",
|
||||
"srv_loop" => "Zanka",
|
||||
"srv_loop_urejanje" => "Urejanje zanke",
|
||||
"srv_loop_urejanje" => "Nastavitve zanke",
|
||||
"srv_loop_no_nesting" => "Gnezdenje zank (zanka v zanki) ni dovoljeno!",
|
||||
"srv_loop_desc" => "Izberite spremenljivko in vrednosti, ki jih želite uporabiti v zanki. Za vsako označeno vrednost bo respondent (seveda, le če bo odgovarjajočo možnost tudi označil) dobil vsa vprašanja v zanki. Podrobnosti o uporabi zanke so <a href=\"https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/urejanje/vprasalnik/zanka\" target=\"_blank\">tukaj</a>.<br /><br />Za prikaz vrednosti vprašanja, o katerem sprašujete v zanki uporabite prenos vrednosti, npr. #Q1#",
|
||||
"srv_spss_export_base_instructions" => "********************\n* UVOZ PODATKOV V SPSS\n********************\n* Koraki za uvoz:\n* 1) v vrstici 18 določite pot do datoteke;\n* 2) poženite sintakso, tako da v meniju tega okna izberete Run, nato All;\n* 3) baza podatkov se bo samodejno ustvarila.\n* Podrobnejša navodila so na voljo na www.1ka.si.\n********************",
|
||||
|
||||
@ -3015,8 +3015,8 @@ $lang = array (
|
||||
"glasovanja_embed_off" => "Stand alone survey",
|
||||
"glasovanja_theme" => "Select voting theme",
|
||||
"glasovanja_stat_theme" => "Select statistics theme",
|
||||
"oblikovanje_if" => "Condition editing",
|
||||
"oblikovanje_blok" => "Block editing",
|
||||
"oblikovanje_if" => "Condition settings",
|
||||
"oblikovanje_blok" => "Block settings",
|
||||
"sintaksa_if" => "Syntax of conditions",
|
||||
"urejanje_podif_alert" => "You are editing condition to display a row inside a question and not entire question!",
|
||||
"urejanje_pogoj_popup" => "Edit condition",
|
||||
@ -4324,7 +4324,7 @@ $lang = array (
|
||||
"no_stats_for_this_file" => "There is no data for this link.",
|
||||
"back_to_statistics" => "Back to statistics",
|
||||
"srv_loop" => "Loop",
|
||||
"srv_loop_urejanje" => "Loop edit",
|
||||
"srv_loop_urejanje" => "Loop settings",
|
||||
"srv_loop_no_nesting" => "Loop nesting (loop inside a loop) in not allowed!",
|
||||
"srv_loop_desc" => "Select variable and categories that you want to use in loop",
|
||||
"srv_spss_export_base_instructions" => "********************\n* IMPORT DATA TO SPSS\n********************\n* Instructions for import:\n* 1) at line 18 specify the path to the file;\n* 2) run the syntax with the selection of Run, then All;\n* 3) database will automatically generate.\n* Detailed instructions are avaliable at www.1ka.si.\n********************",
|
||||
|
||||
@ -12955,14 +12955,14 @@ div.drop_setting_transition {
|
||||
|
||||
#branching {
|
||||
min-height: 400px;
|
||||
width: calc(100% - 705px);
|
||||
width: calc(100% - 725px);
|
||||
margin: 0 0 0 304px;
|
||||
background-color: white;
|
||||
/* Okno za drop vprasanja, ko je anketa prazna */
|
||||
}
|
||||
@media only screen and (max-width: 1200px) {
|
||||
#branching {
|
||||
width: calc(100% - 505px);
|
||||
width: calc(100% - 525px);
|
||||
margin: 0 0 0 104px;
|
||||
}
|
||||
}
|
||||
@ -14190,6 +14190,9 @@ li.spr .spr_edit .scale_ordnom button.active, li.spr .spr_edit .scale_ordnom but
|
||||
background-color: #EAF9FE;
|
||||
border-color: #1E88E5;
|
||||
}
|
||||
li.spr .spr_edit .faicon.addif {
|
||||
display: none;
|
||||
}
|
||||
li.spr .spremenljivka_content {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
@ -16157,9 +16160,6 @@ and open the template in the editor.
|
||||
Created on : 13-Aug-2018, 12:32:48
|
||||
Author : podkrizniku
|
||||
*/
|
||||
#branching {
|
||||
/*if condition variable select*/
|
||||
}
|
||||
#branching li.if,
|
||||
#branching li.block,
|
||||
#branching li.loop {
|
||||
@ -16171,14 +16171,20 @@ and open the template in the editor.
|
||||
display: none;
|
||||
z-index: 5;
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
right: 16px;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
#branching li.if .if_remove a,
|
||||
#branching li.block .if_remove a,
|
||||
#branching li.loop .if_remove a {
|
||||
margin-left: 16px;
|
||||
}
|
||||
#branching li.if .if_remove .faicon:before,
|
||||
#branching li.block .if_remove .faicon:before,
|
||||
#branching li.loop .if_remove .faicon:before {
|
||||
line-height: 28px;
|
||||
font-size: 16px;
|
||||
}
|
||||
#branching li.if .pm.faicon,
|
||||
#branching li.block .pm.faicon,
|
||||
#branching li.loop .pm.faicon {
|
||||
@ -16190,6 +16196,13 @@ and open the template in the editor.
|
||||
#branching li.loop .if_content {
|
||||
width: 100%;
|
||||
}
|
||||
#branching li.if .if_content span.conditions_display,
|
||||
#branching li.block .if_content span.conditions_display,
|
||||
#branching li.loop .if_content span.conditions_display {
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
line-height: 28px;
|
||||
}
|
||||
#branching li.if .if_content .clr_if,
|
||||
#branching li.if .if_content .clr_bl,
|
||||
#branching li.if .if_content .clr_lp,
|
||||
@ -16214,10 +16227,23 @@ and open the template in the editor.
|
||||
color: #1E88E5;
|
||||
font-weight: 400;
|
||||
}
|
||||
#branching li.if:hover span.conditions_display,
|
||||
#branching li.block:hover span.conditions_display,
|
||||
#branching li.loop:hover span.conditions_display {
|
||||
cursor: pointer;
|
||||
#branching li.if .if_warning,
|
||||
#branching li.block .if_warning,
|
||||
#branching li.loop .if_warning {
|
||||
margin-left: 16px;
|
||||
color: #FF0000;
|
||||
font-size: 14px;
|
||||
}
|
||||
#branching li.if .if_warning span.faicon,
|
||||
#branching li.block .if_warning span.faicon,
|
||||
#branching li.loop .if_warning span.faicon {
|
||||
margin-right: 4px;
|
||||
}
|
||||
#branching li.if .if_warning span.faicon:before,
|
||||
#branching li.block .if_warning span.faicon:before,
|
||||
#branching li.loop .if_warning span.faicon:before {
|
||||
color: #FF0000;
|
||||
font-size: 14px;
|
||||
}
|
||||
#branching li.if:hover div.if_remove,
|
||||
#branching li.block:hover div.if_remove,
|
||||
@ -16228,26 +16254,93 @@ and open the template in the editor.
|
||||
#branching li.block.if_editing div.if_remove,
|
||||
#branching li.loop.if_editing div.if_remove {
|
||||
display: block;
|
||||
padding: 10px 12px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content,
|
||||
#branching li.block.if_editing .if_content,
|
||||
#branching li.loop.if_editing .if_content {
|
||||
padding: 12px 16px 16px 16px;
|
||||
background-color: #F2F2F2;
|
||||
border-left: 2px #1E88E5 solid;
|
||||
padding: 12px;
|
||||
background-color: #EEF7FF;
|
||||
border: 1px #CCE4F9 solid;
|
||||
border-left: 1px #1E88E5 solid;
|
||||
border-radius: 1px 2px 2px 1px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body {
|
||||
max-height: 50vh;
|
||||
max-height: 70vh;
|
||||
overflow-y: auto;
|
||||
margin: 20px 0;
|
||||
padding: 10px 5px 5px 5px;
|
||||
margin: 32px 0 0 0;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing {
|
||||
margin-bottom: 5px;
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction {
|
||||
padding-left: 22px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction select {
|
||||
margin: 0;
|
||||
width: auto;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder {
|
||||
margin-right: 12px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before {
|
||||
font-size: 20px;
|
||||
color: #1E88E5;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 32px 0;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column {
|
||||
display: flex;
|
||||
padding: 0 16px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator {
|
||||
flex-grow: 1;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder {
|
||||
margin-left: 12px;
|
||||
}
|
||||
#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
|
||||
#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
|
||||
#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before {
|
||||
font-size: 16px;
|
||||
color: #1E88E5;
|
||||
}
|
||||
#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 {
|
||||
margin: 12px 0 0 0;
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
}
|
||||
#branching li.endif:hover,
|
||||
#branching li.endblock:hover,
|
||||
@ -16287,61 +16380,19 @@ and open the template in the editor.
|
||||
}
|
||||
#branching li.endif_editing {
|
||||
padding: 12px;
|
||||
background-color: #F2F2F2;
|
||||
border-left: 2px #1E88E5 solid;
|
||||
background-color: #EEF7FF;
|
||||
border: 1px #CCE4F9 solid;
|
||||
border-left: 1px #1E88E5 solid;
|
||||
border-radius: 1px 2px 2px 1px;
|
||||
}
|
||||
#branching span.IF_title_start {
|
||||
font-weight: 900;
|
||||
color: #1E88E5;
|
||||
margin-right: 8px;
|
||||
}
|
||||
#branching span.IF_title {
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
#branching span.IF_title_line {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 0.5em;
|
||||
vertical-align: bottom;
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
border-top: 1px solid #C4C4C4;
|
||||
}
|
||||
#branching span.conditions_display {
|
||||
display: block;
|
||||
line-height: 28px;
|
||||
}
|
||||
#branching select.spremenljivka_select option {
|
||||
max-width: 500px;
|
||||
}
|
||||
#branching .condition {
|
||||
position: relative;
|
||||
left: -21px;
|
||||
}
|
||||
#branching span.endif {
|
||||
position: relative;
|
||||
left: -29px;
|
||||
font-weight: bold;
|
||||
}
|
||||
#branching #div_condition_editing_operators {
|
||||
padding: 5px 0;
|
||||
}
|
||||
#branching #div_condition_editing {
|
||||
display: none;
|
||||
height: auto;
|
||||
width: 800px;
|
||||
}
|
||||
#branching #div_condition_editing div#div_condition_editing_container {
|
||||
margin-bottom: 44px;
|
||||
}
|
||||
#branching #div_condition_editing .error_display {
|
||||
background-color: transparent;
|
||||
}
|
||||
#branching #div_condition_editing .condition_editing_vrednost_title {
|
||||
margin: -5px 0 15px 5px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
#branching ul.if_editing li.spr,
|
||||
#branching ul.if_editing li.if,
|
||||
#branching ul.if_editing li.endif,
|
||||
#branching ul.if_editing li.block,
|
||||
#branching ul.if_editing li.endblock,
|
||||
#branching ul.if_editing li.loop,
|
||||
#branching ul.if_editing li.endloop {
|
||||
border-left: 1px #1E88E5 solid;
|
||||
}
|
||||
#branching #div_condition_editing_float {
|
||||
display: flex;
|
||||
@ -16349,20 +16400,29 @@ and open the template in the editor.
|
||||
box-sizing: border-box;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: -369px;
|
||||
width: 305px;
|
||||
border: 1px solid #E5E5E5;
|
||||
right: -389px;
|
||||
width: 325px;
|
||||
background-color: #FFFFFF;
|
||||
border: 1px solid #CCE4F9;
|
||||
border-radius: 2px;
|
||||
}
|
||||
#branching #div_condition_editing_float .condition_header {
|
||||
height: 45px;
|
||||
padding: 0 7px;
|
||||
margin-bottom: 16px;
|
||||
color: #FFFFFF;
|
||||
color: #333333;
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
line-height: 45px;
|
||||
background-color: #1E88E5;
|
||||
text-transform: uppercase;
|
||||
background-color: #EEF7FF;
|
||||
border-bottom: 1px solid #CCE4F9;
|
||||
}
|
||||
#branching #div_condition_editing_float .condition_header .faicon {
|
||||
margin-right: 8px;
|
||||
}
|
||||
#branching #div_condition_editing_float .condition_header .faicon:before {
|
||||
color: #1E88E5;
|
||||
}
|
||||
#branching #div_condition_editing_float .condition_edit {
|
||||
margin: 0 16px;
|
||||
@ -16476,6 +16536,52 @@ and open the template in the editor.
|
||||
#branching #div_condition_editing_float .button_holder button:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#branching span.IF_title_start {
|
||||
font-weight: 900;
|
||||
color: #1E88E5;
|
||||
margin-right: 8px;
|
||||
}
|
||||
#branching span.IF_title {
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
#branching span.IF_title_line {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 0.5em;
|
||||
vertical-align: bottom;
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
border-top: 1px solid #C4C4C4;
|
||||
}
|
||||
#branching select.spremenljivka_select option {
|
||||
max-width: 500px;
|
||||
}
|
||||
#branching .condition {
|
||||
position: relative;
|
||||
left: -21px;
|
||||
}
|
||||
#branching span.endif {
|
||||
position: relative;
|
||||
left: -29px;
|
||||
font-weight: bold;
|
||||
}
|
||||
#branching #div_condition_editing {
|
||||
display: none;
|
||||
height: auto;
|
||||
width: 800px;
|
||||
}
|
||||
#branching #div_condition_editing div#div_condition_editing_container {
|
||||
margin-bottom: 44px;
|
||||
}
|
||||
#branching #div_condition_editing .error_display {
|
||||
background-color: transparent;
|
||||
}
|
||||
#branching #div_condition_editing .condition_editing_vrednost_title {
|
||||
margin: -5px 0 15px 5px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
#branching .error_display {
|
||||
display: block;
|
||||
line-height: 24px;
|
||||
@ -16511,16 +16617,6 @@ and open the template in the editor.
|
||||
margin-bottom: 15px;
|
||||
border-top: 1px solid #1E88E5;
|
||||
}
|
||||
#branching .tbl_condition_editing {
|
||||
width: 98%;
|
||||
border-spacing: 0px;
|
||||
margin: 0px 1% 0px 1%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
#branching .tbl_condition_editing th {
|
||||
color: #E5E5E5;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/*
|
||||
Knjiznica v urejanju ankete
|
||||
|
||||
@ -13,8 +13,8 @@ $branching_main_space_left_big: 304px;
|
||||
$branching_toolbox_size_small: 40px;
|
||||
$branching_main_space_left_small: 104px;
|
||||
|
||||
$branching_main_size_big: calc(100% - 705px);
|
||||
$branching_main_size_small: calc(100% - 505px);
|
||||
$branching_main_size_big: calc(100% - 725px);
|
||||
$branching_main_size_small: calc(100% - 525px);
|
||||
|
||||
|
||||
#placeholder{
|
||||
|
||||
@ -19,12 +19,17 @@ and open the template in the editor.
|
||||
|
||||
z-index: 5;
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
right: 16px;
|
||||
top: 0;
|
||||
right: 0;
|
||||
|
||||
a{
|
||||
margin-left: 16px;
|
||||
}
|
||||
|
||||
.faicon:before{
|
||||
line-height: 28px;
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.pm.faicon{
|
||||
@ -34,6 +39,12 @@ and open the template in the editor.
|
||||
|
||||
.if_content {
|
||||
width: 100%;
|
||||
|
||||
span.conditions_display {
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
line-height: 28px;
|
||||
}
|
||||
|
||||
.clr_if,
|
||||
.clr_bl,
|
||||
@ -50,10 +61,23 @@ and open the template in the editor.
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
span.conditions_display {
|
||||
cursor: pointer;
|
||||
.if_warning{
|
||||
margin-left: 16px;
|
||||
|
||||
color: $red;
|
||||
font-size: 14px;
|
||||
|
||||
span.faicon{
|
||||
margin-right: 4px;
|
||||
|
||||
&:before{
|
||||
color: $red;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
div.if_remove {
|
||||
display: block;
|
||||
}
|
||||
@ -63,15 +87,20 @@ and open the template in the editor.
|
||||
li.if.if_editing,
|
||||
li.block.if_editing,
|
||||
li.loop.if_editing{
|
||||
|
||||
div.if_remove {
|
||||
display: block;
|
||||
padding: 10px 12px;
|
||||
}
|
||||
|
||||
.if_content {
|
||||
padding: 12px 16px 16px 16px;
|
||||
padding: 12px;
|
||||
|
||||
background-color: $light-gray2;
|
||||
border-left: 2px $blue solid;
|
||||
background-color: $medium-blue;
|
||||
|
||||
border: 1px #CCE4F9 solid;
|
||||
border-left: 1px $blue solid;
|
||||
border-radius: 1px 2px 2px 1px;
|
||||
|
||||
#div_condition_editing_inner {
|
||||
|
||||
@ -79,17 +108,74 @@ and open the template in the editor.
|
||||
}
|
||||
|
||||
.condition_editing_body{
|
||||
max-height: 50vh;
|
||||
max-height: 70vh;
|
||||
overflow-y: auto;
|
||||
|
||||
margin: 20px 0;
|
||||
padding: 10px 5px 5px 5px;
|
||||
margin: 32px 0 0 0;
|
||||
|
||||
|
||||
.tbl_condition_editing{
|
||||
margin-bottom: 5px;
|
||||
.condition_editing_row{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
margin-bottom: 8px;
|
||||
|
||||
&.conjunction{
|
||||
padding-left: 22px;
|
||||
|
||||
select{
|
||||
margin: 0;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.move_holder{
|
||||
margin-right: 12px;
|
||||
|
||||
.faicon:before{
|
||||
font-size: 20px;
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
|
||||
.white_holder{
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
padding: 32px 0;
|
||||
|
||||
background-color: $white;
|
||||
|
||||
.column{
|
||||
display: flex;
|
||||
padding: 0 16px;
|
||||
|
||||
&.operator{
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.delete_holder{
|
||||
margin-left: 12px;
|
||||
|
||||
.faicon:before{
|
||||
font-size: 16px;
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#div_condition_editing_operators {
|
||||
margin: 12px 0 0 0;
|
||||
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -120,76 +206,28 @@ and open the template in the editor.
|
||||
li.endif_editing {
|
||||
padding: 12px;
|
||||
|
||||
background-color: $light-gray2;
|
||||
border-left: 2px $blue solid;
|
||||
background-color: $medium-blue;
|
||||
|
||||
border: 1px #CCE4F9 solid;
|
||||
border-left: 1px $blue solid;
|
||||
border-radius: 1px 2px 2px 1px;
|
||||
}
|
||||
|
||||
ul.if_editing{
|
||||
|
||||
|
||||
// Naslov popupa, črta pod naslovom
|
||||
span.IF_title_start {
|
||||
font-weight: $heavy;
|
||||
color: $blue;
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
span.IF_title {
|
||||
font-weight: $semi-bold;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
span.IF_title_line {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 0.5em;
|
||||
vertical-align: bottom;
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
border-top: 1px solid $dark-gray;
|
||||
}
|
||||
|
||||
span.conditions_display {
|
||||
display: block;
|
||||
line-height: 28px;
|
||||
}
|
||||
/*if condition variable select*/
|
||||
select.spremenljivka_select {
|
||||
option {
|
||||
max-width: 500px;
|
||||
}
|
||||
}
|
||||
.condition {
|
||||
position: relative;
|
||||
left: -21px;
|
||||
}
|
||||
span.endif {
|
||||
position: relative;
|
||||
left: -29px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#div_condition_editing_operators {
|
||||
padding: 5px 0;
|
||||
}
|
||||
#div_condition_editing {
|
||||
display: none;
|
||||
|
||||
height: auto;
|
||||
width: 800px;
|
||||
|
||||
div#div_condition_editing_container {
|
||||
margin-bottom: 44px;
|
||||
}
|
||||
.error_display {
|
||||
background-color: transparent;
|
||||
}
|
||||
.condition_editing_vrednost_title {
|
||||
margin: -5px 0 15px 5px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
li.spr,
|
||||
li.if,
|
||||
li.endif,
|
||||
li.block,
|
||||
li.endblock,
|
||||
li.loop,
|
||||
li.endloop{
|
||||
border-left: 1px $blue solid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Float z nastavitvami na desni
|
||||
#div_condition_editing_float {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -197,12 +235,13 @@ and open the template in the editor.
|
||||
box-sizing: border-box;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: -369px;
|
||||
right: -389px;
|
||||
|
||||
width: 305px;
|
||||
width: 325px;
|
||||
|
||||
border: 1px solid $gray;
|
||||
background-color: $white;
|
||||
border: 1px solid #CCE4F9;
|
||||
border-radius: 2px;
|
||||
|
||||
// Naslovna vrstica
|
||||
.condition_header{
|
||||
@ -210,12 +249,22 @@ and open the template in the editor.
|
||||
padding: 0 7px;
|
||||
margin-bottom: 16px;
|
||||
|
||||
color: $white;
|
||||
color: $black;
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
line-height: 45px;
|
||||
text-transform: uppercase;
|
||||
|
||||
background-color: $blue;
|
||||
background-color: $medium-blue;
|
||||
border-bottom: 1px solid #CCE4F9;
|
||||
|
||||
.faicon{
|
||||
margin-right: 8px;
|
||||
|
||||
&:before{
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Glavna vsebina
|
||||
@ -374,6 +423,67 @@ and open the template in the editor.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// Naslov popupa, črta pod naslovom
|
||||
span.IF_title_start {
|
||||
font-weight: $heavy;
|
||||
color: $blue;
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
span.IF_title {
|
||||
font-weight: $semi-bold;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
span.IF_title_line {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
height: 0.5em;
|
||||
vertical-align: bottom;
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
border-top: 1px solid $dark-gray;
|
||||
}
|
||||
|
||||
select.spremenljivka_select {
|
||||
option {
|
||||
max-width: 500px;
|
||||
}
|
||||
}
|
||||
.condition {
|
||||
position: relative;
|
||||
left: -21px;
|
||||
}
|
||||
span.endif {
|
||||
position: relative;
|
||||
left: -29px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
#div_condition_editing {
|
||||
display: none;
|
||||
|
||||
height: auto;
|
||||
width: 800px;
|
||||
|
||||
div#div_condition_editing_container {
|
||||
margin-bottom: 44px;
|
||||
}
|
||||
.error_display {
|
||||
background-color: transparent;
|
||||
}
|
||||
.condition_editing_vrednost_title {
|
||||
margin: -5px 0 15px 5px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
.error_display {
|
||||
display: block;
|
||||
line-height: 24px;
|
||||
@ -414,14 +524,5 @@ and open the template in the editor.
|
||||
margin-bottom: 15px;
|
||||
border-top: 1px solid $blue;
|
||||
}
|
||||
.tbl_condition_editing {
|
||||
width: 98%;
|
||||
border-spacing: 0px;
|
||||
margin: 0px 1% 0px 1%;
|
||||
border-collapse: collapse;
|
||||
th {
|
||||
color: $gray;
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -100,6 +100,11 @@ li.spr{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// IF na vprasanje zaenkrat skrijemo
|
||||
.faicon.addif{
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user