Redesign - branching ifi in bloki

This commit is contained in:
pero1203 2022-01-13 11:52:43 +01:00
parent 63758c4451
commit e2cb4c7200
8 changed files with 698 additions and 476 deletions

View File

@ -1983,7 +1983,7 @@ class Branching {
$this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type");
if ($row['flat'] == 0)
$zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.(10+$this->level($spremenljivka,0)*20).'px"' : '' );
$zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.($this->level($spremenljivka,0)*32).'px"' : '' );
else
$zamik = '';
@ -2080,7 +2080,7 @@ class Branching {
if ($rowb['tip'] == 0) {
$this->conditions_display($if);
} elseif ($rowb['tip'] == 1) {
echo '<strong class="clr_bl">BLOCK</strong> <span class="colorblock">('.$rowb['number'].')</span>'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' <span class="if_comment">( '.$rowb['label'].' )</span>':'').'';
echo '<span class="clr_bl">BLOCK</span> <span class="colorblock">('.$rowb['number'].')</span>'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' <span class="if_comment">( '.$rowb['label'].' )</span>':'').'';
} elseif ($rowb['tip'] == 2) {
$this->loop_display($if);
}
@ -2097,7 +2097,7 @@ class Branching {
$rowb = Cache::srv_if($if);
if ($row['flat'] == 0)
$zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.(10+$this->level(0,$if)*20).'px"' : '' );
$zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.($this->level(0,$if)*32).'px"' : '' );
else
$zamik = '';
@ -2106,7 +2106,7 @@ class Branching {
// plusminus
if ($row['flat'] == 0)
echo '<a class="pm '.($rowb['collapsed']==1 && $row['flat']==0?'plus':'minus').'"></a>';
echo '<span class="pm faicon '.($rowb['collapsed']==1 && $row['flat']==0 ? 'plus' : 'minus').'"></span>';
$this->display_if_label($if);
@ -2177,8 +2177,8 @@ class Branching {
$rowb = Cache::srv_if($if);
if ($row['flat'] == 0) {
$zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . (10 + $this->level(0, $if) * 20) . 'px"' : '');
$zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . (10 + $this->level(0, $if) * 20) . 'px;width:' . (15 + $this->level(0, $if) * 20) . 'px;' : '');
$zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . ($this->level(0, $if) * 32) . 'px"' : '');
$zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . ($this->level(0, $if) * 32) . 'px;width:' . ($this->level(0, $if) * 32) . 'px;' : '');
}
else {
$zamik = '';
@ -2193,7 +2193,7 @@ class Branching {
}
echo '<li id="branching_endif'.$if.'" class="'.($rowb['tip']==0?'endif':($rowb['tip']==1?'endblock':'endloop')).'"'.$zamik.'>';
echo '<span class="'.($rowb['tip']==0?' clr_if':($rowb['tip']==1?' clr_bl':' clr_lp')).'"><strong>'.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).'</strong></span> <span class="'.($rowb['tip']==0?'colorif':($rowb['tip']==1?'colorblock':'colorloop')).'">('.$rowb['number'].')</span>'."\n\r";
echo '<span class="'.($rowb['tip']==0?' clr_if':($rowb['tip']==1?' clr_bl':' clr_lp')).'">'.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).'</span> <span class="'.($rowb['tip']==0?'colorif':($rowb['tip']==1?'colorblock':'colorloop')).'">('.$rowb['number'].')</span>'."\n\r";
// Dodajanje komentarjev na if/blok
if ($this->displayKomentarji !== false) {
@ -2675,10 +2675,14 @@ class Branching {
echo ' <span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''.$row1['id'].'\', false); return false;" title="'.$lang['upload_img2'].'"></span>';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
//koda za notranji IF
if ($row1['if_id'] > 0) {
@ -2694,15 +2698,20 @@ class Branching {
}
else{
if ($length > 30) $class = 'ranking_long'; $class = 'ranking';
//echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
echo '<div class="variabla" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
//koda za notranji IF
// koda za notranji IF
if ($row1['if_id'] > 0) {
echo ' <span class="red">*</span>';
@ -2782,13 +2791,13 @@ class Branching {
}
if ($row['tip'] == 1 && $row['orientation'] != 8 && $row['orientation'] != 10) {
//echo ' <div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'"><span class="sprites move_updown_orange inline inline_move" title="'.$lang['srv_move'].'"></span> <input type="radio" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" /> <label for="foo_' . $row1['id'] . '">' . $row1['naslov'] . '</label>';
if($row['orientation'] == 6){
echo ' <div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'"><span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span> <div class="variable_inline variable_inline_'.$row['id'].'" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div><div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '</div>';
}
elseif($row['orientation'] == 7){
//echo ' <div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'"><span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span><div class="variable_inline variable_inline_'.$row['id'].'" contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div><div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline '.$missing_warning.'" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false?' default="1"':'').'>' . $row1['naslov'] . '</div> <input type="radio" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" onclick="return false" />';
echo ' <div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'"><span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span><div class="variable_inline variable_inline_'.$row['id'].'" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div><div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline '.$missing_warning.'" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '</div>';
echo ' <div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'"><span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span><div class="variable_inline variable_inline_'.$row['id'].'" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" vre_id='.$row1['id'].' tabindex="1">'.$row1['variable'].'</div><div id="vre_id_' . $row1['id'] . '" vre_id='.$row1['id'].' contenteditable="'.(!$locked?'true':'false').'" class="vrednost_inline '.$missing_warning.'" tabindex="1" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '</div>';
if ($row1['other'] == 1){
$otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1);
@ -2812,17 +2821,18 @@ class Branching {
echo ' <span class="faicon warning icon-orange"></span>';
}
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
if($row['tip'] == 1)
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_no '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_no '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo '</div>';
echo '<input type="radio" class="enka-admin-custom" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" onclick="return false" />';
echo '<span class="enka-checkbox-radio"></span>';
echo'</div>';
echo '</div>';
}
elseif($row['orientation'] == 9){
echo '<div class="variabla custom_radio ' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">
@ -2899,13 +2909,14 @@ class Branching {
echo ' <span class="faicon warning icon-orange"></span>';
}
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
if($row['tip'] == 1)
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo'<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="enka-admin-custom ' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onclick="return false" />';
echo '<span class="enka-checkbox-radio"></span>';
@ -2958,21 +2969,24 @@ class Branching {
if ($this->condition_check($row1['if_id']) != 0)
echo ' <span class="faicon warning icon-orange"></span>';
}
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
// Kljukica za kviz
if(SurveyInfo::getInstance()->checkSurveyModule('quiz')){
$sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'");
$sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'");
echo ' <span class="faicon correct inline '.(mysqli_num_rows($sqlQ) > 0 ? ' show-correct' : '').'" spr_id="'.$row['id'].'" vre_id="'.$row1['id'].'" title="'.$lang['srv_vrednost_correct'].'"></span>';
}
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3)
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3)
echo ' <span class="faicon odg_if_follow inline inline_if_follow '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="follow_up_condition(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_follow_up'].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
@ -3161,10 +3175,13 @@ class Branching {
echo '<tr class="variabla" id="variabla_'.$row1['id'].'">';
echo '<td class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="f_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
@ -3351,10 +3368,13 @@ class Branching {
echo '<tr class="variabla" id="variabla_'.$row1['id'].'">';
echo '<td class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="f_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
@ -3609,10 +3629,13 @@ class Branching {
echo ' <tr class="variabla" id="variabla_'.$row1['id'].'">';
echo ' <td class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="f_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
@ -3906,11 +3929,13 @@ class Branching {
//sredinski del z besedilom
echo ' <td style="text-align:center;" class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
@ -4021,16 +4046,20 @@ class Branching {
if ($length > 30) $class = 'ranking_long'; $class = 'ranking';
//echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
echo '<div class="variabla" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
//koda za notranji IF
// koda za notranji IF
if ($row1['if_id'] > 0) {
echo ' <span class="red">*</span>';
@ -4439,10 +4468,13 @@ class Branching {
echo ' <tr class="variabla" '.$style.' id="variabla_'.$row1['id'].'">';
echo ' <td class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
if($row['enota'] != 9){
@ -4823,10 +4855,13 @@ class Branching {
echo '<div class="variabla' . $cssFloat . '" id="variabla_'.$_other['id'].'" other="'.$_other['other'].'">';
echo ' <input type="checkbox" name="foo_' . $_other['id'] . '" id="foo_' . $_other['id'] . '" value="" class="' . (($_other['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$_other['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$_other['id'].'">' . $_other['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
@ -5198,8 +5233,11 @@ class Branching {
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
}
}
@ -5239,10 +5277,14 @@ class Branching {
echo '<div class="variabla' . $cssFloat . '" id="variabla_'.$row1['id'].'" other="'.$row1['other'].'">';
echo '<input type="checkbox" name="foo_' . $row['id'] . '" id="foo_' . $row1['id'] . '" value="" class="' . (($row['checkboxhide'] == 1) ? 'hidden' : '') . '" onClick="return false;"/>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$missing_warning.'" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'">' . $row1['naslov'] . '</div>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '</div>';
}
@ -5283,10 +5325,13 @@ class Branching {
echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
@ -5339,10 +5384,13 @@ class Branching {
echo '<div class="variabla" id="variabla_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline '.$class.'" style="float:none" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
@ -5398,10 +5446,13 @@ class Branching {
echo '<div class="variabla '.$cssFloat.'" id="variabla_'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
//echo '<input type="textfield" size="2"> ';
echo '<select style="width:50px; margin-top:0; float:left;">';
@ -5457,10 +5508,13 @@ class Branching {
echo '<div class="variabla variabla_vsota" id="variabla_'.$row1['id'].'" style="width:100%; ">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline vrednost_inline_vsota '.$class.'" style="width:'.($gridWidth*7).'px" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'</div>';
@ -5964,11 +6018,14 @@ class Branching {
echo ' <tr class="variabla" id="variabla_'.$row1['id'].'">';
echo ' <td class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" '.($gridWidth == -1 ? '' : $css ).' id="'.$row1['id'].'">';
echo '<span class="faicon move_updown inline inline_move" title="'.$lang['srv_move'].'"></span>';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <div class="icons_holder">';
echo ' <span class="faicon delete small inline inline_delete" title="'.$lang['srv_brisivrednost'].'"></span>';
echo ' <span class="faicon odg_hidden inline inline_hidden '. (($row1['hidden'] == 1) ? 'show-hidden' : '').(($row1['hidden'] == 2) ? 'show-disable' : '') .'" odg_vre="'.$row1['hidden'].'" odg_id="'.$row1['id'].'" title="'.$lang['srv_hide-disable_answer-'.$row1['hidden']].'"></span>';
echo ' <span class="faicon odg_if_not inline inline_if_not '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" onclick="vrednost_condition_editing(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
echo ' <span class="faicon edit2 inline inline_edit"></span>';
echo ' </div>';
echo '<div class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
if ($row1['if_id'] > 0) {
@ -6907,7 +6964,7 @@ class Branching {
$rowb = Cache::srv_if($if);
//začetek oklepaja za ZANKO
echo '<strong class="clr_lp">LOOP</strong> <span class="colorloop">('.$rowb['number'].')</span>';
echo '<span class="clr_lp">LOOP</span> <span class="colorloop">('.$rowb['number'].')</span>';
$sql = sisplet_query("SELECT l.spr_id, s.variable FROM srv_loop l, srv_spremenljivka s WHERE l.if_id='$if' AND l.spr_id=s.id");
$row = mysqli_fetch_array($sql);
@ -7666,7 +7723,7 @@ class Branching {
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>':'').'';
echo '<span class="clr_bl">BLOCK</span> <span class="colorblock">('.$row['number'].')</span>'.($row['enabled']==2?' FALSE ':'').($row['label']!=''?' <span class="if_comment">( '.$row['label'].' )</span>':'').'';
}

View File

@ -239,7 +239,7 @@ function branching_click(event) {
// plusminus if, blok
if (ta.is('a.pm')) {
if (ta.is('span.pm')) {
var id = ta.parent().attr('id');
id = id.replace('branching_if', '');
plusminus(id);
@ -1218,16 +1218,16 @@ function condition_editing_close(_if, if_nova) {
var plus = 0;
if ($('#branching_if' + _if + ' a.pm').hasClass('plus'))
if ($('#branching_if' + _if + ' span.pm').hasClass('plus'))
plus = 1;
$.post('ajax.php?t=branching&a=condition_editing_close', {anketa: srv_meta_anketa_id, 'if': _if, if_nova: if_nova},
function (data) {
if (plus == 1)
$('#branching_if' + _if).html('<a class="pm plus"></a>' + data);
$('#branching_if' + _if).html('<span class="pm faicon plus"></span>' + data);
else
$('#branching_if' + _if).html('<a class="pm minus"></a>' + data);
$('#branching_if' + _if).html('<span class="pm faicon minus"></span>' + data);
if ($('#vprasanje').css('display') == 'block') { // refreshamo tudi preview pogoja v urejanju vprasanja
@ -1852,7 +1852,7 @@ function vprasanje_edit(spremenljivka, buffer) {
function plusminus(id, odpremo) {
var a = $('#branching_if' + id + ' a.pm');
var a = $('#branching_if' + id + ' span.pm');
// blok/if je prikazan, mi ga bomo skrili
if (a.hasClass('minus') && odpremo != 1) {
@ -2173,7 +2173,7 @@ function expandCollapseAllPlusMinus(what) {
var id = $(this).attr('id').replace('branching_if', '');
var a = $('#branching_if' + id + ' a.pm');
var a = $('#branching_if' + id + ' span.pm');
if (what == 'expand') {
// blok/if je skrit

View File

@ -705,23 +705,31 @@ function inline_nova_vrednost (_this) {
new_div += '<span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>';
new_div += '<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
' <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
(($(_this).closest('.variabla').parent().find('.correct').length) ? ' <span class="faicon correct inline" spr_id="'+spremenljivka+'" vre_id="\''+$(_this).attr('vre_id')+'\'" title="'+lang['srv_vrednost_correct']+'"></span>' : '')+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
'</div>';
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'</div>';
}
else{
new_div += '<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
' <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+lang['srv_brisivrednost']+'"></span>'+
(($(_this).closest('.variabla').parent().find('.correct').length) ? ' <span class="faicon correct inline" spr_id="'+spremenljivka+'" vre_id="\''+$(_this).attr('vre_id')+'\'" title="'+lang['srv_vrednost_correct']+'"></span>' : '')+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'</div>';
}
}
@ -734,12 +742,16 @@ function inline_nova_vrednost (_this) {
new_div += '<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <span class="inline_other pointer" onclick="vrednost_new(\''+spremenljivka+'\', \'1\', \'\'); $(\'#fieldset'+spremenljivka+'\').show();"><span class="faicon add small icon-as_link" title="'+'"></span> '+lang['srv_novavrednost_drugo']+'</span>'+
' <input id="foo_new" type="'+(tip==1?'radio':'checkbox')+'" value="" name="foo_new" />'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
'</div>';
' <div class="icons_holder">'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_follow inline inline_if_follow '+if_class_locked+'" onclick="follow_up_condition(\'new\'); return false;" title="'+lang['srv_follow_up']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'</div>';
}
}
else if(tip <= 2 && orientation == 8){ //ce imamo radio ali checkbox z drag-drop
@ -749,20 +761,30 @@ function inline_nova_vrednost (_this) {
if($(_this).closest('.variabla').parent().find('.image_upload').length){
new_div += '<span class="sprites image_upload pointer" onclick="vrednost_insert_image(\''+$(_this).attr('vre_id')+'\', true); return false;" title="'+lang['upload_img2']+'"></span>'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
' <div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
} else{
new_div += '<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
}
}
//} else if(tip == 6 && enota == 9){ //ce imamo drag-drop v gridu
@ -770,12 +792,17 @@ function inline_nova_vrednost (_this) {
//drag and drop grid
var new_div = '<div id="variabla_new" class="variabla after_'+$(_this).attr('vre_id')+'">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
'</div>';
// ranking
} else if (tip == 17) {
@ -784,14 +811,19 @@ function inline_nova_vrednost (_this) {
var new_div = '<div id="variabla_new" class="variabla after_'+$(_this).attr('vre_id')+'">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
' <select style="width:50px; margin-top:0; float:left;"> '+
' <option></option> '+
' </select> '+
'<div id="vre_id_new" class="vrednost_inline" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
}
@ -800,10 +832,14 @@ function inline_nova_vrednost (_this) {
var new_div = '<div id="variabla_new" class="variabla after_'+$(_this).attr('vre_id')+'">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline ranking" style="float:none" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
'</div>';
}
@ -813,10 +849,14 @@ function inline_nova_vrednost (_this) {
var new_div = '<div id="variabla_new" class="variabla variabla_vsota after_'+$(_this).attr('vre_id')+'" style="width:100%">'+
'<span class="faicon move_updown inline inline_move" title=""></span>'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' <div class="icons_holder">'+
' <span class="faicon delete small inline inline_delete" title="'+'"></span>'+
' <span class="faicon odg_hidden inline inline_hidden" odg_vre="0" odg_id="new" title="'+lang['srv_hide-disable_answer-0']+'"></span>'+
' <span class="faicon odg_if_not inline inline_if_not '+if_class_locked+'" onclick="vrednost_condition_editing(\'new\'); return false;" title="'+lang['srv_podif_edit']+'"></span>'+
' <span class="faicon edit2 inline inline_edit"></span>'+
' </div>'+
'<div id="vre_id_new" class="vrednost_inline" style="width:111px" contenteditable="true" tabindex="1" default="1" vre_id="new">'+lang['srv_new_vrednost']+'</div>'+
' <input type="text" name="foo_" maxlength="8" size="5">'+
'</div>';

View File

@ -10739,6 +10739,70 @@ and open the template in the editor.
/*
Specific pages scss
*/
/*
Branching ikone, radio, checkboxi...
*/
#branching {
/* font awesom za admin */
/* select, checked */
}
#branching #variable_holder input[type=checkbox].enka-admin-custom,
#branching #variable_holder input[type=radio].enka-admin-custom {
display: none !important;
}
#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before,
#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
font-family: "Font Awesome 5 Free";
display: inline-block;
font-size: 16px;
color: #D3D3D3;
font-weight: 400;
}
#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
#branching #variable_holder 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;
}
#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before {
/*content: "\f096";*/
content: "";
letter-spacing: 10px;
}
#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before {
/*content: "\f10c";*/
content: "";
letter-spacing: 8px;
}
#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before {
/*content: "\f046";*/
content: "";
color: #D3D3D3;
letter-spacing: 8px;
}
#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before {
/*content: "\f192";*/
content: "";
color: #D3D3D3;
}
#branching span.faicon.delete_circle::before {
font-size: 14px;
}
#branching span.faicon.add::before {
font-size: 14px;
}
#branching span.faicon.plus::before,
#branching span.faicon.minus::before {
cursor: pointer;
font-size: 12px;
color: #1E88E5;
}
#branching span.faicon.inline::before {
font-size: 14px !important;
}
/*
Osnova za branching
*/
@ -13259,78 +13323,144 @@ and open the template in the editor.
Created on : 13-Aug-2018, 12:32:48
Author : podkrizniku
*/
li.if .if_remove,
li.block .if_remove,
li.loop .if_remove,
li.if .if_remove {
#branching {
/*if condition variable select*/
}
#branching li.if,
#branching li.block,
#branching li.loop {
display: flex;
}
#branching li.if .if_remove,
#branching li.block .if_remove,
#branching li.loop .if_remove {
display: none;
}
li.if:hover span.conditions_display,
li.block:hover span.conditions_display,
li.loop:hover span.conditions_display,
li.if:hover span.conditions_display {
cursor: pointer;
}
li.if:hover div.if_remove,
li.block:hover div.if_remove,
li.loop:hover div.if_remove,
li.if:hover div.if_remove {
display: block;
}
li.endif:hover,
li.endblock:hover,
li.endloop:hover,
li.inout:hover {
cursor: pointer;
}
li.if.if_editing div.if_remove,
li.block.if_editing div.if_remove,
li.loop.if_editing div.if_remove {
display: block;
}
a.pm {
z-index: 5;
position: absolute;
left: auto;
float: none;
margin: 9px 0 0 -15px;
top: 8px;
right: 16px;
}
#branching li.if .if_remove a,
#branching li.block .if_remove a,
#branching li.loop .if_remove a {
margin-left: 16px;
}
#branching li.if .pm.faicon,
#branching li.block .pm.faicon,
#branching li.loop .pm.faicon {
padding: 3px 8px 0 0;
margin-left: -20px;
}
#branching li.if .if_content .clr_if,
#branching li.if .if_content .clr_bl,
#branching li.if .if_content .clr_lp,
#branching li.block .if_content .clr_if,
#branching li.block .if_content .clr_bl,
#branching li.block .if_content .clr_lp,
#branching li.loop .if_content .clr_if,
#branching li.loop .if_content .clr_bl,
#branching li.loop .if_content .clr_lp {
color: #1E88E5;
font-weight: 600;
}
#branching li.if .if_content .colorif,
#branching li.if .if_content .colorblock,
#branching li.if .if_content .colorif,
#branching li.block .if_content .colorif,
#branching li.block .if_content .colorblock,
#branching li.block .if_content .colorif,
#branching li.loop .if_content .colorif,
#branching li.loop .if_content .colorblock,
#branching li.loop .if_content .colorif {
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;
}
a.pm.minus {
margin-top: 12px;
}
.endif_editing {
background-color: #1E88E5;
}
li.if_editing div.if_content:before {
background-color: #1E88E5;
content: "";
#branching li.if:hover div.if_remove,
#branching li.block:hover div.if_remove,
#branching li.loop:hover div.if_remove {
display: block;
height: 15px;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}
span.IF_title_start {
#branching li.if.if_editing div.if_remove,
#branching li.block.if_editing div.if_remove,
#branching li.loop.if_editing div.if_remove {
display: block;
}
#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;
}
#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;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
}
#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.endif:hover,
#branching li.endblock:hover,
#branching li.endloop:hover,
#branching li.inout:hover {
cursor: pointer;
}
#branching li.endif .clr_if,
#branching li.endif .clr_bl,
#branching li.endif .clr_lp,
#branching li.endblock .clr_if,
#branching li.endblock .clr_bl,
#branching li.endblock .clr_lp,
#branching li.endloop .clr_if,
#branching li.endloop .clr_bl,
#branching li.endloop .clr_lp,
#branching li.inout .clr_if,
#branching li.inout .clr_bl,
#branching li.inout .clr_lp {
color: #1E88E5;
font-weight: 600;
}
#branching li.endif .colorif,
#branching li.endif .colorblock,
#branching li.endif .colorif,
#branching li.endblock .colorif,
#branching li.endblock .colorblock,
#branching li.endblock .colorif,
#branching li.endloop .colorif,
#branching li.endloop .colorblock,
#branching li.endloop .colorif,
#branching li.inout .colorif,
#branching li.inout .colorblock,
#branching li.inout .colorif {
color: #1E88E5;
font-weight: 400;
}
#branching li.endif_editing {
padding: 12px;
background-color: #F2F2F2;
border-left: 2px #1E88E5 solid;
}
#branching span.IF_title_start {
font-weight: 900;
color: #1E88E5;
margin-right: 8px;
}
span.IF_title {
#branching span.IF_title {
font-weight: 600;
text-transform: uppercase;
}
span.IF_title_line {
#branching span.IF_title_line {
content: "";
display: inline-block;
height: 0.5em;
@ -13339,73 +13469,49 @@ span.IF_title_line {
margin-top: 8px;
border-top: 1px solid #C4C4C4;
}
span.conditions_display {
#branching span.conditions_display {
display: block;
line-height: 28px;
}
/*if condition variable select*/
select.spremenljivka_select option {
#branching select.spremenljivka_select option {
max-width: 500px;
}
.condition {
#branching .condition {
position: relative;
left: -21px;
}
span.endif {
#branching span.endif {
position: relative;
left: -29px;
font-weight: bold;
}
.block > div > #div_condition_editing_container {
#branching .block > div > #div_condition_editing_container {
background-color: #1E88E5;
line-height: 28px;
}
.loop > div > #div_condition_editing_container {
#branching .loop > div > #div_condition_editing_container {
padding-top: 6px;
}
#div_condition_editing_inner {
background-color: #F2F2F2;
padding: 16px;
}
#div_condition_editing_inner .condition_editing_body {
max-height: 50vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
}
#div_condition_editing_inner .condition_editing_body .tbl_condition_editing {
margin-bottom: 5px;
}
#div_condition_editing_operators {
#branching #div_condition_editing_operators {
padding: 5px 0;
}
#div_condition_editing {
#branching #div_condition_editing {
display: none;
height: auto;
width: 800px;
}
#div_condition_editing div#div_condition_editing_container {
#branching #div_condition_editing div#div_condition_editing_container {
margin-bottom: 44px;
}
#div_condition_editing .error_display {
#branching #div_condition_editing .error_display {
background-color: transparent;
}
#div_condition_editing .condition_editing_vrednost_title {
#branching #div_condition_editing .condition_editing_vrednost_title {
margin: -5px 0 15px 5px;
font-size: 14px;
font-weight: 600;
}
#div_condition_editing_float {
#branching #div_condition_editing_float {
position: absolute;
top: 0;
right: -335px;
@ -13414,98 +13520,80 @@ span.endif {
background-color: white;
border: 1px solid #1E88E5;
}
#div_condition_editing_float h2 {
#branching #div_condition_editing_float h2 {
margin-top: 0;
padding: 10px;
border-bottom: 0;
margin: 0 -10px 0 -10px;
background-color: #1E88E5;
}
#div_condition_editing_float p {
#branching #div_condition_editing_float p {
padding: 3px;
margin: 10px 0;
}
#div_condition_editing_float p.heading {
#branching #div_condition_editing_float p.heading {
border: 0;
background: none;
padding: 0;
}
#div_condition_editing_float span.content {
#branching #div_condition_editing_float span.content {
float: right;
}
#div_condition_editing_float fieldset {
#branching #div_condition_editing_float fieldset {
margin: 11px 0;
padding: 0;
border: 0;
border-top: 1px solid #1E88E5;
}
#div_condition_editing_float legend {
#branching #div_condition_editing_float legend {
background-color: transparent;
color: #1E88E5;
font-weight: 500;
margin: 0;
padding: 0 10px 0 5px;
}
.error_display {
#branching .error_display {
display: block;
line-height: 24px;
}
.tbl_ce_bck_blue {
#branching .tbl_ce_bck_blue {
background-color: #1E88E5;
}
.tbl_ce_lol {
#branching .tbl_ce_lol {
border-top: 1px solid #E5E5E5;
border-bottom: 1px solid #E5E5E5;
border-left: 1px solid #E5E5E5;
}
.tbl_ce_tb {
#branching .tbl_ce_tb {
border-top: 1px solid #E5E5E5;
border-bottom: 1px solid #E5E5E5;
}
.tbl_ce_lor {
#branching .tbl_ce_lor {
border-top: 1px solid #E5E5E5;
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
}
.if_remove {
z-index: 5;
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
padding-top: 9px;
}
.endif a.surveycomment {
#branching .endif a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
.endblock a.surveycomment {
#branching .endblock a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
#condition_editing_bottom_placeholder {
#branching #condition_editing_bottom_placeholder {
display: block;
height: 1px;
margin-bottom: 15px;
border-top: 1px solid #1E88E5;
}
.tbl_condition_editing {
#branching .tbl_condition_editing {
width: 98%;
border-spacing: 0px;
margin: 0px 1% 0px 1%;
border-collapse: collapse;
}
.tbl_condition_editing th {
#branching .tbl_condition_editing th {
color: #E5E5E5;
font-weight: normal;
}

View File

@ -8,272 +8,294 @@ and open the template in the editor.
Author : podkrizniku
*/
#branching{
li.if,
li.block,
li.loop{
display: flex;
li.if,
li.block,
li.loop,
li.if{
.if_remove{
display: none;
z-index: 5;
position: absolute;
top: 8px;
right: 16px;
.if_remove{
display: none;
a{
margin-left: 16px;
}
}
.pm.faicon{
padding: 3px 8px 0 0;
margin-left: -20px;
}
.if_content {
.clr_if,
.clr_bl,
.clr_lp{
color: $blue;
font-weight: 600;
}
.colorif,
.colorblock,
.colorif{
color: $blue;
font-weight: 400;
}
}
&:hover {
span.conditions_display {
cursor: pointer;
}
div.if_remove {
display: block;
}
}
}
&:hover {
span.conditions_display {
cursor: pointer;
}
li.if.if_editing,
li.block.if_editing,
li.loop.if_editing{
div.if_remove {
display: block;
}
}
}
li.endif,
li.endblock,
li.endloop,
li.inout{
&:hover {
cursor: pointer;
}
}
.if_content {
padding: 12px 16px 16px 16px;
li.if.if_editing,
li.block.if_editing,
li.loop.if_editing{
div.if_remove {
display: block;
}
}
background-color: $light-gray2;
border-left: 2px $blue solid;
#div_condition_editing_inner {
a.pm {
position: absolute;
left: auto;
float: none;
margin: 9px 0 0 -15px;
cursor: pointer;
}
a.pm.minus {
margin-top: 12px;
}
.endif_editing {
background-color: $blue;
}
li.if_editing {
div.if_content {
&:before {
background-color: $blue;
content: "";
display: block;
height: 15px;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}
}
}
// 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;
}
.block {
>div {
>#div_condition_editing_container {
background-color: $blue;
line-height: 28px;
}
}
}
.loop {
>div {
>#div_condition_editing_container {
padding-top: 6px;
}
}
}
#div_condition_editing_inner {
background-color: $light-gray2;
padding: 16px;
>.condition_editing_preview {
}
.condition_editing_body{
max-height: 50vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
.tbl_condition_editing{
margin-bottom: 5px;
>.condition_editing_preview {
}
.condition_editing_body{
max-height: 50vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
.tbl_condition_editing{
margin-bottom: 5px;
}
}
}
}
}
}
#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;
}
}
#div_condition_editing_float {
position: absolute;
top: 0;
right: -335px;
width: 290px;
padding: 0 10px 15px 10px;
background-color: white;
border: 1px solid $blue;
li.endif,
li.endblock,
li.endloop,
li.inout{
&:hover {
cursor: pointer;
}
h2 {
margin-top: 0;
padding: 10px;
border-bottom: 0;
margin: 0 -10px 0 -10px;
background-color: $blue;
}
p {
padding: 3px;
margin: 10px 0;
}
p.heading {
border: 0;
background: none;
padding: 0;
}
span.content {
float: right;
}
fieldset {
margin: 11px 0;
padding: 0;
border: 0;
border-top: 1px solid $blue;
}
legend {
background-color: transparent;
color: $blue;
font-weight: 500;
margin: 0;
padding: 0 10px 0 5px;
}
}
.error_display {
display: block;
line-height: 24px;
}
.tbl_ce_bck_blue {
background-color: $blue;
}
.tbl_ce_lol {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
border-left: 1px solid $gray;
}
.tbl_ce_tb {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
}
.tbl_ce_lor {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
border-right: 1px solid $gray;
}
.if_remove {
z-index: 5;
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
padding-top: 9px;
}
.endif {
a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
}
.endblock {
a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
}
#condition_editing_bottom_placeholder {
display: block;
height: 1px;
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;
}
.clr_if,
.clr_bl,
.clr_lp{
color: $blue;
font-weight: 600;
}
.colorif,
.colorblock,
.colorif{
color: $blue;
font-weight: 400;
}
}
li.endif_editing {
padding: 12px;
background-color: $light-gray2;
border-left: 2px $blue solid;
}
// 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;
}
.block {
>div {
>#div_condition_editing_container {
background-color: $blue;
line-height: 28px;
}
}
}
.loop {
>div {
>#div_condition_editing_container {
padding-top: 6px;
}
}
}
#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;
}
}
#div_condition_editing_float {
position: absolute;
top: 0;
right: -335px;
width: 290px;
padding: 0 10px 15px 10px;
background-color: white;
border: 1px solid $blue;
h2 {
margin-top: 0;
padding: 10px;
border-bottom: 0;
margin: 0 -10px 0 -10px;
background-color: $blue;
}
p {
padding: 3px;
margin: 10px 0;
}
p.heading {
border: 0;
background: none;
padding: 0;
}
span.content {
float: right;
}
fieldset {
margin: 11px 0;
padding: 0;
border: 0;
border-top: 1px solid $blue;
}
legend {
background-color: transparent;
color: $blue;
font-weight: 500;
margin: 0;
padding: 0 10px 0 5px;
}
}
.error_display {
display: block;
line-height: 24px;
}
.tbl_ce_bck_blue {
background-color: $blue;
}
.tbl_ce_lol {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
border-left: 1px solid $gray;
}
.tbl_ce_tb {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
}
.tbl_ce_lor {
border-top: 1px solid $gray;
border-bottom: 1px solid $gray;
border-right: 1px solid $gray;
}
.endif {
a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
}
.endblock {
a.surveycomment {
padding-right: 15px;
font-size: 10px;
}
}
#condition_editing_bottom_placeholder {
display: block;
height: 1px;
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;
}
}
}

View File

@ -52,6 +52,7 @@
color: $dark-gray2;
}
// Dodajanje, brisanje
span.faicon.delete_circle::before {
font-size: 14px;
}
@ -59,4 +60,17 @@
font-size: 14px;
}
// Plus, minus
span.faicon.plus::before,
span.faicon.minus::before{
cursor: pointer;
font-size: 12px;
color: $blue;
}
span.faicon.inline::before{
font-size: 14px !important;
}
}

View File

@ -18,4 +18,4 @@ and open the template in the editor.
@import "preview";
@import "ranking";
@import "location";
@import "take_picture";
@import "take_picture";

View File

@ -1,4 +1,5 @@
// Urejanje ankete
@import "icons";
@import "branching";
@import "toolbox";
@import "glasovanje";