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

Redesign - popravki napak - urejanje vprasanj na desni

Browse Source
This commit is contained in:
Peter Hrvatin 2022-06-16 10:25:10 +02:00
parent a4a6104baf
commit d649d6b257
6 changed files with 270 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

373
admin/survey/classes/class.Vprasanje.php
View File

@ -228,12 +228,12 @@ class Vprasanje {
// navadno vprasanje // navadno vprasanje
else { else {
// POGOSTE NASTAVITVE // TIP IN PODTIP VPRASANJA
echo '<fieldset><legend>'.$lang['srv_common_settings'].'</legend>'; echo '<fieldset class="first">';
// variabla na vrhu // Izbira tipa vprasanja
$this->variable(1); $this->variable(1);
// prikaz vprasanja - postavitev // prikaz vprasanja - postavitev
if ( in_array($row['tip'], array(1, 2, 3, 6, 7, 16, 17, 20, 9, 26, 27)) ) { if ( in_array($row['tip'], array(1, 2, 3, 6, 7, 16, 17, 20, 9, 26, 27)) ) {
$this->edit_subtip(); $this->edit_subtip();
@ -247,7 +247,13 @@ class Vprasanje {
$this->edit_orientation(); $this->edit_orientation();
} }
} }
echo '</fieldset>';
// POGOSTE NASTAVITVE
echo '<fieldset><legend>'.$lang['srv_common_settings'].'</legend>';
// datum-min/max date // datum-min/max date
if ( in_array($row['tip'], array(8)) ) { if ( in_array($row['tip'], array(8)) ) {
$this->edit_date_range(); $this->edit_date_range();
@ -273,8 +279,10 @@ class Vprasanje {
// opomba na vprasanje // opomba na vprasanje
$this->edit_opomba(); $this->edit_opomba();
// Dodaj vprasanje v knjiznico // Crta pod nagovorom
$this->add_into_library(); if ($row['tip'] == 5) {
$this->edit_nagovor_line();
}
echo '</fieldset>'; echo '</fieldset>';
@ -290,6 +298,11 @@ class Vprasanje {
if( in_array($row['tip'], array(1, 2, 6, 17)) ){ if( in_array($row['tip'], array(1, 2, 6, 17)) ){
$this->edit_hot_spot_settings(); $this->edit_hot_spot_settings();
} }
// Heatmap
if ($row['tip'] == 27) {
$this->edit_heatmap_settings();
}
if ( in_array($row['tip'], array(6, 16, 19, 20)) ) { if ( in_array($row['tip'], array(6, 16, 19, 20)) ) {
@ -498,11 +511,6 @@ class Vprasanje {
$this->edit_limit(); $this->edit_limit();
} }
} }
// Crta pod nagovorom
if ($row['tip'] == 5) {
$this->edit_nagovor_line();
}
} }
} }
} }
@ -1195,15 +1203,22 @@ class Vprasanje {
// Spremenljivka // Spremenljivka
echo '<fieldset><legend>'.$lang['srv_spremenljivka'].'</legend>'; echo '<fieldset class="first">';
$this->edit_variable(); $this->edit_variable();
$this->edit_label(); $this->edit_label();
$this->edit_sistem();
// Dodaj vprasanje v knjiznico
$this->add_into_library();
echo '</fieldset>'; echo '</fieldset>';
// Lastnosti // Lastnosti
echo '<fieldset><legend>'.$lang['srv_lastnosti'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_lastnosti'].'</legend>';
$this->edit_sistem();
//echo '<p class="heading">'.$lang['srv_prikaz_vprasanja'].'</p>'; //echo '<p class="heading">'.$lang['srv_prikaz_vprasanja'].'</p>';
$this->edit_visible(); $this->edit_visible();
@ -1865,11 +1880,6 @@ class Vprasanje {
$this->edit_subtype_map(); $this->edit_subtype_map();
} }
//podtip heatmap
if ($row['tip'] == 27) {
$this->edit_heatmap_settings();
}
echo '<script type="text/javascript">'; echo '<script type="text/javascript">';
echo ' $(document).ready(function() {'; echo ' $(document).ready(function() {';
echo ' $("#spremenljivka_podtip_' . $row['id'] . '").selectbox();'; // kreira custom dropdown z možnostjo predogleda vprašanja echo ' $("#spremenljivka_podtip_' . $row['id'] . '").selectbox();'; // kreira custom dropdown z možnostjo predogleda vprašanja
@ -3692,13 +3702,13 @@ 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 inline">';
echo ' <label>'.$lang['srv_number_insert'].':</label>'; echo ' <label>'.$lang['srv_number_insert'].':</label>';
echo ' </div>';
echo ' <div class="vprasanje_setting_line">'; echo ' <span class="content">';
echo ' <input type="radio" name="ranking_k" id="select_num_0" value="0" '.(($row['ranking_k'] == 0) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)" /><label for="select_num_0">'.$lang['srv_number_insert_0_new'].'</label>'; echo ' <input type="radio" name="ranking_k" id="select_num_0" value="0" '.(($row['ranking_k'] == 0) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)" /><label for="select_num_0">'.$lang['srv_number_insert_0_new'].'</label>';
echo ' <input type="radio" name="ranking_k" id="select_num_1" value="1" '.(($row['ranking_k'] == 1) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)"/><label for="select_num_1">'.$lang['srv_number_insert_1'].'</label>'; echo ' <input type="radio" name="ranking_k" id="select_num_1" value="1" '.(($row['ranking_k'] == 1) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)"/><label for="select_num_1">'.$lang['srv_number_insert_1'].'</label>';
echo ' </span>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';
@ -8538,16 +8548,17 @@ class Vprasanje {
$spr_id = $row['id']; $spr_id = $row['id'];
//preveri, ce je kaksno obmocje shranjeno v bazi //preveri, ce je kaksno obmocje shranjeno v bazi
//$sqlR = sisplet_query("SELECT * FROM srv_hotspot_regions WHERE spr_id = $spr_id");
$sqlR = sisplet_query("SELECT region_index, vre_id, region_name FROM srv_hotspot_regions WHERE spr_id = $spr_id"); $sqlR = sisplet_query("SELECT region_index, vre_id, region_name FROM srv_hotspot_regions WHERE spr_id = $spr_id");
//$rowR = mysqli_fetch_array($sql);
if($row['tip'] == 1 || $row['tip'] == 2){ if($row['tip'] == 1 || $row['tip'] == 2){
$enota_orientation = $row['orientation']; $enota_orientation = $row['orientation'];
}else if($row['tip'] == 6){ }
else if($row['tip'] == 6){
$enota_orientation = $row['enota']; $enota_orientation = $row['enota'];
} }
?> ?>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -8556,153 +8567,195 @@ class Vprasanje {
init_colorPicker(<?=$row['id']?>); init_colorPicker(<?=$row['id']?>);
}); });
</script> </script>
<? <?
//roleta za izbiro najvecjega stevila klikov na sliko
echo '<p><span class="title">'.$lang['srv_vprasanje_heatmap_num_clicks'].':<span id="help_hotspot_visibility" class="spaceLeft">'.Help::display('srv_hotspot_visibility').' </span></span>';
echo '<span class="content"><select id="heatmap_num_clicks_' . $row['id'] . '" spr_id="'.$row['id'].'" name="heatmap_num_clicks" onChange="showHeatMapClickCounter($(this).val(), '.$row['id'].')">';
echo '<option value="1" '.(($heatmap_num_clicks == 1) ? ' selected="true" ' : '').'>1</option>';
echo '<option value="2" '.(($heatmap_num_clicks == 2) ? ' selected="true" ' : '').'>2</option>';
echo '<option value="3" '.(($heatmap_num_clicks == 3) ? ' selected="true" ' : '').'>3</option>';
echo '<option value="4" '.(($heatmap_num_clicks == 4) ? ' selected="true" ' : '').'>4</option>';
echo '<option value="5" '.(($heatmap_num_clicks == 5) ? ' selected="true" ' : '').'>5</option>';
echo '<option value="6" '.(($heatmap_num_clicks == 6) ? ' selected="true" ' : '').'>6</option>';
echo '<option value="7" '.(($heatmap_num_clicks == 7) ? ' selected="true" ' : '').'>7</option>';
echo '<option value="8" '.(($heatmap_num_clicks == 8) ? ' selected="true" ' : '').'>8</option>';
echo '<option value="9" '.(($heatmap_num_clicks == 9) ? ' selected="true" ' : '').'>9</option>';
echo '<option value="10" '.(($heatmap_num_clicks == 10) ? ' selected="true" ' : '').'>10</option>';
echo '</select>';
echo '</span></p>';
//roleta za izbiro najvecjega stevila klikov na sliko - konec
//checkbox za "Pokazi stevec klikov"
echo '<label for="heatmap_show_counter_clicks_'.$this->spremenljivka.'"><div style="'.$enableHeatMapClickCounter.'" class="heatmap_show_counter_clicks_class">';
echo '<p><span class="title" >'.$lang['srv_vprasanje_heatmap_show_counter_clicks'].':</span>';
echo '<span class="content">';
echo '<input type="checkbox" value="1" name="heatmap_show_counter_clicks" '.( $heatmap_show_counter_clicks == 1 ? ' checked="checked"' : '') .' onChange="heatmap_show_counter_clicks_checkbox_prop('.$this->spremenljivka.');" id="heatmap_show_counter_clicks_'.$this->spremenljivka.'">';
echo '<input '.$disable_heatmap_show_counter_clicks_hidden.' type="hidden" value="0" name="heatmap_show_counter_clicks" id="heatmap_show_counter_clicks_hidden_'.$this->spremenljivka.'">';
echo '</span></p>';
echo '</div></label>';
//checkbox za "Pokazi stevec klikov" - konec
//checkbox za "Pokazi klike"
echo '<label for="heatmap_show_clicks_'.$this->spremenljivka.'"><div class="heatmap_show_clicks_class">';
echo '<p><span class="title" >'.$lang['srv_vprasanje_heatmap_show_clicks'].':</span>';
echo '<span class="content">';
echo '<input type="checkbox" value="1" name="heatmap_show_clicks" '.( $heatmap_show_clicks == 1 ? ' checked="checked"' : '') .' onChange="heatmap_show_clicks_checkbox_prop('.$this->spremenljivka.');" id="heatmap_show_clicks_'.$this->spremenljivka.'">';
echo '<input '.$disable_heatmap_show_clicks_hidden.' type="hidden" value="0" name="heatmap_show_clicks" id="heatmap_show_clicks_hidden_'.$this->spremenljivka.'">';
echo '</span></p>';
echo '</div></label>';
//checkbox za "Pokazi klike" - konec
//dodatne nastavitve, ce morajo biti kliki vidni
echo '<div id="heatmap_clicks_settings_'.$row['id'].'" '.$heatmap_clicks_settings_display.'>';
//Izbira barve klika
if ($heatmap_click_color == '') {
$value = '#000000';
echo '<div><p><span class="title">'.$lang['srv_vprasanje_heatmap_clicks_color'].': <a href="#" onclick="$(\'#color-click-'.$row['id'].'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span></p></div>';
}else{
$value = $heatmap_click_color;
}
echo '<div><p><span class="title" id="color-click-'.$row['id'].'" '.($heatmap_click_color==''?'style="display:none;"':'').'>'.$lang['srv_vprasanje_heatmap_clicks_color'].': ';
echo '<input type="text" id="color-click'.$row['id'].'" class="colorwell auto-save" name="heatmap_click_color" value="'.$value.'" data-id="'.$row['id'].'" data-type="'.$type.'" >';
echo '</span></p></div>';
echo '<div id="picker"></div>';
//Izbira barve klika - konec
//Izbira radija/velikosti klika
echo '<div><p><span>'.$lang['srv_vprasanje_heatmap_clicks_size'].': <input id="heatmapClickSize_'.$row['id'].'" name="heatmap_click_size" type="range" min="2" max="50" step="1" value="'.$heatmap_click_size.'" oninput="UpdateClickSizeSlider(value, '.$row['id'].')"/><output for="heatmapClickSize_'.$row['id'].'" id="heatmapClickSizeValue_'.$row['id'].'">'.$heatmap_click_size.'</output></span></p></div>';
//Izbira radija/velikosti klika - konec
//Izbira oblike klika $heatmap_click_shape echo '<fieldset><legend>'.$lang['srv_hot_spot_settings'].'</legend>';
echo '<div><p><span class="title">'.$lang['srv_vprasanje_heatmap_clicks_shape'].': </span>';
echo '<span class="content"><select id="heatmapClickShape_' . $row['id'] . '" spr_id="'.$row['id'].'" name="heatmap_click_shape" onChange="">'; // roleta za izbiro najvecjega stevila klikov na sliko
echo '<option value="1" '.(($heatmap_click_shape == 1) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_heatmap_clicks_shape_1'].'</option>'; echo '<div class="vprasanje_setting_holder">';
echo '<option value="2" '.(($heatmap_click_shape == 2) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_heatmap_clicks_shape_2'].'</option>';
echo '</select>';
echo '</span></p></div>';
//Izbira oblike klika - konec
echo ' <div id="help_hotspot_visibility" class="vprasanje_setting_line half-half">';
echo ' <label>'.$lang['srv_vprasanje_heatmap_num_clicks'].' '.Help::display('srv_hotspot_visibility').':</label>';
echo ' <span class="content"><select id="heatmap_num_clicks_' . $row['id'] . '" spr_id="'.$row['id'].'" name="heatmap_num_clicks" onChange="showHeatMapClickCounter($(this).val(), '.$row['id'].')">';
echo ' <option value="1" '.(($heatmap_num_clicks == 1) ? ' selected="true" ' : '').'>1</option>';
echo ' <option value="2" '.(($heatmap_num_clicks == 2) ? ' selected="true" ' : '').'>2</option>';
echo ' <option value="3" '.(($heatmap_num_clicks == 3) ? ' selected="true" ' : '').'>3</option>';
echo ' <option value="4" '.(($heatmap_num_clicks == 4) ? ' selected="true" ' : '').'>4</option>';
echo ' <option value="5" '.(($heatmap_num_clicks == 5) ? ' selected="true" ' : '').'>5</option>';
echo ' <option value="6" '.(($heatmap_num_clicks == 6) ? ' selected="true" ' : '').'>6</option>';
echo ' <option value="7" '.(($heatmap_num_clicks == 7) ? ' selected="true" ' : '').'>7</option>';
echo ' <option value="8" '.(($heatmap_num_clicks == 8) ? ' selected="true" ' : '').'>8</option>';
echo ' <option value="9" '.(($heatmap_num_clicks == 9) ? ' selected="true" ' : '').'>9</option>';
echo ' <option value="10" '.(($heatmap_num_clicks == 10) ? ' selected="true" ' : '').'>10</option>';
echo ' </select></span>';
echo ' </div>';
// checkbox za "Pokazi stevec klikov"
echo ' <div id="help_hotspot_visibility" class="vprasanje_setting_line heatmap_show_counter_clicks_class" style="'.$enableHeatMapClickCounter.'">';
echo ' <span class="content">';
echo ' <input type="checkbox" value="1" name="heatmap_show_counter_clicks" '.( $heatmap_show_counter_clicks == 1 ? ' checked="checked"' : '') .' onChange="heatmap_show_counter_clicks_checkbox_prop('.$this->spremenljivka.');" id="heatmap_show_counter_clicks_'.$this->spremenljivka.'">';
echo ' <label for="heatmap_show_counter_clicks_'.$this->spremenljivka.'">'.$lang['srv_vprasanje_heatmap_show_counter_clicks'].'</label>';
echo ' <input '.$disable_heatmap_show_counter_clicks_hidden.' type="hidden" value="0" name="heatmap_show_counter_clicks" id="heatmap_show_counter_clicks_hidden_'.$this->spremenljivka.'">';
echo ' </span>';
echo ' </div>';
echo '</div>';
// roleta za izbiro najvecjega stevila klikov na sliko - konec
//checkbox za "Pokazi klike"
echo '<div class="vprasanje_setting_holder">';
echo ' <div id="help_hotspot_visibility" class="vprasanje_setting_line heatmap_show_clicks_class">';
echo ' <span class="content">';
echo ' <input type="checkbox" value="1" name="heatmap_show_clicks" '.( $heatmap_show_clicks == 1 ? ' checked="checked"' : '') .' onChange="heatmap_show_clicks_checkbox_prop('.$this->spremenljivka.');" id="heatmap_show_clicks_'.$this->spremenljivka.'">';
echo ' <label for="heatmap_show_clicks_'.$this->spremenljivka.'">'.$lang['srv_vprasanje_heatmap_show_clicks'].'</label>';
echo ' <input '.$disable_heatmap_show_clicks_hidden.' type="hidden" value="0" name="heatmap_show_clicks" id="heatmap_show_clicks_hidden_'.$this->spremenljivka.'">';
echo ' </span>';
echo ' </div>';
echo '</div>'; echo '</div>';
//dodatne nastavitve, ce morajo biti kliki vidni - konec //checkbox za "Pokazi klike" - konec
// dodatne nastavitve, ce morajo biti kliki vidni
echo '<div id="heatmap_clicks_settings_'.$row['id'].'" class="vprasanje_setting_holder heatmap_show_clicks_class" '.$heatmap_clicks_settings_display.'>';
//Izbira barve klika
if ($heatmap_click_color == '') {
$value = '#000000';
echo '<div><p><span class="title">'.$lang['srv_vprasanje_heatmap_clicks_color'].': <a href="#" onclick="$(\'#color-click-'.$row['id'].'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span></p></div>';
}
else{
$value = $heatmap_click_color;
}
echo '<div><p><span class="title" id="color-click-'.$row['id'].'" '.($heatmap_click_color==''?'style="display:none;"':'').'>'.$lang['srv_vprasanje_heatmap_clicks_color'].': ';
echo '<input type="text" id="color-click'.$row['id'].'" class="colorwell auto-save" name="heatmap_click_color" value="'.$value.'" data-id="'.$row['id'].'" data-type="'.$type.'" >';
echo '</span></p></div>';
echo '<div id="picker"></div>';
//Izbira barve klika - konec
//Izbira radija/velikosti klika
echo ' <div class="vprasanje_setting_line half-half">';
echo ' <label>'.$lang['srv_vprasanje_heatmap_clicks_size'].':</label>';
echo ' <input id="heatmapClickSize_'.$row['id'].'" name="heatmap_click_size" type="range" min="2" max="50" step="1" value="'.$heatmap_click_size.'" oninput="UpdateClickSizeSlider(value, '.$row['id'].')"/><output for="heatmapClickSize_'.$row['id'].'" id="heatmapClickSizeValue_'.$row['id'].'">'.$heatmap_click_size.'</output>';
echo ' </div>';
//Izbira radija/velikosti klika - konec
//Izbira oblike klika $heatmap_click_shape
echo ' <div class="vprasanje_setting_line half-half">';
echo ' <label>'.$lang['srv_vprasanje_heatmap_clicks_shape'].':</label>';
echo ' <span class="content"><select id="heatmapClickShape_' . $row['id'] . '" spr_id="'.$row['id'].'" name="heatmap_click_shape" onChange="">';
echo ' <option value="1" '.(($heatmap_click_shape == 1) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_heatmap_clicks_shape_1'].'</option>';
echo ' <option value="2" '.(($heatmap_click_shape == 2) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_heatmap_clicks_shape_2'].'</option>';
echo ' </select></span>';
echo ' </div>';
//Izbira oblike klika - konec
echo '</div>';
//dodatne nastavitve, ce morajo biti kliki vidni - konec
echo '</fieldset>';
//fieldset Obmocja - zacasno skrivanje //fieldset Obmocja - zacasno skrivanje
echo '<fieldset id="hot_spot_fieldset_'.$row['id'].'"><legend>'.$lang['srv_hot_spot_regions_menu'].'</legend>'; echo '<fieldset id="hot_spot_fieldset_'.$row['id'].'"><legend>'.$lang['srv_hot_spot_regions_menu'].'</legend>';
if (mysqli_num_rows($sqlR) != 0){
//pokazi shranjena obmocja
while ($rowR = mysqli_fetch_array($sqlR)) {
echo '<div id="hotspot_region_'.$rowR['region_index'].'" class="hotspot_region"><div id="hotspot_region_name_'.$rowR['region_index'].'" vre_id="'.$rowR['vre_id'].'" region_index = "'.$rowR['region_index'].'" class="hotspot_vrednost_inline" contenteditable="true">'.$rowR['region_name'].'</div><span class="faicon edit2 inline_hotspot_edit_region"></span><span class="faicon delete_circle icon-orange_link inline_hotspot_delete_region"></span><br /></div>';
}
}
//Sporocilo ob odsotnosti slike
echo '<p id="hotspot_message"><span class="title" >'.$lang['srv_hotspot_message'].'</span></p>';
//Sporocilo ob odsotnosti slike - konec
//Dodajanje območja - gumb
echo '<p><span class="title" ><button id="hot_spot_regions_add_button" type="button" onclick=" hotspot_edit_regions('.$row['id'].', 0)">'.$lang['srv_hot_spot_regions'].'</button></span></p>';
//*************************** SKRIVANJE NASTAVITEV OBMOCJA
$display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah
//***************************
//div za nastavitve obmocja
echo '<div id="heatmap_region_settings_'.$row['id'].'" '.$display_regions_menu.'>';
//Izbira barve obmocja
if ($hotspot_region_color == '') {
$value = '#000000';
echo '<span class="title">'.$lang['srv_hotspot_region_color_text'].': <a href="#" onclick="$(\'#color-'.$row['id'].'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span>';
}else{
$value = $hotspot_region_color;
}
echo '<span class="title" id="color-'.$row['id'].'" '.($hotspot_region_color==''?'style="display:none;"':'').'>'.$lang['srv_hotspot_region_color_text'].': ';
echo '<input type="text" id="color'.$row['id'].'" class="colorwell auto-save" name="hotspot_region_color" value="'.$value.'" data-id="'.$row['id'].'" data-type="'.$type.'" >';
echo '</span>';
echo '<div id="picker"></div>';
//Izbira barve obmocja - konec
//Regions visibility options
echo '<p><span class="title">'.$lang['srv_hotspot_visibility_options_title'].':<span id="help_hotspot_visibility" class="spaceLeft">'.Help::display('srv_hotspot_visibility').' </span></span>';
echo '<span class="title"><select id="hotspot_region_visibility_options_' . $row['id'] . '" spr_id="'.$row['id'].'" name="hotspot_region_visibility_option" onChange="">';
echo '<option value="0" '.(($hotspot_region_visibility_option == 0) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_0'].'</option>';
echo '<option value="1" '.(($hotspot_region_visibility_option == 1) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_1'].'</option>';
echo '<option value="2" '.(($hotspot_region_visibility_option == 2) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_2'].'</option>';
//echo '<option value="3" '.(($hotspot_region_visibility_option == 3) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_3'].'</option>';
echo '</select>';
echo '</span></p>';
//Regions visibility options - konec
//Tooltips options
if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox
$srv_hotspot_tooltip = 'srv_hotspot_tooltip';
}else if($row['tip'] == 6){
$srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid';
}
echo '<p><span class="title">'.$lang['srv_hotspot_tooltips_options_title'].':<span id="help_hotspot_namig" class="spaceLeft">'.Help::display($srv_hotspot_tooltip).' </span></span>'; if (mysqli_num_rows($sqlR) != 0){
echo '<span class="title"><select id="hotspot_tooltips_options_' . $row['id'] . '" spr_id="'.$row['id'].'" name="hotspot_tooltips_option" onChange="">';
echo '<option value="0" '.(($hotspot_tooltips_option == 0) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_0'].'</option>';
if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox
echo '<option value="1" '.(($hotspot_tooltips_option == 1) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_1'].'</option>';
}
if($row['tip'] == 6){ //ce je radio grid
echo '<option value="2" '.(($hotspot_tooltips_option == 2) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_2'].'</option>';
}
echo '</select>'; echo '<div class="vprasanje_setting_holder">';
echo '</span></p>';
//Tooltips options - konec //pokazi shranjena obmocja
echo '</div>'; while ($rowR = mysqli_fetch_array($sqlR)) {
//div za nastavitve obmocja - konec echo ' <div class="vprasanje_setting_line">';
echo ' <div id="hotspot_region_'.$rowR['region_index'].'" class="hotspot_region"><div id="hotspot_region_name_'.$rowR['region_index'].'" vre_id="'.$rowR['vre_id'].'" region_index = "'.$rowR['region_index'].'" class="hotspot_vrednost_inline" contenteditable="true">'.$rowR['region_name'].'</div><span class="faicon edit2 inline_hotspot_edit_region"></span><span class="faicon delete_circle icon-orange_link inline_hotspot_delete_region"></span><br /></div>';
echo ' </div>';
}
echo ' </div>';
}
//Sporocilo ob odsotnosti slike
echo '<div class="vprasanje_setting_holder">';
echo ' <div id="hotspot_message" class="vprasanje_setting_line">';
echo ' <span class="content">'.$lang['srv_hotspot_message'].'</span>';
echo ' </div>';
echo '</div>';
//Sporocilo ob odsotnosti slike - konec
//Dodajanje območja - gumb
echo '<div class="vprasanje_setting_holder">';
echo ' <div id="hot_spot_regions_add_button" class="vprasanje_setting_line">';
echo ' <span class="content"><button type="button" onclick=" hotspot_edit_regions('.$row['id'].', 0)">'.$lang['srv_hot_spot_regions'].'</button></span>';
echo ' </div>';
echo '</div>';
//*************************** SKRIVANJE NASTAVITEV OBMOCJA
$display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah
//***************************
//div za nastavitve obmocja
echo '<div id="heatmap_region_settings_'.$row['id'].'" '.$display_regions_menu.'>';
//Izbira barve obmocja
if ($hotspot_region_color == '') {
$value = '#000000';
echo '<span class="title">'.$lang['srv_hotspot_region_color_text'].': <a href="#" onclick="$(\'#color-'.$row['id'].'\').show(); $(this).parent().hide(); return false;" title="'.$lang['edit4'].'">'.$lang['srv_te_default'].' <span class="faicon edit"></span></a></span>';
}else{
$value = $hotspot_region_color;
}
echo '<span class="title" id="color-'.$row['id'].'" '.($hotspot_region_color==''?'style="display:none;"':'').'>'.$lang['srv_hotspot_region_color_text'].': ';
echo '<input type="text" id="color'.$row['id'].'" class="colorwell auto-save" name="hotspot_region_color" value="'.$value.'" data-id="'.$row['id'].'" data-type="'.$type.'" >';
echo '</span>';
echo '<div id="picker"></div>';
//Izbira barve obmocja - konec
//Regions visibility options
echo '<p><span class="title">'.$lang['srv_hotspot_visibility_options_title'].':<span id="help_hotspot_visibility" class="spaceLeft">'.Help::display('srv_hotspot_visibility').' </span></span>';
echo '<span class="title"><select id="hotspot_region_visibility_options_' . $row['id'] . '" spr_id="'.$row['id'].'" name="hotspot_region_visibility_option" onChange="">';
echo '<option value="0" '.(($hotspot_region_visibility_option == 0) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_0'].'</option>';
echo '<option value="1" '.(($hotspot_region_visibility_option == 1) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_1'].'</option>';
echo '<option value="2" '.(($hotspot_region_visibility_option == 2) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_2'].'</option>';
//echo '<option value="3" '.(($hotspot_region_visibility_option == 3) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_visibility_options_3'].'</option>';
echo '</select>';
echo '</span></p>';
//Regions visibility options - konec
//Tooltips options
if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox
$srv_hotspot_tooltip = 'srv_hotspot_tooltip';
}else if($row['tip'] == 6){
$srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid';
}
echo '<p><span class="title">'.$lang['srv_hotspot_tooltips_options_title'].':<span id="help_hotspot_namig" class="spaceLeft">'.Help::display($srv_hotspot_tooltip).' </span></span>';
echo '<span class="title"><select id="hotspot_tooltips_options_' . $row['id'] . '" spr_id="'.$row['id'].'" name="hotspot_tooltips_option" onChange="">';
echo '<option value="0" '.(($hotspot_tooltips_option == 0) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_0'].'</option>';
if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox
echo '<option value="1" '.(($hotspot_tooltips_option == 1) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_1'].'</option>';
}
if($row['tip'] == 6){ //ce je radio grid
echo '<option value="2" '.(($hotspot_tooltips_option == 2) ? ' selected="true" ' : '').'>'.$lang['srv_hotspot_tooltips_options_2'].'</option>';
}
echo '</select>';
echo '</span></p>';
//Tooltips options - konec
echo '</div>';
//div za nastavitve obmocja - konec
echo '</fieldset>'; echo '</fieldset>';
//fieldset Obmocja - konec //fieldset Obmocja - konec
} }
} }

9
lang/1.php
View File

@ -2798,8 +2798,8 @@ $lang = array (
"srv_analiza_charts" => "Grafi", "srv_analiza_charts" => "Grafi",
"srv_analiza_link" => "Kadar je spremenljivk manj kot 20 kaže povezava 'Analiza' na", "srv_analiza_link" => "Kadar je spremenljivk manj kot 20 kaže povezava 'Analiza' na",
"srv_gridAreaSize" => "Širina podvprašanj", "srv_gridAreaSize" => "Širina podvprašanj",
"srv_gridAreaHidden" => "Skrita labela", "srv_gridAreaHidden" => "Skrita labela",
"srv_textAreaSize" => "Velikost: ", "srv_textAreaSize" => "Velikost",
"srv_text_length_char_num" => "Limit znakov: ", "srv_text_length_char_num" => "Limit znakov: ",
"srv_gridAlign" => "Poravnava celic: ", "srv_gridAlign" => "Poravnava celic: ",
"srv_gridAlign_center" => "Sredinsko", "srv_gridAlign_center" => "Sredinsko",
@ -7667,10 +7667,11 @@ $lang = array (
'srv_reminder_tracking_validation' => "Validacije", 'srv_reminder_tracking_validation' => "Validacije",
'srv_reminder_tracking_hard' => "Trdo", 'srv_reminder_tracking_hard' => "Trdo",
'srv_reminder_tracking_soft' => "Mehko", 'srv_reminder_tracking_soft' => "Mehko",
'srv_hot_spot' => "Image Hot Spot", 'srv_hot_spot' => "Image Hot Spot",
'srv_hot_spot_settings' => "Image Hot Spot nastavitve",
'srv_hot_spot_load_image' => "Naloži sliko", 'srv_hot_spot_load_image' => "Naloži sliko",
'srv_hot_spot_edit_image' => "Uredi sliko", 'srv_hot_spot_edit_image' => "Uredi sliko",
'srv_hot_spot_regions' => "Dodaj območje", 'srv_hot_spot_regions' => "Dodaj območje",
'srv_hot_spot_regions_menu' => "Območja", 'srv_hot_spot_regions_menu' => "Območja",
'srv_hot_spot_region_name' => "Ime območja", 'srv_hot_spot_region_name' => "Ime območja",
'srv_hotspot_message' => "Dodajanje območij je omogočeno, ko je prisotna slika", 'srv_hotspot_message' => "Dodajanje območij je omogočeno, ko je prisotna slika",

9
lang/2.php
View File

@ -2771,8 +2771,8 @@ $lang = array (
"srv_analiza_charts" => "Charts", "srv_analiza_charts" => "Charts",
"srv_analiza_link" => "When the number of variables is lower than 20, the link 'Analysis' is set to", "srv_analiza_link" => "When the number of variables is lower than 20, the link 'Analysis' is set to",
"srv_gridAreaSize" => "Subquestion text width", "srv_gridAreaSize" => "Subquestion text width",
"srv_gridAreaHidden" => "Hidden labels", "srv_gridAreaHidden" => "Hidden labels",
"srv_textAreaSize" => "Size: ", "srv_textAreaSize" => "Size",
"srv_text_length_char_num" => "Limit of characters: ", "srv_text_length_char_num" => "Limit of characters: ",
"srv_gridAlign" => "Cell alignment: ", "srv_gridAlign" => "Cell alignment: ",
"srv_gridAlign_center" => "Center", "srv_gridAlign_center" => "Center",
@ -7551,10 +7551,11 @@ $lang = array (
'srv_reminder_tracking_validation' => "Validation", 'srv_reminder_tracking_validation' => "Validation",
'srv_reminder_tracking_hard' => "Hard", 'srv_reminder_tracking_hard' => "Hard",
'srv_reminder_tracking_soft' => "Soft", 'srv_reminder_tracking_soft' => "Soft",
'srv_hot_spot' => "Image Hot Spot", 'srv_hot_spot' => "Image Hot Spot",
'srv_hot_spot_settings' => "Image Hot Spot settings",
'srv_hot_spot_load_image' => "Upload image", 'srv_hot_spot_load_image' => "Upload image",
'srv_hot_spot_edit_image' => "Edit image", 'srv_hot_spot_edit_image' => "Edit image",
'srv_hot_spot_regions' => "Add a region", 'srv_hot_spot_regions' => "Add a region",
'srv_hot_spot_regions_menu' => "Regions", 'srv_hot_spot_regions_menu' => "Regions",
'srv_hot_spot_region_name' => "Region name", 'srv_hot_spot_region_name' => "Region name",
'srv_hotspot_message' => "Adding regions is enabled, when an image is present", 'srv_hotspot_message' => "Adding regions is enabled, when an image is present",

30
public/css/admin_new.css
View File

@ -14418,7 +14418,7 @@ div#variabla_new span.correct {
color: #777777; color: #777777;
} }
#vprasanje_float_editing .vprasanje_edit_holder .tab { #vprasanje_float_editing .vprasanje_edit_holder .tab {
padding: 0 16px; padding: 0 12px;
} }
#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit { #vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit {
max-height: calc(100vh - 250px); max-height: calc(100vh - 250px);
@ -14439,6 +14439,10 @@ div#variabla_new span.correct {
border: 0; border: 0;
border-top: 1px solid #D3D3D3; border-top: 1px solid #D3D3D3;
} }
#vprasanje_float_editing .vprasanje_edit_holder fieldset.first {
border-top: 0;
margin-top: -16px;
}
#vprasanje_float_editing .vprasanje_edit_holder fieldset legend { #vprasanje_float_editing .vprasanje_edit_holder fieldset legend {
margin: 0; margin: 0;
padding: 0 10px 0 0; padding: 0 10px 0 0;
@ -14486,6 +14490,12 @@ div#variabla_new span.correct {
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea { #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.half-half .content textarea {
width: 100%; width: 100%;
} }
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline {
justify-content: space-between;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.inline .content label:last-child {
margin-right: 0;
}
#vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span { #vprasanje_float_editing .vprasanje_edit_holder .vprasanje_setting_holder .vprasanje_setting_line.with-icon span {
display: flex; display: flex;
align-items: center; align-items: center;
@ -14517,7 +14527,7 @@ div#variabla_new span.correct {
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 2px;
} }
#vprasanje_float_editing .vprasanje_edit_holder select { #vprasanje_float_editing .vprasanje_edit_holder select {
cursor: pointer; cursor: pointer;
@ -14526,7 +14536,7 @@ div#variabla_new span.correct {
padding: 0 8px; padding: 0 8px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
#vprasanje_float_editing .vprasanje_edit_holder input[type=text], #vprasanje_float_editing .vprasanje_edit_holder input[type=text],
#vprasanje_float_editing .vprasanje_edit_holder input[type=number] { #vprasanje_float_editing .vprasanje_edit_holder input[type=number] {
@ -14535,7 +14545,7 @@ div#variabla_new span.correct {
height: 30px; height: 30px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
#vprasanje_float_editing .vprasanje_edit_holder textarea { #vprasanje_float_editing .vprasanje_edit_holder textarea {
box-sizing: border-box; box-sizing: border-box;
@ -14544,7 +14554,7 @@ div#variabla_new span.correct {
font-size: 14px; font-size: 14px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
/* /*
@ -18545,7 +18555,7 @@ and open the template in the editor.
color: #1E88E5; color: #1E88E5;
} }
#branching #div_condition_editing_float .condition_edit { #branching #div_condition_editing_float .condition_edit {
margin: 0 16px; margin: 0 12px;
background-color: white; background-color: white;
} }
#branching #div_condition_editing_float .condition_edit fieldset { #branching #div_condition_editing_float .condition_edit fieldset {
@ -18634,7 +18644,7 @@ and open the template in the editor.
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 2px;
} }
#branching #div_condition_editing_float .condition_edit select { #branching #div_condition_editing_float .condition_edit select {
cursor: pointer; cursor: pointer;
@ -18643,7 +18653,7 @@ and open the template in the editor.
padding: 0 8px; padding: 0 8px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
#branching #div_condition_editing_float .condition_edit input[type=text], #branching #div_condition_editing_float .condition_edit input[type=text],
#branching #div_condition_editing_float .condition_edit input[type=number] { #branching #div_condition_editing_float .condition_edit input[type=number] {
@ -18652,7 +18662,7 @@ and open the template in the editor.
height: 30px; height: 30px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
#branching #div_condition_editing_float .condition_edit textarea { #branching #div_condition_editing_float .condition_edit textarea {
box-sizing: border-box; box-sizing: border-box;
@ -18661,7 +18671,7 @@ and open the template in the editor.
font-size: 14px; font-size: 14px;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #D3D3D3; border: 1px solid #D3D3D3;
border-radius: 4px; border-radius: 2px;
} }
#branching #div_condition_editing_float .button_holder { #branching #div_condition_editing_float .button_holder {
flex-direction: column; flex-direction: column;

10
resources/sass/admin_new/pages/survey_edit/conditions.scss
View File

@ -198,7 +198,7 @@ and open the template in the editor.
// Glavna vsebina // Glavna vsebina
.condition_edit { .condition_edit {
margin: 0 16px; margin: 0 12px;
background-color: white; background-color: white;
@ -319,7 +319,7 @@ and open the template in the editor.
background: #FFFFFF; background: #FFFFFF;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 2px;
} }
select{ select{
@ -332,7 +332,7 @@ and open the template in the editor.
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
input[type="text"], input[type="text"],
@ -344,7 +344,7 @@ and open the template in the editor.
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
textarea{ textarea{
@ -357,7 +357,7 @@ and open the template in the editor.
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
} }

28
resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
View File

@ -120,7 +120,7 @@
} }
.tab{ .tab{
padding: 0 16px; padding: 0 12px;
} }
// Glavna vsebina // Glavna vsebina
@ -152,7 +152,12 @@
border: 0; border: 0;
border-top: 1px solid $dark-gray2; border-top: 1px solid $dark-gray2;
&.first{
border-top: 0;
margin-top: -16px;
}
legend { legend {
margin: 0; margin: 0;
padding: 0 10px 0 0; padding: 0 10px 0 0;
@ -214,6 +219,17 @@
} }
} }
&.inline{
justify-content: space-between;
.content{
label:last-child{
margin-right: 0;
}
}
}
&.with-icon{ &.with-icon{
span{ span{
@ -258,7 +274,7 @@
background: #FFFFFF; background: #FFFFFF;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 2px;
} }
select{ select{
@ -271,7 +287,7 @@
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
input[type="text"], input[type="text"],
@ -283,7 +299,7 @@
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
textarea{ textarea{
@ -296,7 +312,7 @@
background-color: $white; background-color: $white;
border: 1px solid $dark-gray2; border: 1px solid $dark-gray2;
border-radius: 4px; border-radius: 2px;
} }
} }