Merge branch 'master' of https://git.1ka.si:/git/1ka
This commit is contained in:
tejagerjovic
commit
41ef5b27db
@ -7475,23 +7475,51 @@ class Branching {
|
|||||||
// floating box
|
// floating box
|
||||||
echo '<div id="div_condition_editing_float">';
|
echo '<div id="div_condition_editing_float">';
|
||||||
|
|
||||||
|
|
||||||
|
echo '<div class="condition_header">';
|
||||||
|
|
||||||
if ($row['tip'] == 0)
|
if ($row['tip'] == 0)
|
||||||
echo '<h2>'.$lang['oblikovanje_if'].'</h2>';
|
echo $lang['oblikovanje_if'];
|
||||||
elseif ($row['tip'] == 1)
|
elseif ($row['tip'] == 1)
|
||||||
echo '<h2>'.$lang['oblikovanje_blok'].'</h2>';
|
echo $lang['oblikovanje_blok'];
|
||||||
elseif ($row['tip'] == 2)
|
elseif ($row['tip'] == 2)
|
||||||
echo '<h2>'.$lang['srv_loop_urejanje'].'</h2>';
|
echo $lang['srv_loop_urejanje'];
|
||||||
|
|
||||||
if ($row['tip'] == 0)
|
echo '</div>';
|
||||||
echo '<p class="heading">'.$lang['srv_edit_condition_question'].'</p>';
|
|
||||||
elseif ($row['tip'] == 1)
|
|
||||||
echo '<p class="heading">'.$lang['srv_block_desc'].'</p>';
|
echo '<div class="condition_edit">';
|
||||||
|
|
||||||
|
|
||||||
|
echo '<fieldset><legend>'.$lang['srv_common_settings'].'</legend>';
|
||||||
|
|
||||||
|
if ($row['tip'] == 0){
|
||||||
|
echo '<div class="condition_setting_holder">';
|
||||||
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo '<p>'.$lang['srv_edit_condition_question'].'</p>';
|
||||||
|
echo ' </div>';
|
||||||
|
echo '</div>';
|
||||||
|
}
|
||||||
|
elseif ($row['tip'] == 1){
|
||||||
|
echo '<div class="condition_setting_holder">';
|
||||||
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo '<p>'.$lang['srv_block_desc'].'</p>';
|
||||||
|
echo ' </div>';
|
||||||
|
echo '</div>';
|
||||||
|
}
|
||||||
|
|
||||||
if ($vrednost != -1 && $vrednost != -2) {
|
if ($vrednost != -1 && $vrednost != -2) {
|
||||||
echo '<p><span class="title">';
|
|
||||||
echo ($row['tip']==0?$lang['srv_if_label']:($row['tip']==1?$lang['srv_block_label']:$lang['srv_loop_label'])).':</span>';
|
echo '<div class="condition_setting_holder">';
|
||||||
echo '<span class="content"><input type="text" name="label_'.$if.'" id="label_'.$if.'" value="'.$row['label'].'" ></span>';
|
|
||||||
echo '</p>';
|
echo ' <div class="condition_setting_line half-half">';
|
||||||
|
echo ' <label>'.($row['tip'] == 0 ? $lang['srv_if_label'] : ($row['tip'] == 1 ? $lang['srv_block_label'] :$lang['srv_loop_label'])).':</label>';
|
||||||
|
echo ' <span class="content">';
|
||||||
|
echo ' <input type="text" name="label_'.$if.'" id="label_'.$if.'" value="'.$row['label'].'">';
|
||||||
|
echo ' </span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
|
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
|
||||||
echo '$(document).ready(function() {' .
|
echo '$(document).ready(function() {' .
|
||||||
@ -7500,23 +7528,32 @@ class Branching {
|
|||||||
' });' .
|
' });' .
|
||||||
'});';
|
'});';
|
||||||
echo '</script>';
|
echo '</script>';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '</fieldset>';
|
||||||
|
|
||||||
|
|
||||||
if ($row['tip'] == 0 || $row['tip'] == 1) {
|
if ($row['tip'] == 0 || $row['tip'] == 1) {
|
||||||
|
|
||||||
echo '<fieldset>';
|
echo '<fieldset><legend>'.($row['tip'] == 1 ? $lang['srv_block_enabled'] : $lang['srv_if_enabled']).'</legend>';
|
||||||
|
|
||||||
echo '<p><span class="title">'.($row['tip'] == 1 ? $lang['srv_block_enabled'] : $lang['srv_if_enabled']).':</span>';
|
echo '<div class="condition_setting_holder">';
|
||||||
|
|
||||||
echo'<span class="displayBlock" style="padding:5px 0 0 5px;">';
|
echo ' <div class="condition_setting_line">';
|
||||||
echo '<label for="if_edit_0"><input type="radio" class="enka-admin-custom" value="0" name="if_edit" id="if_edit_0" '.($row['enabled']==0?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><span class="enka-checkbox-radio"></span>'.$lang['srv_if_enabled_'.$row['tip']].'</label>';
|
echo ' <input type="radio" class="enka-admin-custom" value="0" name="if_edit" id="if_edit_0" '.($row['enabled']==0?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><label for="if_edit_0">'.$lang['srv_if_enabled_'.$row['tip']].'</label>';
|
||||||
if ($row['tip'] == 0)
|
echo ' </div>';
|
||||||
echo '<span class="spaceLeft"><label for="if_edit_1"><input type="radio" value="1" name="if_edit" id="if_edit_1" class="enka-admin-custom" '.($row['enabled']==1?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><span class="enka-checkbox-radio"></span>'.$lang['srv_if_enabled_1'].'</label></span>';
|
|
||||||
echo '<span class="spaceLeft"><label for="if_edit_2"><input type="radio" value="2" name="if_edit" id="if_edit_2" class="enka-admin-custom" '.($row['enabled']==2?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><span class="enka-checkbox-radio"></span>'.$lang['srv_if_enabled_2'].'</label></span>';
|
|
||||||
echo '</span>';
|
|
||||||
|
|
||||||
echo '</p>';
|
if ($row['tip'] == 0){
|
||||||
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo ' <label for="if_edit_1"><input type="radio" value="1" name="if_edit" id="if_edit_1" class="enka-admin-custom" '.($row['enabled']==1?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><label for="if_edit_1">'.$lang['srv_if_enabled_1'].'</label>';
|
||||||
|
echo ' </div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo ' <input type="radio" value="2" name="if_edit" id="if_edit_2" class="enka-admin-custom" '.($row['enabled']==2?' checked="checked"':'').' onClick="if_edit_enabled(\''.$row['id'].'\', $(this).val())" /><label for="if_edit_2">'.$lang['srv_if_enabled_2'].'</label>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
echo '</fieldset>';
|
echo '</fieldset>';
|
||||||
}
|
}
|
||||||
@ -7524,15 +7561,18 @@ class Branching {
|
|||||||
// Posebna nastavitev vrednosti statusa panelista ce je vklopljen modul "panel"
|
// Posebna nastavitev vrednosti statusa panelista ce je vklopljen modul "panel"
|
||||||
if ($row['tip'] == 0 && SurveyInfo::getInstance()->checkSurveyModule('panel')) {
|
if ($row['tip'] == 0 && SurveyInfo::getInstance()->checkSurveyModule('panel')) {
|
||||||
|
|
||||||
echo '<fieldset>';
|
echo '<fieldset><legend>'.$lang['srv_panel_if'].'</legend>';
|
||||||
echo '<p><span class="title">'.$lang['srv_panel_if'].':</span>';
|
|
||||||
|
|
||||||
$sp = new SurveyPanel($this->anketa);
|
$sp = new SurveyPanel($this->anketa);
|
||||||
$panel_if = $sp->getPanelIf($if);
|
$panel_if = $sp->getPanelIf($if);
|
||||||
|
|
||||||
echo'<span class="displayBlock" style="padding:5px 0 0 5px;">';
|
echo '<div class="condition_setting_holder">';
|
||||||
echo '<input type="text" name="panel_status_'.$if.'" id="panel_status_'.$if.'" value="'.$panel_if.'" ></span>';
|
|
||||||
echo '</span>';
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo ' <input type="text" name="panel_status_'.$if.'" id="panel_status_'.$if.'" value="'.$panel_if.'" ></span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
|
echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
|
||||||
echo '$(document).ready(function() {' .
|
echo '$(document).ready(function() {' .
|
||||||
@ -7542,28 +7582,40 @@ class Branching {
|
|||||||
'});';
|
'});';
|
||||||
echo '</script>';
|
echo '</script>';
|
||||||
|
|
||||||
echo '</p>';
|
|
||||||
echo '</fieldset>';
|
echo '</fieldset>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($row['tip'] == 1) {
|
if ($row['tip'] == 1) {
|
||||||
|
|
||||||
echo '<fieldset>';
|
echo '<fieldset><legend>'.$lang['srv_block_random'].' '.Help::display('srv_block_random').'</legend>';
|
||||||
|
|
||||||
// Blok ki prikaze nakljucno razvrscena vprasanja (in samo doloceno stevilo)
|
// Blok ki prikaze nakljucno razvrscena vprasanja (in samo doloceno stevilo)
|
||||||
echo '<p>';
|
echo '<div class="condition_setting_holder">';
|
||||||
echo ' <span class="title">'.$lang['srv_block_random'].': </span>'.Help::display('srv_block_random');
|
|
||||||
echo ' <span class="displayBlock" style="padding:5px 0 0 5px;">';
|
echo ' <div class="condition_setting_line">';
|
||||||
echo ' <label for="if_random_-1"><input type="radio" value="-1" class="enka-admin-custom small-padding" name="if_random" id="if_random_-1" '.($row['random']==-1?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val());" /><span class="enka-checkbox-radio"></span>'.$lang['no1'].'</label>';
|
echo ' <input type="radio" value="-1" class="enka-admin-custom small-padding" name="if_random" id="if_random_-1" '.($row['random']==-1?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val());" /><label for="if_random_-1">'.$lang['no1'].'</label>';
|
||||||
echo ' <span class="spaceLeft"><label for="if_random_-2"><input type="radio" value="-2" class="enka-admin-custom small-padding" name="if_random" id="if_random_-2" '.($row['random']==-2?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val())" /><span class="enka-checkbox-radio"></span>'.$lang['srv_block_random_blocks'].'</label></span>';
|
echo ' </div>';
|
||||||
echo ' <span class="spaceLeft"><label for="if_random_0"><input type="radio" value="0" class="enka-admin-custom small-padding" name="if_random" id="if_random_0" '.($row['random']>=0?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val())" /><span class="enka-checkbox-radio"></span>'.$lang['srv_block_random_questions'].'</label></span>';
|
|
||||||
echo ' </span>';
|
echo ' <div class="condition_setting_line">';
|
||||||
echo '</p>';
|
echo ' <input type="radio" value="-2" class="enka-admin-custom small-padding" name="if_random" id="if_random_-2" '.($row['random']==-2?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val())" /><label for="if_random_-2">'.$lang['srv_block_random_blocks'].'</label>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo ' <div class="condition_setting_line">';
|
||||||
|
echo ' <input type="radio" value="0" class="enka-admin-custom small-padding" name="if_random" id="if_random_0" '.($row['random']>=0?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val())" /><label for="if_random_0">'.$lang['srv_block_random_questions'].'</label>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Stevilo vprasanj ki jih nakljucno izberemo (ce je zgornja "da")
|
// Stevilo vprasanj ki jih nakljucno izberemo (ce je zgornja "da")
|
||||||
echo '<p id="if_blok_random_cnt" '.(($row['random'] >= 0) ? '' : ' style="display:none;"').'><span class="title">'.$lang['srv_block_random_cnt'].':</span><span class="content">';
|
echo '<div id="if_blok_random_cnt" class="condition_setting_holder" '.(($row['random'] >= 0) ? '' : ' style="display:none;"').'>';
|
||||||
echo '<select onchange="if_blok_random_cnt(\''.$row['id'].'\', $(this).val());">';
|
|
||||||
echo ' <option value="0" '.($row['random']==0 ? 'selected' : '').'>'.$lang['srv_block_random_all'].'</option>';
|
echo ' <div class="condition_setting_line half-half">';
|
||||||
|
echo ' <label>'.$lang['srv_block_random_cnt'].':</label>';
|
||||||
|
|
||||||
|
echo ' <span class="content">';
|
||||||
|
echo ' <select onchange="if_blok_random_cnt(\''.$row['id'].'\', $(this).val());">';
|
||||||
|
echo ' <option value="0" '.($row['random']==0 ? 'selected' : '').'>'.$lang['srv_block_random_all'].'</option>';
|
||||||
$sqlB = sisplet_query("SELECT count(*) AS cnt_spr FROM srv_branching
|
$sqlB = sisplet_query("SELECT count(*) AS cnt_spr FROM srv_branching
|
||||||
WHERE ank_id='".$this->anketa."' AND parent='".$row['id']."' AND element_spr>'0'
|
WHERE ank_id='".$this->anketa."' AND parent='".$row['id']."' AND element_spr>'0'
|
||||||
ORDER BY vrstni_red");
|
ORDER BY vrstni_red");
|
||||||
@ -7573,58 +7625,84 @@ class Branching {
|
|||||||
echo ' <option value="'.$i.'" '.($row['random']==$i ? 'selected' : '').'>'.$i.'</option>';
|
echo ' <option value="'.$i.'" '.($row['random']==$i ? 'selected' : '').'>'.$i.'</option>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo '</select>';
|
echo ' </select>';
|
||||||
|
echo ' </span>';
|
||||||
|
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Blok ki vsebuje horizontalno urejena vprasanja
|
// Blok ki vsebuje horizontalno urejena vprasanja
|
||||||
echo '<p><span class="title">'.$lang['srv_orientacija_vprasanja'].':</span><span class="content">';
|
echo '<div class="condition_setting_holder">';
|
||||||
echo '<select name="if_blok_horizontal" onchange="if_blok_horizontal(\''.$row['id'].'\', $(this).val());">';
|
|
||||||
echo ' <option value="0" '.($row['horizontal']==0?'selected':'').'>'.$lang['srv_orientacija_classic'].'</option>';
|
echo ' <div class="condition_setting_line half-half">';
|
||||||
echo ' <option value="2" '.($row['horizontal']==2?'selected':'').'>'.$lang['srv_orientacija_expand'].'</option>';
|
echo ' <label>'.$lang['srv_orientacija_vprasanja'].':</label>';
|
||||||
echo ' <option value="1" '.($row['horizontal']==1?'selected':'').'>'.$lang['srv_orientacija_horizontalna_3'].'</option>';
|
echo ' <span class="content">';
|
||||||
echo '</select>';
|
echo ' <select name="if_blok_horizontal" onchange="if_blok_horizontal(\''.$row['id'].'\', $(this).val());">';
|
||||||
echo '</span></p>';
|
echo ' <option value="0" '.($row['horizontal']==0?'selected':'').'>'.$lang['srv_orientacija_classic'].'</option>';
|
||||||
|
echo ' <option value="2" '.($row['horizontal']==2?'selected':'').'>'.$lang['srv_orientacija_expand'].'</option>';
|
||||||
|
echo ' <option value="1" '.($row['horizontal']==1?'selected':'').'>'.$lang['srv_orientacija_horizontalna_3'].'</option>';
|
||||||
|
echo ' </select>';
|
||||||
|
echo ' </span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Blok kot zavihek
|
// Blok kot zavihek
|
||||||
echo '<p><span class="title">'.$lang['srv_block_tab'].':</span><span class="content">';
|
echo '<div class="condition_setting_holder">';
|
||||||
echo '<select name="if_blok_tab" onchange="if_blok_tab(\''.$row['id'].'\', $(this).val());">';
|
|
||||||
echo ' <option value="0" '.($row['tab']==0?'selected':'').'>'.$lang['no'].'</option>';
|
echo ' <div class="condition_setting_line half-half">';
|
||||||
echo ' <option value="1" '.($row['tab']==1?'selected':'').'>'.$lang['yes'].'</option>';
|
echo ' <label>'.$lang['srv_block_tab'].':</label>';
|
||||||
echo '</select>';
|
echo' <span class="content">';
|
||||||
echo '</span></p>';
|
echo ' <select name="if_blok_tab" onchange="if_blok_tab(\''.$row['id'].'\', $(this).val());">';
|
||||||
|
echo ' <option value="0" '.($row['tab']==0?'selected':'').'>'.$lang['no'].'</option>';
|
||||||
|
echo ' <option value="1" '.($row['tab']==1?'selected':'').'>'.$lang['yes'].'</option>';
|
||||||
|
echo ' </select>';
|
||||||
|
echo ' </span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
// Opozorilo, da mora biti blok na svoji strani (ce je vklopljena katera od zgornjih nastavitev)
|
// Opozorilo, da mora biti blok na svoji strani (ce je vklopljena katera od zgornjih nastavitev)
|
||||||
echo '<p id="blok_pb_warning" '.($row['tab']==1 || $row['horizontal']==1 || $row['random']>=0 ? '' : ' style="display:none;"').'><span class="red bold">'.$lang['srv_block_pbWarning'].'</span></p>';
|
echo '<div id="blok_pb_warning" class="condition_setting_holder" '.($row['tab']==1 || $row['horizontal']==1 || $row['random']>=0 ? '' : ' style="display:none;"').'>';
|
||||||
|
echo ' <div class="condition_setting_line half-half">';
|
||||||
|
echo ' <span class="red bold">'.$lang['srv_block_pbWarning'].'</span>';
|
||||||
|
echo ' </div>';
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
echo '</fieldset>';
|
echo '</fieldset>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
echo '<span id="condition_editing_bottom_placeholder"></span>';
|
echo '<div class="button_holder">';
|
||||||
|
|
||||||
echo '<span class="buttonwrapper spaceRight floatLeft" id="if_remove_all" style="margin-bottom:10px">';
|
|
||||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'"><span>'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'</span></a>'."\n\r";
|
|
||||||
echo '</span>';
|
|
||||||
|
|
||||||
echo '<div class="clr"></div>';
|
echo ' <button id="if_remove_all" class="small black-white" onclick="if_remove(\''.$if.'\', \'1\', \'0\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).'">';
|
||||||
|
echo ($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) );
|
||||||
|
echo ' </button>';
|
||||||
|
|
||||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
echo ' <button class="small white-blue"onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).'">';
|
||||||
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="condition_editing_close(\''.$if.'\'); return false;">'.$lang['srv_zapri'].'</a>';
|
echo ($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) );
|
||||||
echo '</span>';
|
echo ' </button>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
|
|
||||||
|
echo '<div class="button_holder">';
|
||||||
|
|
||||||
|
echo ' <button class="small blue" onclick="condition_editing_close(\''.$if.'\'); return false;">';
|
||||||
|
echo $lang['srv_zapri'];
|
||||||
|
echo ' </button>';
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
|
||||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="if_remove(\''.$if.'\'); return false;" title="'.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).'"><span>'.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).'</span></a>'."\n\r";
|
|
||||||
echo '</span>';
|
|
||||||
|
|
||||||
echo '</div>'; // -- div_condition_editing_float
|
echo '</div>'; // -- div_condition_editing_float
|
||||||
|
|
||||||
}
|
|
||||||
// filter v DisplayData
|
|
||||||
elseif ($vrednost == -1) {
|
|
||||||
// tega niti ni vec...
|
|
||||||
}
|
|
||||||
// profili filtrov
|
|
||||||
elseif ($vrednost == -2) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
// klasicen popup v #div_condition_editing, uporablja se npr pri ifih za obvescanje
|
// klasicen popup v #div_condition_editing, uporablja se npr pri ifih za obvescanje
|
||||||
elseif ($vrednost == -3) {
|
elseif ($vrednost == -3) {
|
||||||
|
|||||||
@ -986,7 +986,7 @@ class Vprasanje {
|
|||||||
echo '<div class="vprasanje_setting_holder">';
|
echo '<div class="vprasanje_setting_holder">';
|
||||||
|
|
||||||
echo ' <div class="vprasanje_setting_line half-half">';
|
echo ' <div class="vprasanje_setting_line half-half">';
|
||||||
echo ' <label>'.$lang['srv_vprasanje_date_range_min'].': </label>'.Help::display('edit_date_range');
|
echo ' <label>'.$lang['srv_vprasanje_date_range_min'].': '.Help::display('edit_date_range').'</label>';
|
||||||
echo ' <span class="content">';
|
echo ' <span class="content">';
|
||||||
echo ' <input type="number" value="'.$min.'" name="date_range_min" id="date_range_min_' . $row['id'] . '" spr_id="'.$row['id'].'" />';
|
echo ' <input type="number" value="'.$min.'" name="date_range_min" id="date_range_min_' . $row['id'] . '" spr_id="'.$row['id'].'" />';
|
||||||
echo ' </span>';
|
echo ' </span>';
|
||||||
@ -998,7 +998,7 @@ class Vprasanje {
|
|||||||
echo '<div class="vprasanje_setting_holder">';
|
echo '<div class="vprasanje_setting_holder">';
|
||||||
|
|
||||||
echo ' <div class="vprasanje_setting_line half-half">';
|
echo ' <div class="vprasanje_setting_line half-half">';
|
||||||
echo ' <label>'.$lang['srv_vprasanje_date_range_max'].': </label>'.Help::display('edit_date_range');
|
echo ' <label>'.$lang['srv_vprasanje_date_range_max'].': '.Help::display('edit_date_range').'</label>';
|
||||||
echo ' <span class="content">';
|
echo ' <span class="content">';
|
||||||
echo ' <input type="number" min="0" value="'.$max.'" name="date_range_max" id="date_range_max_' . $row['id'] . '" spr_id="'.$row['id'].'" />';
|
echo ' <input type="number" min="0" value="'.$max.'" name="date_range_max" id="date_range_max_' . $row['id'] . '" spr_id="'.$row['id'].'" />';
|
||||||
echo ' </span>';
|
echo ' </span>';
|
||||||
@ -1046,7 +1046,7 @@ class Vprasanje {
|
|||||||
echo '<div id="max_markers_map" class="vprasanje_setting_holder" '.(($row['enota'] == 2 && $input =='marker') ? '' : 'style="display: none;"').'>';
|
echo '<div id="max_markers_map" class="vprasanje_setting_holder" '.(($row['enota'] == 2 && $input =='marker') ? '' : 'style="display: none;"').'>';
|
||||||
|
|
||||||
echo ' <div class="vprasanje_setting_line half-half">';
|
echo ' <div class="vprasanje_setting_line half-half">';
|
||||||
echo ' <label>'.$lang['srv_vprasanje_max_marker_map'].':</label> '.Help::display('srv_vprasanje_max_marker_map');
|
echo ' <label>'.$lang['srv_vprasanje_max_marker_map'].': '.Help::display('srv_vprasanje_max_marker_map').'</label>';
|
||||||
echo ' <span class="content"><select name="max_markers" id="max_markers_' . $row['id'] . '" spr_id="'.$row['id'].'">';
|
echo ' <span class="content"><select name="max_markers" id="max_markers_' . $row['id'] . '" spr_id="'.$row['id'].'">';
|
||||||
echo ' <option value="1" '.(($max == 1) ? ' selected="true" ' : '').'>1</option>';
|
echo ' <option value="1" '.(($max == 1) ? ' selected="true" ' : '').'>1</option>';
|
||||||
echo ' <option value="2" '.(($max == 2) ? ' selected="true" ' : '').'>2</option>';
|
echo ' <option value="2" '.(($max == 2) ? ' selected="true" ' : '').'>2</option>';
|
||||||
@ -1361,55 +1361,77 @@ class Vprasanje {
|
|||||||
|
|
||||||
$this->variable();
|
$this->variable();
|
||||||
|
|
||||||
|
|
||||||
$sql = sisplet_query("SELECT if_id, reminder, reminder_text FROM srv_validation v WHERE v.spr_id='$this->spremenljivka'");
|
$sql = sisplet_query("SELECT if_id, reminder, reminder_text FROM srv_validation v WHERE v.spr_id='$this->spremenljivka'");
|
||||||
if (mysqli_num_rows($sql) > 0) {
|
if (mysqli_num_rows($sql) > 0) {
|
||||||
|
|
||||||
echo '<input type="hidden" value="1" name="validationedit">';
|
echo '<input type="hidden" value="1" name="validationedit">';
|
||||||
|
|
||||||
$b = new Branching($this->anketa);
|
$b = new Branching($this->anketa);
|
||||||
|
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
|
|
||||||
|
echo '<fieldset>';
|
||||||
|
|
||||||
echo '<fieldset>';
|
echo '<div class="vprasanje_setting_holder">';
|
||||||
echo '<p><a href="#" onclick="validation_edit(\''.$this->spremenljivka.'\', \''.$row['if_id'].'\'); return false;" title="'.$lang['srv_if_edit'].'">';
|
|
||||||
|
|
||||||
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
|
echo ' <a href="#" onclick="validation_edit(\''.$this->spremenljivka.'\', \''.$row['if_id'].'\'); return false;" title="'.$lang['srv_if_edit'].'">';
|
||||||
$b->conditions_display($row['if_id']);
|
$b->conditions_display($row['if_id']);
|
||||||
echo '</a></p>';
|
echo ' </a>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
echo '<p>';
|
|
||||||
echo '<span class="title">'.$lang['srv_alert_type'].':</span>';
|
echo ' <div class="vprasanje_setting_line half-half">';
|
||||||
|
echo ' <label>'.$lang['srv_alert_type'].':</label>';
|
||||||
|
|
||||||
echo '<span class="content">';
|
echo ' <span class="content">';
|
||||||
echo '<select name="validation-'.$row['if_id'].'-reminder">';
|
echo ' <select name="validation-'.$row['if_id'].'-reminder">';
|
||||||
echo '<option value="0" '.($row['reminder']==0?'selected':'').'>'.$lang['srv_reminder_off2'].'</option>';
|
echo ' <option value="0" '.($row['reminder']==0?'selected':'').'>'.$lang['srv_reminder_off2'].'</option>';
|
||||||
echo '<option value="1" '.($row['reminder']==1?'selected':'').'>'.$lang['srv_reminder_soft2'].'</option>';
|
echo ' <option value="1" '.($row['reminder']==1?'selected':'').'>'.$lang['srv_reminder_soft2'].'</option>';
|
||||||
echo '<option value="2" '.($row['reminder']==2?'selected':'').'>'.$lang['srv_reminder_hard2'].'</option>';
|
echo ' <option value="2" '.($row['reminder']==2?'selected':'').'>'.$lang['srv_reminder_hard2'].'</option>';
|
||||||
echo '</select>';
|
echo ' </select>';
|
||||||
echo '</span>';
|
echo ' </span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
|
||||||
|
echo ' <div class="vprasanje_setting_line half-half">';
|
||||||
|
echo ' <label>'.$lang['srv_alert_text'].'</label>';
|
||||||
|
echo ' <span class="content"><input type="text" name="validation-'.$row['if_id'].'-reminder_text" value="'.$row['reminder_text'].'"></span>';
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
|
||||||
echo '</p>';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo '<p><span class="title">'.$lang['srv_alert_text'].':</span>';
|
echo ' <a href="#" onclick="validation_if_remove(\''.$this->spremenljivka.'\', \''.$row['if_id'].'\'); return false;">'.$lang['srv_validation_remove'].'</a>';
|
||||||
|
echo ' </div>';
|
||||||
echo '<span class="content"><input type="text" name="validation-'.$row['if_id'].'-reminder_text" value="'.$row['reminder_text'].'"></span>';
|
|
||||||
|
|
||||||
echo '</p>';
|
echo '</div>';
|
||||||
|
|
||||||
echo '<p class="floatLeft spaceRight bold"><a href="#" onclick="validation_if_remove(\''.$this->spremenljivka.'\', \''.$row['if_id'].'\'); return false;">'.$lang['srv_validation_remove'].'</a></p>';
|
echo '</fieldset>';
|
||||||
|
|
||||||
echo '</fieldset>';
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
else {
|
||||||
echo '<p>'.$lang['srv_validation_no'].'</p>';
|
echo '<fieldset><div class="vprasanje_setting_holder">';
|
||||||
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
|
echo ' <p>'.$lang['srv_validation_no'].'</p>';
|
||||||
|
echo ' </div>';
|
||||||
|
echo '</div></fieldset>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - drugace skrijemo gumb za dodajanje validacije
|
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - drugace skrijemo gumb za dodajanje validacije
|
||||||
$userAccess = UserAccess::getInstance($global_user_id);
|
$userAccess = UserAccess::getInstance($global_user_id);
|
||||||
|
|
||||||
|
echo '<fieldset>';
|
||||||
if(!$userAccess->checkUserAccess($what='validation')){
|
if(!$userAccess->checkUserAccess($what='validation')){
|
||||||
$userAccess->displayNoAccess($what='validation');
|
$userAccess->displayNoAccess($what='validation');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
echo '<p><a href="#" onclick="validation_new(\''.$this->spremenljivka.'\'); return false;"><span class="bold">'.$lang['srv_validation_new'].'</span></a></p>';
|
echo '<button class="small white-blue" onclick="validation_new(\''.$this->spremenljivka.'\'); return false;">'.$lang['srv_validation_new'].'</button>';
|
||||||
}
|
}
|
||||||
|
echo '</fieldset>';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1449,15 +1471,31 @@ class Vprasanje {
|
|||||||
|
|
||||||
if ($question_note_view == '' || $question_note_view >= $admin_type) {
|
if ($question_note_view == '' || $question_note_view >= $admin_type) {
|
||||||
|
|
||||||
|
echo '<div class="vprasanje_setting_holder space_bottom">';
|
||||||
|
|
||||||
if ($question_note_write == '' || $question_note_write >= $admin_type) {
|
if ($question_note_write == '' || $question_note_write >= $admin_type) {
|
||||||
echo '<p>'.$lang['srv_note'];
|
|
||||||
//echo '<span class="red pointer" onclick="this.style.display=\'none\'; create_editor(\'note\');"> - '.$lang['srv_editor'].'</span>';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo '<a href="#" title="'.$lang['srv_editor_title'].'" onmouseover="this.style.display=\'none\'; create_editor(\'note\');"><span class="faicon edit spaceLeft"></span></a>';
|
echo $lang['srv_note'];
|
||||||
echo '<textarea name="note" id="note" style="width:99%; height:150px">'.$rows['note'].'</textarea></p>';
|
echo ' <a href="#" title="'.$lang['srv_editor_title'].'" onmouseover="this.style.display=\'none\'; create_editor(\'note\');"> <span class="faicon edit"></span></a>';
|
||||||
} else {
|
echo ' </div>';
|
||||||
echo '<p>'.$lang['srv_note'].'';
|
|
||||||
echo '<textarea name="note" id="note" style="width:99%; height:150px" disabled>'.$rows['note'].'</textarea></p>';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
|
echo ' <textarea name="note" id="note" style="width:99%; height:150px">'.$rows['note'].'</textarea></p>';
|
||||||
|
echo ' </div>';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
|
echo $lang['srv_note'];
|
||||||
|
echo ' </div>';
|
||||||
|
|
||||||
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
|
echo ' <textarea name="note" id="note" style="width:99%; height:150px" disabled>'.$rows['note'].'</textarea></p>';
|
||||||
|
echo ' </div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// tukaj prikazujemo samo se opombo
|
// tukaj prikazujemo samo se opombo
|
||||||
@ -2187,7 +2225,7 @@ class Vprasanje {
|
|||||||
echo '<div class="vprasanje_setting_holder">';
|
echo '<div class="vprasanje_setting_holder">';
|
||||||
|
|
||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <label>'.$lang['srv_concl_deactivation_text'].'</label> '.Help::display('srv_concl_deactivation_text');
|
echo ' <label>'.$lang['srv_concl_deactivation_text'].' '.Help::display('srv_concl_deactivation_text').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
$value = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_survey_non_active');
|
$value = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_survey_non_active');
|
||||||
@ -2409,7 +2447,7 @@ class Vprasanje {
|
|||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <input type="hidden" name="grid_var" value="0">';
|
echo ' <input type="hidden" name="grid_var" value="0">';
|
||||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? ' checked="checked"' : '').'>';
|
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? ' checked="checked"' : '').'>';
|
||||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' </label>'.Help::display('srv_grid_var');
|
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
@ -2524,7 +2562,7 @@ class Vprasanje {
|
|||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <input type="hidden" name="grid_var" value="0" />';
|
echo ' <input type="hidden" name="grid_var" value="0" />';
|
||||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? 'checked="checked"' : '').'>';
|
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? 'checked="checked"' : '').'>';
|
||||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' </label>'.Help::display('srv_grid_var');
|
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
@ -3306,21 +3344,21 @@ class Vprasanje {
|
|||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <input type="hidden" name="alert_show_97" value="0" />';
|
echo ' <input type="hidden" name="alert_show_97" value="0" />';
|
||||||
echo ' <input type="checkbox" id="alert_show_97" name="alert_show_97" value="1" '.($row['alert_show_97']=='1'?' checked':'').' '.($show['97'] ? '' : ' disabled="disabled"').'>';
|
echo ' <input type="checkbox" id="alert_show_97" name="alert_show_97" value="1" '.($row['alert_show_97']=='1'?' checked':'').' '.($show['97'] ? '' : ' disabled="disabled"').'>';
|
||||||
echo ' <label for="alert_show_97" class="title"><span id="alert_show_97_text" class="'.($show['97']?'':' gray').'">'.$lang['srv_alert_show_missing_97'].'</span></label> '.Help::display('srv_alert_show_97');
|
echo ' <label for="alert_show_97" class="title"><span id="alert_show_97_text" class="'.($show['97']?'':' gray').'">'.$lang['srv_alert_show_missing_97'].'</span> '.Help::display('srv_alert_show_97').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
// Prikaz -98 (Zavrnil) ob opozorilu
|
// Prikaz -98 (Zavrnil) ob opozorilu
|
||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <span class="content"><input type="hidden" name="alert_show_98" value="0" />';
|
echo ' <span class="content"><input type="hidden" name="alert_show_98" value="0" />';
|
||||||
echo ' <input type="checkbox" id="alert_show_98" name="alert_show_98" value="1" '.($row['alert_show_98']=='1'?' checked':'').' '.($show['98'] ? '' : ' disabled="disabled"').'>';
|
echo ' <input type="checkbox" id="alert_show_98" name="alert_show_98" value="1" '.($row['alert_show_98']=='1'?' checked':'').' '.($show['98'] ? '' : ' disabled="disabled"').'>';
|
||||||
echo ' <label for="alert_show_98" class="title"><span id="alert_show_98_text" class="'.($show['98']?'':' gray').'">'.$lang['srv_alert_show_missing_98'].'</span></label> '.Help::display('srv_alert_show_98');
|
echo ' <label for="alert_show_98" class="title"><span id="alert_show_98_text" class="'.($show['98']?'':' gray').'">'.$lang['srv_alert_show_missing_98'].'</span> '.Help::display('srv_alert_show_98').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
// Prikaz -99 (ne vem) ob opozorilu
|
// Prikaz -99 (ne vem) ob opozorilu
|
||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <span class="content"><input type="hidden" name="alert_show_99" value="0" />';
|
echo ' <span class="content"><input type="hidden" name="alert_show_99" value="0" />';
|
||||||
echo ' <input type="checkbox" id="alert_show_99" name="alert_show_99" value="1" '.($row['alert_show_99']=='1'?' checked':'').' '.($show['99'] ? '' : ' disabled="disabled"').'>';
|
echo ' <input type="checkbox" id="alert_show_99" name="alert_show_99" value="1" '.($row['alert_show_99']=='1'?' checked':'').' '.($show['99'] ? '' : ' disabled="disabled"').'>';
|
||||||
echo ' <label for="alert_show_99" class="title"><span id="alert_show_99_text" class="'.($show['99']?'':' gray').'">'.$lang['srv_alert_show_missing'].'</span></label> '.Help::display('srv_alert_show_99');
|
echo ' <label for="alert_show_99" class="title"><span id="alert_show_99_text" class="'.($show['99']?'':' gray').'">'.$lang['srv_alert_show_missing'].'</span> '.Help::display('srv_alert_show_99').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
@ -4614,7 +4652,7 @@ class Vprasanje {
|
|||||||
echo ' <div class="vprasanje_setting_line">';
|
echo ' <div class="vprasanje_setting_line">';
|
||||||
echo ' <input type="hidden" value="0" name="inline_edit" />';
|
echo ' <input type="hidden" value="0" name="inline_edit" />';
|
||||||
echo ' <input type="checkbox" value="1" id="inline_edit" name="inline_edit" '.($row['inline_edit']==1?' checked="checked"':'').' />';
|
echo ' <input type="checkbox" value="1" id="inline_edit" name="inline_edit" '.($row['inline_edit']==1?' checked="checked"':'').' />';
|
||||||
echo ' <label for="inline_edit">'.$lang['srv_inline_edit'].'</label> '.Help::display('srv_dropdown_quickedit');
|
echo ' <label for="inline_edit">'.$lang['srv_inline_edit'].' '.Help::display('srv_dropdown_quickedit').'</label>';
|
||||||
echo ' </div>';
|
echo ' </div>';
|
||||||
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
|
|||||||
@ -173,20 +173,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**************** BODY ****************/
|
||||||
|
|
||||||
// za css - barve ozadja
|
// za css - barve ozadja
|
||||||
if (isset($_GET['anketa']))
|
if (isset($_GET['anketa']))
|
||||||
$cssBodyClass = ' body_anketa';
|
$cssBodyClass = 'body_anketa';
|
||||||
else if (isset($_GET['a']) && $_GET['a'] == 'knjiznica' )
|
else if (isset($_GET['a']) && $_GET['a'] == 'knjiznica' )
|
||||||
$cssBodyClass = ' body_library';
|
$cssBodyClass = 'body_library';
|
||||||
else
|
else
|
||||||
$cssBodyClass = ' body_folders';
|
$cssBodyClass = 'body_folders';
|
||||||
|
|
||||||
$sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'");
|
// Class za jezik
|
||||||
$row = mysqli_fetch_assoc($sql);
|
$langBodyClass = ($lang['id'] != "1") ? 'eng' : 'slo';
|
||||||
|
|
||||||
|
echo '<body class="mainBody '.$cssBodyClass.' '.$langBodyClass.'">'."\n";
|
||||||
/**************** BODY ****************/
|
|
||||||
echo '<body class="mainBody'.$cssBodyClass.'">'."\n";
|
|
||||||
|
|
||||||
// Google analytics
|
// Google analytics
|
||||||
if($site_domain == 'www.1ka.si'){
|
if($site_domain == 'www.1ka.si'){
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -391,11 +391,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gumb za mape
|
|
||||||
#folderSwitch{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.advanced_search{
|
&.advanced_search{
|
||||||
@ -465,4 +460,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body.eng #survey_list .filters #folderSwitch{
|
||||||
|
width: 120px;
|
||||||
|
}
|
||||||
|
|||||||
@ -7,14 +7,14 @@ $branching_settings_size: 401px;
|
|||||||
|
|
||||||
// Layout mere - razsirjen toolbox
|
// Layout mere - razsirjen toolbox
|
||||||
$branching_toolbox_size_big: 240px;
|
$branching_toolbox_size_big: 240px;
|
||||||
$branching_main_space_left_big: $branching_toolbox_size_big + 64px;
|
$branching_main_space_left_big: 304px;
|
||||||
|
|
||||||
// Layout mere - skrcen toolbox
|
// Layout mere - skrcen toolbox
|
||||||
$branching_toolbox_size_small: 40px;
|
$branching_toolbox_size_small: 40px;
|
||||||
$branching_main_space_left_small: $branching_toolbox_size_small + 64px;
|
$branching_main_space_left_small: 104px;
|
||||||
|
|
||||||
$branching_main_size_big: calc(100% - #{$branching_settings_size} - #{$branching_main_space_left_big});
|
$branching_main_size_big: calc(100% - 705px);
|
||||||
$branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branching_main_space_left_small});
|
$branching_main_size_small: calc(100% - 505px);
|
||||||
|
|
||||||
|
|
||||||
#placeholder{
|
#placeholder{
|
||||||
@ -32,6 +32,11 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
|
|||||||
width: $branching_main_size_big;
|
width: $branching_main_size_big;
|
||||||
margin: 0 0 0 $branching_main_space_left_big;
|
margin: 0 0 0 $branching_main_space_left_big;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 1200px) {
|
||||||
|
width: $branching_main_size_small;
|
||||||
|
margin: 0 0 0 $branching_main_space_left_small;
|
||||||
|
}
|
||||||
|
|
||||||
background-color: white;
|
background-color: white;
|
||||||
|
|
||||||
ul {
|
ul {
|
||||||
@ -41,18 +46,6 @@ $branching_main_size_small: calc(100% - #{$branching_settings_size} - #{$branchi
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|
||||||
/*> ul{
|
|
||||||
padding-left: 25px;
|
|
||||||
|
|
||||||
> ul{
|
|
||||||
padding-left: 25px;
|
|
||||||
|
|
||||||
ul{
|
|
||||||
padding-left: 25px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
li {
|
li {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@ -33,6 +33,7 @@ and open the template in the editor.
|
|||||||
}
|
}
|
||||||
|
|
||||||
.if_content {
|
.if_content {
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
.clr_if,
|
.clr_if,
|
||||||
.clr_bl,
|
.clr_bl,
|
||||||
@ -166,21 +167,6 @@ and open the template in the editor.
|
|||||||
left: -29px;
|
left: -29px;
|
||||||
font-weight: bold;
|
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 {
|
#div_condition_editing_operators {
|
||||||
padding: 5px 0;
|
padding: 5px 0;
|
||||||
@ -203,51 +189,191 @@ and open the template in the editor.
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#div_condition_editing_float {
|
#div_condition_editing_float {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
box-sizing: border-box;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: -335px;
|
right: -369px;
|
||||||
|
|
||||||
width: 290px;
|
width: 305px;
|
||||||
padding: 0 10px 15px 10px;
|
|
||||||
|
border: 1px solid $gray;
|
||||||
background-color: white;
|
background-color: $white;
|
||||||
|
|
||||||
border: 1px solid $blue;
|
// Naslovna vrstica
|
||||||
|
.condition_header{
|
||||||
|
height: 45px;
|
||||||
|
padding: 0 7px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
|
||||||
|
color: $white;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 45px;
|
||||||
|
|
||||||
h2 {
|
|
||||||
margin-top: 0;
|
|
||||||
padding: 10px;
|
|
||||||
border-bottom: 0;
|
|
||||||
margin: 0 -10px 0 -10px;
|
|
||||||
background-color: $blue;
|
background-color: $blue;
|
||||||
}
|
}
|
||||||
p {
|
|
||||||
padding: 3px;
|
// Glavna vsebina
|
||||||
margin: 10px 0;
|
.condition_edit {
|
||||||
|
margin: 0 16px;
|
||||||
|
|
||||||
|
background-color: white;
|
||||||
|
|
||||||
|
// Fieldset znotraj urejanja
|
||||||
|
fieldset {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
margin-bottom: 16px;
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
border: 0;
|
||||||
|
border-top: 1px solid $dark-gray2;
|
||||||
|
|
||||||
|
|
||||||
|
legend {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0 10px 0 0;
|
||||||
|
|
||||||
|
color: $black;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 14px;
|
||||||
|
text-transform: none;
|
||||||
|
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Posamezen blok nastavitve
|
||||||
|
.condition_setting_holder{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
margin-top: 8px;
|
||||||
|
|
||||||
|
&.space_bottom{
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
|
||||||
|
.condition_setting_line{
|
||||||
|
margin-top: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.condition_setting_line{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: left;
|
||||||
|
|
||||||
|
min-height: 20px;
|
||||||
|
margin-top: 8px;
|
||||||
|
|
||||||
|
line-height: 20px;
|
||||||
|
color: $black;
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
&.half-half{
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
|
label{
|
||||||
|
width: 50%;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content{
|
||||||
|
width: 50%;
|
||||||
|
|
||||||
|
input[type="text"],
|
||||||
|
input[type="number"],
|
||||||
|
select,
|
||||||
|
textarea{
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
p,
|
||||||
|
span,
|
||||||
|
label{
|
||||||
|
line-height: 20px;
|
||||||
|
color: $black;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.jquery-selectbox {
|
||||||
|
background-color: white;
|
||||||
|
|
||||||
|
background: #FFFFFF;
|
||||||
|
border: 1px solid $dark-gray2;
|
||||||
|
box-sizing: border-box;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
select{
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
box-sizing: border-box;
|
||||||
|
height: 30px;
|
||||||
|
padding: 0 8px;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
|
||||||
|
border: 1px solid $dark-gray2;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"],
|
||||||
|
input[type="number"]{
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 8px;
|
||||||
|
height: 30px;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
|
||||||
|
border: 1px solid $dark-gray2;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
textarea{
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 8px;
|
||||||
|
min-height: 30px;
|
||||||
|
|
||||||
|
font-size: 14px;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
|
||||||
|
border: 1px solid $dark-gray2;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
p.heading {
|
|
||||||
border: 0;
|
// Gumbi na dnu
|
||||||
background: none;
|
.button_holder {
|
||||||
padding: 0;
|
flex-direction: column;
|
||||||
}
|
|
||||||
span.content {
|
margin: 0 16px 10px 16px;
|
||||||
float: right;
|
padding-top: 8px;
|
||||||
}
|
|
||||||
fieldset {
|
border-top: 1px $dark-gray2 solid;
|
||||||
margin: 11px 0;
|
|
||||||
padding: 0;
|
button{
|
||||||
border: 0;
|
margin-bottom: 8px;
|
||||||
border-top: 1px solid $blue;
|
|
||||||
}
|
&:last-of-type{
|
||||||
legend {
|
margin-bottom: 0;
|
||||||
background-color: transparent;
|
}
|
||||||
color: $blue;
|
}
|
||||||
font-weight: 500;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0 10px 0 5px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.error_display {
|
.error_display {
|
||||||
display: block;
|
display: block;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
|
|||||||
178
resources/sass/admin_new/pages/survey_edit/jquery.scss
Normal file
178
resources/sass/admin_new/pages/survey_edit/jquery.scss
Normal file
@ -0,0 +1,178 @@
|
|||||||
|
/*
|
||||||
|
To change this license header, choose License Headers in Project Properties.
|
||||||
|
To change this template file, choose Tools | Templates
|
||||||
|
and open the template in the editor.
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
Created on : 10-Aug-2018, 12:45:26
|
||||||
|
Author : podkrizniku
|
||||||
|
*/
|
||||||
|
|
||||||
|
.ui-resizable {
|
||||||
|
position: relative;
|
||||||
|
padding: 0px;
|
||||||
|
margin: 0px;
|
||||||
|
}
|
||||||
|
.ui-resizable-handle {
|
||||||
|
position: absolute;
|
||||||
|
font-size: 0.1px;
|
||||||
|
z-index: 99999;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.ui-resizable-disabled {
|
||||||
|
.ui-resizable-handle {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.ui-resizable-autohide {
|
||||||
|
.ui-resizable-handle {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.ui-resizable-n {
|
||||||
|
cursor: n-resize;
|
||||||
|
height: 7px;
|
||||||
|
width: 100%;
|
||||||
|
top: -5px;
|
||||||
|
left: 0px;
|
||||||
|
}
|
||||||
|
.ui-resizable-s {
|
||||||
|
cursor: s-resize;
|
||||||
|
height: 7px;
|
||||||
|
width: 100%;
|
||||||
|
bottom: -5px;
|
||||||
|
left: 0px;
|
||||||
|
}
|
||||||
|
.ui-resizable-e {
|
||||||
|
cursor: e-resize;
|
||||||
|
width: 7px;
|
||||||
|
right: -5px;
|
||||||
|
top: 0px;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.ui-resizable-w {
|
||||||
|
cursor: w-resize;
|
||||||
|
width: 7px;
|
||||||
|
left: -5px;
|
||||||
|
top: 0px;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.ui-resizable-se {
|
||||||
|
cursor: se-resize;
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
right: 1px;
|
||||||
|
bottom: 1px;
|
||||||
|
}
|
||||||
|
.ui-resizable-sw {
|
||||||
|
cursor: sw-resize;
|
||||||
|
width: 9px;
|
||||||
|
height: 9px;
|
||||||
|
left: -5px;
|
||||||
|
bottom: -5px;
|
||||||
|
}
|
||||||
|
.ui-resizable-nw {
|
||||||
|
cursor: nw-resize;
|
||||||
|
width: 9px;
|
||||||
|
height: 9px;
|
||||||
|
left: -5px;
|
||||||
|
top: -5px;
|
||||||
|
}
|
||||||
|
.ui-resizable-ne {
|
||||||
|
cursor: ne-resize;
|
||||||
|
width: 9px;
|
||||||
|
height: 9px;
|
||||||
|
right: -5px;
|
||||||
|
top: -5px;
|
||||||
|
}
|
||||||
|
.ui-datepicker-trigger {
|
||||||
|
cursor: pointer;
|
||||||
|
margin-left: 7px;
|
||||||
|
padding: 0px;
|
||||||
|
|
||||||
|
color: $blue;
|
||||||
|
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
|
||||||
|
&:hover{
|
||||||
|
color: $dark-blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
canvas.mapster_el {
|
||||||
|
top: 15px !important;
|
||||||
|
}
|
||||||
|
img.mapster_el {
|
||||||
|
position: absolute;
|
||||||
|
top: 15px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.jquery-selectbox {
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
padding: 0 0 0 8px !important;
|
||||||
|
height: 30px !important;
|
||||||
|
width: 100% !important;
|
||||||
|
|
||||||
|
font-size: 12px !important;
|
||||||
|
color: $black !important;
|
||||||
|
|
||||||
|
background-color: $white;
|
||||||
|
|
||||||
|
border: 1px $dark-gray2 solid !important;
|
||||||
|
border-radius: 4px 0px 0px 4px;
|
||||||
|
|
||||||
|
.jquery-selectbox-currentItem{
|
||||||
|
padding: 0 !important;
|
||||||
|
margin: 0 !important;
|
||||||
|
|
||||||
|
font-size: 12px !important;
|
||||||
|
line-height: 30px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.jquery-selectbox-moreButton{
|
||||||
|
font-family: $fontawesome;
|
||||||
|
|
||||||
|
height: 18px !important;
|
||||||
|
width: 15px !important;
|
||||||
|
|
||||||
|
background-image: none !important;
|
||||||
|
background-color: $white !important;
|
||||||
|
border-radius: 4px;
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
content: "\f078";
|
||||||
|
padding-left: 2px;
|
||||||
|
|
||||||
|
color: $black;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 900;
|
||||||
|
line-height: 30px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.jquery-selectbox-list{
|
||||||
|
top: 27px !important;
|
||||||
|
min-width: 180px;
|
||||||
|
|
||||||
|
padding: 0 !important;
|
||||||
|
|
||||||
|
.jquery-selectbox-item{
|
||||||
|
padding: 8px 8px !important;
|
||||||
|
margin: 0 !important;
|
||||||
|
|
||||||
|
line-height: 14px !important;
|
||||||
|
font-size: 12px !important;
|
||||||
|
|
||||||
|
border-radius: 4px;
|
||||||
|
|
||||||
|
&.listelementhover{
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
color: $white !important;
|
||||||
|
|
||||||
|
background-color: $very-dark-gray;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
border: 1px solid $gray;
|
border: 1px solid $gray;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
background: #FFFFFF;
|
|
||||||
|
|
||||||
// Naslovna vrstica
|
// Naslovna vrstica
|
||||||
#vprasanje_header{
|
#vprasanje_header{
|
||||||
@ -139,6 +138,15 @@
|
|||||||
|
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
|
|
||||||
|
&.space_bottom{
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
|
||||||
|
.vprasanje_setting_line{
|
||||||
|
margin-top: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.vprasanje_setting_line{
|
.vprasanje_setting_line{
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -163,6 +171,7 @@
|
|||||||
width: 50%;
|
width: 50%;
|
||||||
|
|
||||||
input[type="text"],
|
input[type="text"],
|
||||||
|
input[type="number"],
|
||||||
select,
|
select,
|
||||||
textarea{
|
textarea{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -202,7 +211,8 @@
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="text"]{
|
input[type="text"],
|
||||||
|
input[type="number"]{
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
|
|||||||
@ -54,6 +54,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icons_holder{
|
||||||
|
margin-top: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
// Neaktiven element
|
// Neaktiven element
|
||||||
li.spr{
|
li.spr{
|
||||||
@ -441,11 +444,11 @@ div.spremenljivka_content {
|
|||||||
}
|
}
|
||||||
span.inline_if_not {
|
span.inline_if_not {
|
||||||
float: right;
|
float: right;
|
||||||
margin: -2px 3px 0 3px;
|
margin: 0 3px 0 3px;
|
||||||
}
|
}
|
||||||
span.inline_if_follow {
|
span.inline_if_follow {
|
||||||
float: right;
|
float: right;
|
||||||
margin: -3px 3px 0 3px;
|
margin: 0 3px 0 3px;
|
||||||
}
|
}
|
||||||
span.inline_hidden {
|
span.inline_hidden {
|
||||||
float: right;
|
float: right;
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
@import "questions/questions";
|
@import "questions/questions";
|
||||||
@import "conditions";
|
@import "conditions";
|
||||||
@import "library";
|
@import "library";
|
||||||
|
@import "jquery";
|
||||||
|
|
||||||
// Urejanje -> Nastavitve
|
// Urejanje -> Nastavitve
|
||||||
@import "survey_settings/survey_settings";
|
@import "survey_settings/survey_settings";
|
||||||
|
|||||||
@ -346,12 +346,34 @@
|
|||||||
&.closed{
|
&.closed{
|
||||||
width: $branching_toolbox_size_small;
|
width: $branching_toolbox_size_small;
|
||||||
|
|
||||||
.toolbox_item .item_text{
|
.toolbox_item{
|
||||||
display: none;
|
height: 40px;
|
||||||
|
padding: 0 !important;
|
||||||
|
|
||||||
|
.item_text{
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.toolbox_expand{
|
.toolbox_expand{
|
||||||
left: 55px;
|
left: 55px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 1200px) {
|
||||||
|
width: $branching_toolbox_size_small !important;
|
||||||
|
|
||||||
|
.toolbox_item{
|
||||||
|
height: 40px;
|
||||||
|
padding: 0 !important;
|
||||||
|
|
||||||
|
.item_text{
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.toolbox_expand{
|
||||||
|
left: 55px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user