Redesign - urejanje vprasalnika - dokoncani pogoji, drugi popravki
This commit is contained in:
parent
f11588f972
commit
ced353b506
@ -7900,12 +7900,18 @@ class Branching {
|
||||
|
||||
if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
|
||||
|
||||
echo '<div class="bracket_icons">';
|
||||
|
||||
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>';
|
||||
|
||||
echo '<div class="bracket_text">'.$lang['srv_oklepaji'].'</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
@ -8149,7 +8155,7 @@ class Branching {
|
||||
|
||||
$this->fill_value($condition, $row['spr_id'], $row['vre_id'], $row['grd_id'], $edit_value);
|
||||
|
||||
echo '</span>'."\n\r";
|
||||
echo '</span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -8169,12 +8175,18 @@ class Branching {
|
||||
|
||||
if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
|
||||
|
||||
echo '<div class="bracket_icons">';
|
||||
|
||||
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>';
|
||||
else
|
||||
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>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="bracket_text">'.$lang['srv_zaklepaji'].'</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
@ -8281,13 +8293,12 @@ class Branching {
|
||||
// obicajna spremenljivka
|
||||
if ($vrednost <= 0) {
|
||||
|
||||
echo '<span id="edit_fill_value_'.$condition.'"'.($edit_value?'':' style="display: none"').'>';
|
||||
echo '<span id="edit_fill_value_'.$condition.'" class="edit_fill_value" '.($edit_value?'':' style="display: none"').'>';
|
||||
|
||||
$sql1 = sisplet_query("SELECT COUNT(*) AS count FROM srv_condition_vre WHERE cond_id='$condition'");
|
||||
$row1 = mysqli_fetch_array($sql1);
|
||||
if ($row1['count'] == 0) echo '<span class="red">';
|
||||
echo $lang['srv_note_vrednost'].':<br />';
|
||||
if ($row1['count'] == 0) echo '</span>';
|
||||
|
||||
echo '<span '.($row1['count'] == 0 ? 'class="red"' : '').'>'.$lang['srv_note_vrednost'].':</span>';
|
||||
|
||||
$sql = sisplet_query("SELECT id, naslov, variable FROM srv_vrednost WHERE spr_id='$spremenljivka' ORDER BY vrstni_red ASC");
|
||||
while ($row = mysqli_fetch_array($sql)) {
|
||||
@ -8298,9 +8309,9 @@ class Branching {
|
||||
else
|
||||
$selected = '';
|
||||
|
||||
echo '<label for="vrednost_'.$condition.'_'.$row['id'].'" style="height:1em; overflow:hidden;" nowrap><input type="checkbox" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$row['id'].'" value="'.$row['id'].'" class="enka-admin-custom" '.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row['variable'].') '.strip_tags($row['naslov']).'</label><br />'."\n\r";
|
||||
echo '<label for="vrednost_'.$condition.'_'.$row['id'].'"><input type="checkbox" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$row['id'].'" value="'.$row['id'].'" class="enka-admin-custom" '.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row['variable'].') '.strip_tags($row['naslov']).'</label>';
|
||||
if ($selected != '')
|
||||
$preview .= /*($preview!=''?', ':'').*/'('.$row['variable'].') '.strip_tags($row['naslov']).'<br>';
|
||||
$preview .= '<span>('.$row['variable'].') '.strip_tags($row['naslov']).'</span>';
|
||||
}
|
||||
|
||||
|
||||
@ -8316,14 +8327,15 @@ class Branching {
|
||||
$selected = ' checked="checked"';
|
||||
else
|
||||
$selected = '';
|
||||
echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span><label for="vrednost_'.$condition.'_-1" style="height:1em; overflow:hidden;" nowrap> (-1) '.$lang['srv_mv_Ni odgovoril'].'</label><br />'."\n\r";
|
||||
echo '<label for="vrednost_'.$condition.'_-1"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
|
||||
if ($selected != '')
|
||||
$preview .= '(-1) '.$lang['srv_mv_Ni odgovoril'].'<br>';
|
||||
$preview .= '<span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</span>';
|
||||
}
|
||||
|
||||
echo '</span>';
|
||||
echo '<a href="#" onclick="edit_fill_value(\''.$condition.'\'); return false;" id="preview_fill_value_'.$condition.'"'.($edit_value?' style="display: none"':'').' title="'.$lang['srv_note_vrednost'].'!">'.($preview!=''?$preview:$lang['srv_error_vrednost']).'</a>';
|
||||
|
||||
echo '<div id="preview_fill_value_'.$condition.'" class="preview_fill_value" '.($edit_value ? 'style="display:none"' : '').'>'.($preview != '' ? $preview : $lang['srv_error_vrednost']).'</div>';
|
||||
echo '<a href="#" id="preview_fill_link_'.$condition.'" '.($edit_value ? 'style="display:none"' : '').' onclick="edit_fill_value(\''.$condition.'\'); return false;" title="'.$lang['srv_note_vrednost'].'!"><span class="faicon edit"></span></a>';
|
||||
|
||||
// multigrid (tuki mamo poleg spremenljivke vrednost, ki oznacuje element)
|
||||
} elseif ($vrednost > 0) {
|
||||
@ -8331,13 +8343,12 @@ class Branching {
|
||||
// tabela radio, tabela checkbox
|
||||
if ($grid == 0) {
|
||||
|
||||
echo '<span id="edit_fill_value_'.$condition.'"'.($edit_value?'':' style="display: none"').'>';
|
||||
echo '<span id="edit_fill_value_'.$condition.'" class="edit_fill_value" '.($edit_value?'':' style="display: none"').'>';
|
||||
|
||||
$sql1c = sisplet_query("SELECT COUNT(*) AS count FROM srv_condition_grid WHERE cond_id='$condition'");
|
||||
$row1c = mysqli_fetch_array($sql1c);
|
||||
if ($row1c['count'] == 0) echo '<span class="red">';
|
||||
echo $lang['srv_note_vrednost'].':<br />';
|
||||
if ($row1c['count'] == 0) echo '</span>';
|
||||
|
||||
echo '<span '.($row1c['count'] == 0 ? 'class="red"' : '').'>'.$lang['srv_note_vrednost'].':</span>';
|
||||
|
||||
if ($row1['tip'] == 6 || $row1['tip'] == 16) {
|
||||
|
||||
@ -8357,9 +8368,9 @@ class Branching {
|
||||
$sql2 = sisplet_query("SELECT naslov, variable FROM srv_grid WHERE id='$i' AND spr_id='$row[id]'");
|
||||
$row2 = mysqli_fetch_array($sql2);
|
||||
|
||||
echo '<label for="vrednost_'.$condition.'_'.$i.'" style="height:1em; overflow:hidden;" nowrap><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label><br />'."\n\r";
|
||||
echo '<label for="vrednost_'.$condition.'_'.$i.'"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span> ('.$row2['variable'].') '.strip_tags($row2['naslov']).'</label>';
|
||||
if ($selected != '')
|
||||
$preview .= /*($preview!=''?', ':'').*/'('.$row2['variable'].') '.strip_tags($row2['naslov']).'<br>';
|
||||
$preview .= '<span>('.$row2['variable'].') '.strip_tags($row2['naslov']).'</span>';
|
||||
}
|
||||
|
||||
// Ce je bilo vprasanje na prejsnji strani imamo tudi pogoj -1 (neodgovor)
|
||||
@ -8373,9 +8384,9 @@ class Branching {
|
||||
$selected = ' checked="checked"';
|
||||
else
|
||||
$selected = '';
|
||||
echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span><label for="vrednost_'.$condition.'_-1" style="height:1em; overflow:hidden;" nowrap> (-1) '.$lang['srv_mv_Ni odgovoril'].'</label><br />'."\n\r";
|
||||
echo '<label for="vrednost_'.$condition.'_-1"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_-1" value="-1"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</label>';
|
||||
if ($selected != '')
|
||||
$preview .= '(-1) '.$lang['srv_mv_Ni odgovoril'].'<br>';
|
||||
$preview .= '<span>(-1) '.$lang['srv_mv_Ni odgovoril'].'</span>';
|
||||
}
|
||||
|
||||
// ranking
|
||||
@ -8394,18 +8405,19 @@ class Branching {
|
||||
else
|
||||
$selected = '';
|
||||
|
||||
echo '<input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span><label for="vrednost_'.$condition.'_'.$i.'" style="height:1em; overflow:hidden;" nowrap> ('.$i.') '.$i.'. '.$lang['srv_position'].'</label><br />'."\n\r";
|
||||
echo '<label for="vrednost_'.$condition.'_'.$i.'"><input type="checkbox" class="enka-admin-custom" name="vrednost_'.$condition.'" id="vrednost_'.$condition.'_'.$i.'" value="'.$i.'"'.$selected.' onclick="condition_edit(\''.$condition.'\');" /><span class="enka-checkbox-radio"></span>('.$i.') '.$i.'. '.$lang['srv_position'].'</label>';
|
||||
if ($selected != '')
|
||||
$preview .= /*($preview!=''?', ':'').*/'('.$i.') '.$i.'. '.$lang['srv_position'].'<br>';
|
||||
$preview .= '<span>('.$i.') '.$i.'. '.$lang['srv_position'].'</span>';
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
echo '</span>';
|
||||
echo '<a href="#" onclick="edit_fill_value(\''.$condition.'\'); return false;" id="preview_fill_value_'.$condition.'"'.($edit_value?' style="display: none"':'').' title="'.$lang['srv_note_vrednost'].'!">'.($preview!=''?$preview:$lang['srv_error_vrednost']).'</a>';
|
||||
|
||||
|
||||
echo '<div id="preview_fill_value_'.$condition.'" class="preview_fill_value" '.($edit_value ? 'style="display:none"' : '').'>'.($preview != '' ? $preview : $lang['srv_error_vrednost']).'</div>';
|
||||
echo '<a href="#" id="preview_fill_link_'.$condition.'" '.($edit_value ? 'style="display:none"' : '').' onclick="edit_fill_value(\''.$condition.'\'); return false;" title="'.$lang['srv_note_vrednost'].'!"><span class="faicon edit"></span></a>';
|
||||
|
||||
// tabela text, tabela stevilo
|
||||
} else {
|
||||
|
||||
@ -8429,7 +8441,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.'" class="dropdown medium" onchange="javascript:fill_ostanek(\''.$condition.'\');">'."\n\r";
|
||||
echo '<label>'.$lang['srv_groups'].':</label><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>';
|
||||
@ -8447,9 +8459,10 @@ class Branching {
|
||||
echo '<input type="hidden" name="tip_'.$condition.'" id="tip_'.$condition.'" value="-2" />'."\n\r";
|
||||
|
||||
$text = $this->calculations_display($condition);
|
||||
if ($text == '<span class="calculations_display"></span>') $text = $lang['srv_editcalculation'];
|
||||
if ($text == '<span class="calculations_display"></span>')
|
||||
$text = '';
|
||||
|
||||
echo ' <a href="#" onclick="calculation_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#calculation\').css({\'position\': \'absolute\'}); return false;">'.$text.'</a> ';
|
||||
echo $text.'<a href="#" onclick="calculation_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#calculation\').css({\'position\': \'absolute\'}); return false;"><span class="faicon edit"></span></a> ';
|
||||
|
||||
// operator
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" class="dropdown medium">'."\n\r";
|
||||
@ -8479,9 +8492,10 @@ class Branching {
|
||||
|
||||
$SQ = new SurveyQuotas($this->anketa);
|
||||
$text = $SQ->quota_display($condition);
|
||||
if ($text == '<span class="quota_display"></span>') $text = $lang['srv_edit_quota'];
|
||||
if ($text == '<span class="quota_display"></span>')
|
||||
$text = '';
|
||||
|
||||
echo ' <a href="#" onclick="quota_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#quota\').css({\'position\': \'absolute\'}); return false;">'.$text.'</a> ';
|
||||
echo $text.'<a href="#" onclick="quota_editing(\''.$condition.'\', \'0\', \''.$vrednost.'\'); $(\'#quota\').css({\'position\': \'absolute\'}); return false;"><span class="faicon edit"></span></a> ';
|
||||
|
||||
// operator
|
||||
echo '<select name="operator_'.$condition.'" id="operator_'.$condition.'" onchange="javascript:condition_edit(\''.$condition.'\');" class="dropdown medium">'."\n\r";
|
||||
@ -8509,7 +8523,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.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
|
||||
echo '<label>'.$lang['srv_device_type'].':</label><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>';
|
||||
@ -8528,12 +8542,12 @@ class Branching {
|
||||
$sql = sisplet_query("SELECT * FROM srv_condition WHERE id='$condition'");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
echo $lang['srv_group'].': <select name="ostanek_'.$condition.'" id="ostanek_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">'."\n\r";
|
||||
echo '<label>'.$lang['srv_group'].':</label><select name="ostanek_'.$condition.'" id="ostanek_'.$condition.'" class="dropdown medium" onchange="javascript:condition_edit(\''.$condition.'\');">';
|
||||
|
||||
for ($i=0; $i<$row['modul']; $i++)
|
||||
echo '<option value="'.$i.'"'.($row['ostanek']==$i?' selected="selected"':'').'>'.($i+1).'</option>';
|
||||
|
||||
echo '</select>'."\n\r";
|
||||
echo '</select>';
|
||||
|
||||
}
|
||||
|
||||
|
@ -8287,7 +8287,7 @@ class Vprasanje {
|
||||
if($row['enota'] == 1 || $row['enota'] == 0){
|
||||
$display_trak = 'block';
|
||||
if($diferencial_trak == 1){
|
||||
$display_trak_starting_num = 'block';
|
||||
$display_trak_starting_num = 'flex';
|
||||
}
|
||||
else{
|
||||
$display_trak_starting_num = 'none';
|
||||
@ -8298,22 +8298,37 @@ class Vprasanje {
|
||||
$display_trak_starting_num = 'none';
|
||||
}
|
||||
|
||||
//koda za izris moznosti za vklop/izklop traku
|
||||
echo '<div class="diferencial_trak_class" style="display: '.$display_trak.'">';
|
||||
echo '<p><span class="title" ><label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].':</label></span>';
|
||||
echo '<span class="content">';
|
||||
echo '<input type="checkbox" value="1" name="diferencial_trak" '.( $diferencial_trak == 1 ? ' checked="checked"' : '') .' onChange="diferencial_trak_checkbox_prop('.$this->spremenljivka.', '.$row['grids'].');" id="diferencial_trak_'.$this->spremenljivka.'">';
|
||||
echo '<input '.$disable_diferencial_trak_hidden.' type="hidden" value="0" name="diferencial_trak" id="diferencial_trak_hidden_'.$this->spremenljivka.'">';
|
||||
echo '</span></p>';
|
||||
echo '</div>';
|
||||
|
||||
// koda za izris moznosti za vklop/izklop traku
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <span class="content">';
|
||||
|
||||
echo ' <input type="checkbox" value="1" name="diferencial_trak" '.( $diferencial_trak == 1 ? ' checked="checked"' : '') .' onChange="diferencial_trak_checkbox_prop('.$this->spremenljivka.', '.$row['grids'].');" id="diferencial_trak_'.$this->spremenljivka.'">';
|
||||
echo ' <label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].':</label>';
|
||||
echo ' <input '.$disable_diferencial_trak_hidden.' type="hidden" value="0" name="diferencial_trak" id="diferencial_trak_hidden_'.$this->spremenljivka.'">';
|
||||
|
||||
echo ' </span>';
|
||||
echo ' </div>';
|
||||
//koda za izris moznosti za vklop/izklop traku - konec
|
||||
|
||||
|
||||
//koda za izris polja za vnos zacetne stevilke traku
|
||||
echo '<div class="diferencial_trak_starting_num_class_'.$this->spremenljivka.'" style="display: '.$display_trak_starting_num.'"><p><span class="title">' . $lang['srv_diferencial_trak_starting_num'] . ':</span> <span class="content"><input type="text" name="diferencial_trak_starting_num" id="diferencial_trak_starting_num_'.$this->spremenljivka.'" value="' . $diferencial_trak_starting_num . '" size="8" onChange="diferencial_trak_change_values('.$this->spremenljivka.', '.$row['grids'].');"></input></span></p></div>';
|
||||
echo ' <div class="vprasanje_setting_line half-half diferencial_trak_starting_num_class_'.$this->spremenljivka.'" style="display:'.$display_trak_starting_num.'">';
|
||||
|
||||
echo '<div class="trak_num_of_titles_class" style="display: '.$display_trak_starting_num.'">';
|
||||
echo '<p><span class="title" >'.$lang['srv_trak_num_of_titles'].':</span>';
|
||||
echo '<span class="content"><select name="trak_num_of_titles" id="trak_num_of_titles">';
|
||||
echo ' <label>'.$lang['srv_diferencial_trak_starting_num'].':</label>';
|
||||
echo ' <span class="content">';
|
||||
echo ' <input type="text" name="diferencial_trak_starting_num" id="diferencial_trak_starting_num_'.$this->spremenljivka.'" value="' . $diferencial_trak_starting_num . '" size="8" onChange="diferencial_trak_change_values('.$this->spremenljivka.', '.$row['grids'].');">';
|
||||
echo ' </span>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half trak_num_of_titles_class" style="display: '.$display_trak_starting_num.'">';
|
||||
|
||||
echo ' <label>'.$lang['srv_trak_num_of_titles'].':</label>';
|
||||
echo ' <span class="content"><select name="trak_num_of_titles" id="trak_num_of_titles">';
|
||||
|
||||
$deljivaStevila = [];
|
||||
$indeksDeljivihStevil = 0;
|
||||
@ -8337,8 +8352,11 @@ class Vprasanje {
|
||||
echo '<option value="'.$deljivaStevila[$i].'"'.($trak_num_of_titles == $deljivaStevila[$i] ? ' selected="true"' : '') . '>'.$deljivaStevila[$i].'</option>';
|
||||
}
|
||||
echo '</select></span>';
|
||||
echo '</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
//posodobi skrite vrednosti odgovorov za diferencial trak
|
||||
|
@ -1563,6 +1563,7 @@ function fill_value(condition, vrednost) {
|
||||
function edit_fill_value(condition) {
|
||||
$('#edit_fill_value_' + condition).show();
|
||||
$('#preview_fill_value_' + condition).hide();
|
||||
$('#preview_fill_link_' + condition).hide();
|
||||
|
||||
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -40,6 +40,10 @@ and open the template in the editor.
|
||||
.if_content {
|
||||
width: 100%;
|
||||
|
||||
strong{
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
span.conditions_display {
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
@ -104,7 +108,8 @@ and open the template in the editor.
|
||||
|
||||
#div_condition_editing_inner {
|
||||
|
||||
>.condition_editing_preview {
|
||||
.condition_editing_preview {
|
||||
|
||||
}
|
||||
|
||||
.condition_editing_body{
|
||||
@ -160,21 +165,36 @@ and open the template in the editor.
|
||||
padding: 0 16px;
|
||||
|
||||
&.bracket{
|
||||
.faicon{
|
||||
flex-direction: column;
|
||||
|
||||
&:before{
|
||||
font-size: 14px;
|
||||
}
|
||||
.bracket_icons{
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: space-evenly;
|
||||
|
||||
&.icon-grey_normal:before{
|
||||
line-height: 22px;
|
||||
color: $very-dark-gray2;
|
||||
}
|
||||
width: 100%;
|
||||
|
||||
&.add{
|
||||
margin-right: 8px;
|
||||
.faicon{
|
||||
|
||||
&:before{
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
&.icon-grey_normal:before{
|
||||
line-height: 22px;
|
||||
color: $very-dark-gray2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bracket_text{
|
||||
font-size: 12px;
|
||||
line-height: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
&.variable{
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
&.operator{
|
||||
@ -186,12 +206,48 @@ and open the template in the editor.
|
||||
align-items: center;
|
||||
|
||||
input,
|
||||
select{
|
||||
margin-right: 4px;
|
||||
select,
|
||||
a{
|
||||
margin-right: 32px;
|
||||
|
||||
&.operator{
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
&[type="text"]{
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
&:last-child{
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.faicon.edit{
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.edit_fill_value,
|
||||
.preview_fill_value{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
label,
|
||||
span{
|
||||
display: flex;
|
||||
margin-bottom: 8px;
|
||||
|
||||
&:last-child{
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio::before {
|
||||
color: $very-dark-gray;
|
||||
}
|
||||
input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio::before {
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -220,7 +276,7 @@ and open the template in the editor.
|
||||
}
|
||||
|
||||
#div_condition_editing_operators {
|
||||
margin: 12px 0 0 0;
|
||||
margin: 4px 0 0 22px;
|
||||
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
|
@ -6,12 +6,12 @@
|
||||
#branching {
|
||||
|
||||
/* font awesom za admin */
|
||||
#variable_holder input[type="checkbox"].enka-admin-custom,
|
||||
#variable_holder input[type="radio"].enka-admin-custom {
|
||||
input[type="checkbox"].enka-admin-custom,
|
||||
input[type="radio"].enka-admin-custom {
|
||||
display: none !important;
|
||||
}
|
||||
#variable_holder input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
|
||||
#variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
|
||||
input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
|
||||
input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
|
||||
font-family: $fontawesome;
|
||||
display: inline-block;
|
||||
font-size: 16px;
|
||||
@ -19,35 +19,30 @@
|
||||
|
||||
font-weight: 400;
|
||||
}
|
||||
#variable_holder input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
|
||||
#variable_holder input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
|
||||
input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
|
||||
input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
padding-top: 4px;
|
||||
padding-left: 4px;
|
||||
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
#variable_holder input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
|
||||
/*content: "\f096";*/
|
||||
input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
|
||||
content: "\f0c8";
|
||||
letter-spacing: 10px;
|
||||
}
|
||||
#variable_holder input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
|
||||
/*content: "\f10c";*/
|
||||
input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
|
||||
content: "\f111";
|
||||
letter-spacing: 8px;
|
||||
}
|
||||
/* select, checked */
|
||||
#variable_holder input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
|
||||
/*content: "\f046";*/
|
||||
input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
|
||||
content: "\f14a";
|
||||
color: $dark-gray2;
|
||||
letter-spacing: 8px;
|
||||
}
|
||||
#variable_holder input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
|
||||
/*content: "\f192";*/
|
||||
input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
|
||||
content: "\f192";
|
||||
color: $dark-gray2;
|
||||
}
|
||||
|
@ -1,8 +1,5 @@
|
||||
// Email vabila
|
||||
|
||||
@import "vabila_navigation";
|
||||
|
||||
|
||||
// Layouti
|
||||
.page_invitations{
|
||||
|
||||
@ -65,4 +62,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@import "vabila_navigation";
|
||||
@import "vabila_main";
|
||||
|
1135
resources/sass/admin_new/pages/survey_objava/vabila_main.scss
Normal file
1135
resources/sass/admin_new/pages/survey_objava/vabila_main.scss
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user