Merge branch 'master' of https://git.1ka.si/git/1ka
This commit is contained in:
pero1203
commit
72bc49564b
@ -7689,15 +7689,12 @@ class Branching {
|
||||
}
|
||||
// filter na vrednosti
|
||||
else {
|
||||
/*echo '<span class="buttonwrapper floatRight">';
|
||||
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_condition_editing_close_save(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
|
||||
echo '</span>';
|
||||
echo '<span class="buttonwrapper spaceRight floatRight">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
|
||||
echo '</span>';
|
||||
echo '<span class="buttonwrapper spaceRight floatRight">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_if_remove(\''.$if.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span>'.$lang['srv_if_rem'].'</span></a>'."\n\r";
|
||||
echo '</span>';*/
|
||||
|
||||
echo '<div class="button_holder" id="if_popup_butons">';
|
||||
echo '<button class="medium white-black" onClick="vrednost_condition_editing_close(\''.$vrednost.'\', \''.$if.'\'); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '<button class="medium white-blue" onClick="vrednost_if_remove(\''.$if.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_if_rem'].'</button>';
|
||||
echo '<button class="medium blue" onclick="vrednost_condition_editing_close_save(\''.$vrednost.'\', \''.$if.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -5327,11 +5327,10 @@ class SurveyAdminAjax {
|
||||
$return['output'] .= '<h2>'.$lang['srv_warning'].'</h2>';
|
||||
|
||||
$return['output'] .= '<p>'.$lang['spremenljivka_delete_data'].'</p>';
|
||||
$return['output'] .= '<p>'.$lang['srv_brisispremenljivkoconfirm_data'].'</p><br />';
|
||||
$return['output'] .= '<p class="top16">'.$lang['srv_brisispremenljivkoconfirm_data'].'</p>';
|
||||
|
||||
$return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;"><span>'.$lang['srv_brisispremenljivko'].'</span></a></span>';
|
||||
$return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
|
||||
//$return['output'] .= '<p><a href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;">'.$lang['srv_brisispremenljivko'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
|
||||
$return['output'] .= '<div class="button_holder"><button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
|
||||
$return['output'] .= '<button class="medium blue" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;">'.$lang['srv_brisispremenljivko'].'</button></div>';
|
||||
|
||||
echo json_encode($return);
|
||||
|
||||
|
||||
@ -667,11 +667,11 @@ class RecodeValues {
|
||||
}
|
||||
$sugestedName = strip_tags(self::$cacheSpremenljivka['naslov'].' - recoded');
|
||||
echo'<div id="divRecodeSprOption">';
|
||||
echo '<label>'.$lang['srv_recode_to_spr'].':</label>';
|
||||
echo '<label>'.$lang['srv_recode_to_spr'].': ';
|
||||
if ( $_GET['t'] == 'charts' || $_POST['recIsCharts'] == 1 ) {
|
||||
echo $lang['srv_recode_to_spr_same'];
|
||||
echo $lang['srv_recode_to_spr_same'].'</label>';
|
||||
} else {
|
||||
echo '<input type="radio" name="recode_type" id="recode_type0" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type0">'.$lang['srv_recode_to_spr_same'].'</label>';
|
||||
echo '</label><input type="radio" name="recode_type" id="recode_type0" value="0" '.((int)$recode_type == 0 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type0">'.$lang['srv_recode_to_spr_same'].'</label>';
|
||||
echo '<input type="radio" name="recode_type" id="recode_type1" value="1" '.((int)$recode_type == 1 ? ' checked="checked"' : '').'onchange="changeRecodeType();return false;"><label for="recode_type1">'.$lang['srv_recode_to_spr_new'].'</label>';
|
||||
}
|
||||
echo '</div>';
|
||||
|
||||
@ -2852,21 +2852,27 @@ class Vprasanje {
|
||||
|
||||
echo '<h2>'.$lang['srv_kategorije_odgovorov_title'].'</h2>';
|
||||
|
||||
echo '<div class="left-float"><span class="title">'.(in_array($rows['tip'], array(2,6,16,19,20))?$lang['srv_spremenljivka']:$lang['srv_vrednost']).':</span> <input type="text" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'></div>';
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<span class="setting_title">'.(in_array($rows['tip'], array(2,6,16,19,20))?$lang['srv_spremenljivka']:$lang['srv_vrednost']).':</span>';
|
||||
echo '<input type="text" class="text large" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'>';
|
||||
echo '</div>';
|
||||
|
||||
// RAZVRSTI odgovore
|
||||
echo '<div class="left-float"><span class="title">'.$lang['sort'].':</span> ';
|
||||
echo '<select name="vrednost_random">';
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<span class="setting_title">'.$lang['sort'].':</span>';
|
||||
|
||||
echo '<select class="dropdown large" name="vrednost_random">';
|
||||
echo '<option value="0"'.($row['random']==0?' selected':'').'>'.$lang['srv_random_off2'].'</option>';
|
||||
echo '<option value="1"'.($row['random']==1?' selected':'').'>'.$lang['srv_random_on2'].'</option>';
|
||||
echo '<option value="2"'.($row['random']==2?' selected':'').'>'.$lang['srv_sort_asc2'].'</option>';
|
||||
echo '<option value="3"'.($row['random']==3?' selected':'').'>'.$lang['srv_sort_desc2'].'</option>';
|
||||
echo '</select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '<div style="clear:both;"></div>';
|
||||
echo '<div class="bottom4">'.$lang['srv_vprasanje_text'].' <span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="pointer"> - '.$lang['srv_editor'].'</span>:';
|
||||
|
||||
echo '<div>'.$lang['srv_vprasanje_text'].' <span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="red pointer"> - '.$lang['srv_editor'].'</span>: <textarea id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
|
||||
echo '<textarea id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
|
||||
|
||||
echo '<p>';
|
||||
if ($row['if_id'] > 0) {
|
||||
@ -2877,17 +2883,14 @@ class Vprasanje {
|
||||
echo '</a>';
|
||||
} else {
|
||||
echo $lang['srv_podif_new'].': ';
|
||||
echo '<span class="faicon odg_if_not inline inline_if_not" onclick="vrednost_condition_editing(\''.$vrednost.'\'); return false;" title="'.$lang['srv_podif_edit'].'" style="cursor: pointer;"></span>';
|
||||
echo '<span class="faicon odg_if_not inline inline_if_not blue pointer" onclick="vrednost_condition_editing(\''.$vrednost.'\'); return false;" title="'.$lang['srv_podif_edit'].'"></span>';
|
||||
}
|
||||
echo '</p>';
|
||||
|
||||
echo '<span class="buttonwrapper spaceLeft floatRight">';
|
||||
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vrednost_save(\''.$vrednost.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
|
||||
echo '</span>';
|
||||
|
||||
echo '<span class="buttonwrapper spaceLeft floatRight">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></a>'."\n\r";
|
||||
echo '</span>';
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="medium white-blue" onClick="vrednost_save(\''.$vrednost.'\'); return false;">'.$lang['srv_close_profile'].'</button>';
|
||||
echo '<button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</form>';
|
||||
|
||||
@ -8874,16 +8874,9 @@ class SurveyChart {
|
||||
|
||||
|
||||
/* GUMBI NA DNU */
|
||||
echo '<div id="chartSettingsButtons" class="buttons_holder">';
|
||||
|
||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" onclick="chartCloseAdvancedSettings(); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
|
||||
echo '</span>';
|
||||
|
||||
echo '<span class="buttonwrapper floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_orange" onclick="chartSaveAdvancedSettings(\''.$spid.'\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_potrdi'].'</a>';
|
||||
echo '</span>';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="medium white-blue" onClick="chartCloseAdvancedSettings(); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '<button class="medium blue" onclick="chartSaveAdvancedSettings(\''.$spid.'\', \''.self::$current_loop.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
@ -8923,11 +8916,12 @@ class SurveyChart {
|
||||
}
|
||||
|
||||
// reset na default barvo
|
||||
echo '<br /><span class="as_link clr" onClick="chartAdvancedSettingsSetColor(\''.(is_numeric(self::$skin) ? implode("_",$default_colors) : self::$skin).'\')">'.$lang['srv_chart_advanced_default_color'].'</span>';
|
||||
echo '<p class="as_link top16 bottom16" onClick="chartAdvancedSettingsSetColor(\''.(is_numeric(self::$skin) ? implode("_",$default_colors) : self::$skin).'\')">'.$lang['srv_chart_advanced_default_color2'].'</p>';
|
||||
|
||||
// nastavitev ene od palet
|
||||
echo '<br /><span class="clr">'.$lang['srv_chart_advanced_skin'].': ';
|
||||
echo '<select name="chart_advanced_color" id="chart_advanced_color" onChange="chartAdvancedSettingsSetColor(this.value)">';
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<p>'.$lang['srv_chart_advanced_skin'].': ';
|
||||
echo '<select class="dropdown large" name="chart_advanced_color" id="chart_advanced_color" onChange="chartAdvancedSettingsSetColor(this.value)">';
|
||||
echo ' <option' . (self::$skin == '1ka' ? ' selected="selected"' : '') . ' value="1ka">'.$lang['srv_chart_skin_1ka'].'</option>';
|
||||
echo ' <option' . (self::$skin == 'lively' ? ' selected="selected"' : '') . ' value="lively">'.$lang['srv_chart_skin_0'].'</option>';
|
||||
echo ' <option' . (self::$skin == 'mild' ? ' selected="selected"' : '') . ' value="mild">'.$lang['srv_chart_skin_1'].'</option>';
|
||||
@ -8944,7 +8938,7 @@ class SurveyChart {
|
||||
}
|
||||
|
||||
|
||||
echo '</select></span>';
|
||||
echo '</select></p></div>';
|
||||
|
||||
}
|
||||
|
||||
@ -8955,28 +8949,32 @@ class SurveyChart {
|
||||
|
||||
$row = Cache::srv_spremenljivka($spid);
|
||||
$disabled = ($row['edit_graf'] == 0) ? ' disabled="disabled"' : '';
|
||||
$gray = ($row['edit_graf'] == 0) ? ' gray' : '';
|
||||
|
||||
|
||||
echo '<div><p>';
|
||||
echo $lang['srv_chart_advanced_useLabels'].':';
|
||||
echo '<label for="edit_graf_0"><input type="radio" value="0" name="edit_graf" id="edit_graf_0" '.(($row['edit_graf'] == 0) ? ' checked="checked" ' : '').' onClick="edit_labels(\'0\');" />';
|
||||
echo '<div class="new_labels"><p>';
|
||||
echo $lang['srv_chart_advanced_useLabels'].':</p>';
|
||||
echo '<input type="radio" value="0" name="edit_graf" id="edit_graf_0" '.(($row['edit_graf'] == 0) ? ' checked="checked" ' : '').' onClick="edit_labels(\'0\');" />';
|
||||
echo '<label for="edit_graf_0">';
|
||||
echo $lang['no'].'</label>';
|
||||
echo ' <label for="edit_graf_1"><input type="radio" value="1" name="edit_graf" id="edit_graf_1" '.(($row['edit_graf'] == 1) ? ' checked="checked" ' : '').' onClick="edit_labels(\'1\');" />';
|
||||
|
||||
echo '<input type="radio" value="1" name="edit_graf" id="edit_graf_1" '.(($row['edit_graf'] == 1) ? ' checked="checked" ' : '').' onClick="edit_labels(\'1\');" />';
|
||||
echo ' <label for="edit_graf_1">';
|
||||
echo $lang['yes'].'</label>';
|
||||
echo '</p></div>';
|
||||
|
||||
|
||||
echo '<div class="chart_editing">';
|
||||
|
||||
echo '<p id="title_edit" class="top16'.$gray.'">'.$lang['srv_notifications_send_title'].':</p>';
|
||||
|
||||
|
||||
// Urejanje naslova spremenljivke
|
||||
$text = $row['naslov_graf'] == '<p></p>' ? $row['naslov'] : $row['naslov_graf'];
|
||||
if (strtolower(substr($text, 0, 3)) == '<p>' && strtolower(substr($text, -4)) == '</p>' && strrpos($text, '<p>') == 0) {
|
||||
$text = substr($text, 3);
|
||||
$text = substr($text, 0, -4);
|
||||
}
|
||||
echo '<p>';
|
||||
echo '<textarea style="width:99%; height:50px;" name="naslov_graf" id="naslov_graf" class="chart_label" '.$disabled.'>'.$text.'</textarea>';
|
||||
echo '</p>';
|
||||
echo '<textarea class="textarea" name="naslov_graf" id="naslov_graf" class="chart_label" '.$disabled.'>'.$text.'</textarea>';
|
||||
|
||||
|
||||
// Urejanje label za gride
|
||||
@ -9010,7 +9008,7 @@ class SurveyChart {
|
||||
$sql1 = sisplet_query("SELECT naslov, naslov_graf FROM srv_grid WHERE id='$i' AND spr_id='$spid'");
|
||||
$row1 = mysqli_fetch_array($sql1);
|
||||
$text = $row1['naslov_graf'] == '' ? $row1['naslov'] : $row1['naslov_graf'];
|
||||
echo '<td><input type="text" maxlength="30" name="grid_graf_'.$i.'" id="grid_naslov_'.$i.'_graf" class="chart_label" value="'.$text.'" '.$disabled.' /></td>';
|
||||
echo '<td><input type="text" class="text medium wauto" maxlength="30" name="grid_graf_'.$i.'" id="grid_naslov_'.$i.'_graf" class="chart_label" value="'.$text.'" '.$disabled.' /></td>';
|
||||
}
|
||||
|
||||
//dodatne vrednosti (ne vem, zavrnil...)
|
||||
@ -9019,7 +9017,7 @@ class SurveyChart {
|
||||
if (count($missing_values) > 0) {
|
||||
foreach ($missing_values AS $mv_key => $mv_text) {
|
||||
if (isset($already_set_mv[$mv_key])) {
|
||||
echo '<td><input type="text" maxlength="30" name="grid_'.$mv_key.'_graf" class="chart_label" value="'.$already_set_mv[$mv_key].'" '.$disabled.' /></td>';
|
||||
echo '<td><input type="text" class="text medium wauto" maxlength="30" name="grid_'.$mv_key.'_graf" class="chart_label" value="'.$already_set_mv[$mv_key].'" '.$disabled.' /></td>';
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -9044,7 +9042,7 @@ class SurveyChart {
|
||||
|
||||
echo '<li id="vrednost_'.$vrednost.'" '.($row1['other'] == 1 ? 'class="li_other"' : '').'>';
|
||||
|
||||
echo '<textarea maxlength="30" name="vrednost_graf_'.$row1['id'].'" id="'.$row1['variable'].'_graf" class="vrednost_textarea chart_label" style="width:60%; height:15px;" '.$disabled.'>'.$text.'</textarea> ';
|
||||
echo '<textarea maxlength="30" name="vrednost_graf_'.$row1['id'].'" id="'.$row1['variable'].'_graf" class="vrednost_textarea chart_label" '.$disabled.'>'.$text.'</textarea> ';
|
||||
echo '['.$row1['variable'].']</span>';
|
||||
if ($row1['other'] == 1) echo ' <input type="text" disabled style="width:40px" />';
|
||||
|
||||
@ -10384,14 +10382,6 @@ class SurveyChart {
|
||||
|
||||
echo '<h2>'.$lang['srv_chart_skin_long'].'</h2>';
|
||||
echo '<div class="popup_close"><a href="#" onClick="close_chartColor(); return false;">✕</a></div>';
|
||||
echo '<p class="graf_naknadno">'.$lang['srv_chart_skin_info'].'</p>';
|
||||
|
||||
// Opozorilo na vrhu
|
||||
if(!is_numeric($skin)){
|
||||
echo '<div id="chart_skin_note">';
|
||||
echo $lang['srv_chart_skin_warning'];
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '<script type="text/javascript" charset="utf-8">
|
||||
$(document).ready(function() {
|
||||
@ -10412,12 +10402,13 @@ class SurveyChart {
|
||||
</script>';
|
||||
|
||||
|
||||
echo '<div id="chart_settings_profiles_wrap">';
|
||||
echo '<div id="chart_settings_profiles_left">';
|
||||
|
||||
// Prednastavljeni skini
|
||||
echo '<span>'.$lang['srv_chart_skin_default'].':</span>';
|
||||
echo '<span class="chart_profiles_holder" style="margin-bottom: 10px; height: 144px;">';
|
||||
echo '<span id="chart_profiles" class="chart_profiles select">';
|
||||
echo '<p>'.$lang['srv_chart_skin_default'].':</p>';
|
||||
echo '<div class="chart_profiles_holder">';
|
||||
echo '<div id="chart_profiles" class="chart_profiles select">';
|
||||
|
||||
echo '<div class="option'.($skin == '1ka' ? ' active' : '').'" id="chart_profile_skin_1ka" value="1ka">'.$lang['srv_chart_skin_1ka'].'</div>';
|
||||
echo '<div class="option'.($skin == 'lively' ? ' active' : '').'" id="chart_profile_skin_0" value="lively">'.$lang['srv_chart_skin_0'].'</div>';
|
||||
@ -10429,34 +10420,39 @@ class SurveyChart {
|
||||
echo '<div class="option'.($skin == 'red' ? ' active' : '').'" id="chart_profile_skin_4" value="red">'.$lang['srv_chart_skin_4'].'</div>';
|
||||
echo '<div class="option'.($skin == 'multi' ? ' active' : '').'" id="chart_profile_skin_5" value="multi">'.$lang['srv_chart_skin_5'].'</div>';
|
||||
|
||||
echo '</span>';
|
||||
echo '</span>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Custom kreirani skini
|
||||
$custom_skins = self::getCustomSkins();
|
||||
|
||||
echo '<span>'.$lang['srv_chart_skin_custom'].':</span>';
|
||||
echo '<span class="chart_profiles_holder">';
|
||||
echo '<span id="chart_profiles_custom" class="chart_profiles select">';
|
||||
echo '<p>'.$lang['srv_chart_skin_custom'].':</p>';
|
||||
echo '<div class="chart_profiles_holder">';
|
||||
echo '<div id="chart_profiles_custom" class="chart_profiles select">';
|
||||
|
||||
foreach ($custom_skins as $custom_skin ){
|
||||
echo '<div class="option'.($skin == $custom_skin['id'] ? ' active' : '').'" id="chart_profile_skin_'.$custom_skin['id'].'" value="'.$custom_skin['id'].'">'.$custom_skin['name'].'</div>';
|
||||
}
|
||||
|
||||
echo '</span>';
|
||||
echo '</span>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
// Ce je izbran custom skin imamo na dnu gumba brisi in preimenuj
|
||||
if(is_numeric($skin)){
|
||||
echo '<a href="#" onclick="chart_skin_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</a><br/>'."\n";
|
||||
echo '<a href="#" onclick="chart_skin_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</a>'."\n";
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="small white-blue" onClick="chart_skin_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</button>';
|
||||
echo '<button class="small blue" onclick="chart_skin_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>'; #left
|
||||
|
||||
|
||||
echo '<div id="chart_settings_profiles_right">';
|
||||
echo '<div id="chart_settings_profiles_middle">';
|
||||
|
||||
echo '<p class="bottom8">'.$lang['srv_chart_skin_long2'].':</p>';
|
||||
|
||||
// ce je numeric je custom skin
|
||||
if(is_numeric($skin)){
|
||||
@ -10469,19 +10465,13 @@ class SurveyChart {
|
||||
else{
|
||||
// preview za default skine
|
||||
echo '<div id="div_chart_skin_previews">';
|
||||
echo $lang['srv_chart_skin_preview'].':';
|
||||
echo '<h2>'.$lang['srv_chart_skin_preview'].'</h2>';
|
||||
self::displayChartSkinPreview($skin);
|
||||
echo '</div>';
|
||||
|
||||
$default_colors = self::getDefaultColors($skin);
|
||||
}
|
||||
|
||||
// Izbira custom skina
|
||||
echo '<div id="chart_custom_skin">';
|
||||
|
||||
echo ' <div id="picker" style="float: right;"></div>';
|
||||
|
||||
|
||||
for($i=0; $i<7; $i++){
|
||||
$name = 'color'.($i+1);
|
||||
//$value = (self::$settings['colors'][$i] != '') ? self::$settings['colors'][$i] : $default_colors[$i];
|
||||
@ -10491,11 +10481,28 @@ class SurveyChart {
|
||||
}
|
||||
|
||||
// reset na default barvo
|
||||
echo '<br /><span class="as_link clr" onClick="chartAdvancedSettingsSetColor(\''.(is_numeric($skin) ? implode("_",$colors) : $skin).'\')">'.$lang['srv_chart_advanced_default_color'].'</span>';
|
||||
echo '<p class="as_link top8" onClick="chartAdvancedSettingsSetColor(\''.(is_numeric($skin) ? implode("_",$colors) : $skin).'\')">'.$lang['srv_chart_advanced_default_color2'].'</p>';
|
||||
|
||||
echo '</div>'; #middle
|
||||
|
||||
echo '<div id="chart_settings_profiles_right">';
|
||||
|
||||
// Izbira custom skina
|
||||
echo '<div id="chart_custom_skin">';
|
||||
|
||||
echo '<div id="picker"></div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; #right
|
||||
echo '</div>'; #wrap
|
||||
|
||||
// Opozorilo - privzetih ne morejo spreminjati
|
||||
if(!is_numeric($skin)){
|
||||
echo '<div id="chart_skin_note">';
|
||||
echo $lang['srv_chart_skin_warning'];
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// cover Div
|
||||
@ -10545,8 +10552,8 @@ class SurveyChart {
|
||||
echo '<input id="deleteChartSkinId" type="hidden" value="' . $custom_skin['id'] . '" />'."\n";
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="medium white-blue" onClick="zoomProfileAction(\'cancelDelete\'); return false;">'.$lang['srv_close_profile'].'</button>';
|
||||
echo '<button class="medium blue" onclick="zoomProfileAction(\'doDelete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
|
||||
echo '<button class="medium white-blue" onClick="chart_skin_action(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';
|
||||
echo '<button class="medium blue" onclick="chart_skin_action(\'delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -1048,7 +1048,7 @@ function if_remove(_if, all, confirmed) {
|
||||
// Warning da brisemo vsebino pogoja in imamo ze podatke, ki jih bomo pobrisali
|
||||
if (data.substring(0, 3) === '<p>' || data.substring(0, 4) === '<h2>') {
|
||||
$('#fade').fadeIn("fast");
|
||||
$('#dropped_alert').html(data).fadeIn("fast").css('width', '400px');
|
||||
$('#dropped_alert').html(data).fadeIn("fast").css('width', '600px');
|
||||
}
|
||||
else{
|
||||
$('#branching').html(data);
|
||||
|
||||
@ -500,9 +500,11 @@ function tableChartSaveAdvancedSettings (chartID) {
|
||||
function edit_labels(val){
|
||||
if(val == 0) {
|
||||
$('.chart_editing :input').attr('disabled', true);
|
||||
$('#title_edit').addClass('gray');
|
||||
}
|
||||
else {
|
||||
$('.chart_editing :input').removeAttr('disabled');
|
||||
$('#title_edit').removeClass('gray');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1024,7 +1024,7 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) {
|
||||
}
|
||||
else if (data.error == 2) {
|
||||
$('#fade').fadeIn('slow');
|
||||
$('#dropped_alert').html(data.output).fadeIn('slow').css('width', '400px');
|
||||
$('#dropped_alert').html(data.output).fadeIn('slow').css('width', '600px');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -621,7 +621,7 @@ function inline_vrednost_delete(spremenljivka, vrednost, confirmed/*, tip, other
|
||||
else if (data.error == 2) {
|
||||
|
||||
$('#fade').fadeIn("fast");
|
||||
$('#dropped_alert').html(data.output).fadeIn("fast").css('width', '400px');
|
||||
$('#dropped_alert').html(data.output).fadeIn("fast").css('width', '600px');
|
||||
|
||||
//ce je posebna vrednost, se rabi dodat callbaack
|
||||
if(special_vrednost){
|
||||
|
||||
@ -122,7 +122,7 @@ class DisplayController{
|
||||
echo '<div class="logo ">';
|
||||
|
||||
echo ' <a href="'.$site_url.$this->root.'index.php">';
|
||||
echo ' <img src="'.$site_url.'/public/img/logo/1ka_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
|
||||
echo ' <img src="'.$site_url.'/public/img/logo/1ka_logo_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
|
||||
if(isAAI()){
|
||||
echo ' <img src="'.$site_url.'/public/img/logo/arnes_logo.png" style="margin-left:30px;">';
|
||||
}
|
||||
|
||||
@ -4,50 +4,61 @@
|
||||
font-family: "Source Sans Pro","sans-serif";
|
||||
}
|
||||
|
||||
body {
|
||||
max-width: 1160px;
|
||||
margin: auto;
|
||||
color: #343434;
|
||||
}
|
||||
|
||||
/* nav */
|
||||
.mobile{
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
h1 {
|
||||
font-weight: 300;
|
||||
font-size: 50px;
|
||||
line-height: 62px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 40px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
||||
header {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 5px;
|
||||
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
header a {
|
||||
header .nav-desktop span.menu_item {
|
||||
margin-left: 32px;
|
||||
text-transform: none;
|
||||
}
|
||||
header .nav-desktop span.menu_item a {
|
||||
color: #343434;
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-size: 16px;
|
||||
line-height: 42px;
|
||||
}
|
||||
|
||||
|
||||
header nav span.menu_item a:hover {
|
||||
color: #F07D3E;
|
||||
}
|
||||
|
||||
header nav span.menu_item.active {
|
||||
border-bottom: 3px #F07D3E solid;
|
||||
}
|
||||
}
|
||||
|
||||
header nav span.lang_switch img {
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
header nav span.lang_switch span {
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
|
||||
#header-btn {
|
||||
color: rgb(255, 255, 255);
|
||||
color: #FFFFFF;
|
||||
background-color: #F07D3E;
|
||||
border: 1px solid #F07D3E;
|
||||
|
||||
width: 108px;
|
||||
height: 44px;
|
||||
padding: 9px 16px;
|
||||
gap: 10px;
|
||||
|
||||
width: 150x;
|
||||
padding: 8px 16px;
|
||||
|
||||
text-transform: none;
|
||||
}
|
||||
@ -59,6 +70,9 @@ header nav span.menu_item.active {
|
||||
border: 1px solid #F07D3E;
|
||||
}
|
||||
|
||||
#main .main_content {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.hero-container {
|
||||
display: flex;
|
||||
@ -67,15 +81,15 @@ header nav span.menu_item.active {
|
||||
|
||||
height: auto;
|
||||
|
||||
margin-top: 30px;
|
||||
margin-bottom: 100px;
|
||||
|
||||
margin-top: 105px;
|
||||
margin-bottom: 210px;
|
||||
}
|
||||
|
||||
|
||||
.hero-container img {
|
||||
|
||||
max-width: 60%;
|
||||
height: auto;
|
||||
max-width: 50%;
|
||||
max-height: 476px;
|
||||
}
|
||||
|
||||
|
||||
@ -85,25 +99,44 @@ header nav span.menu_item.active {
|
||||
margin-right: 10px;
|
||||
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.hero-container .text h1 {
|
||||
font-weight: 300;
|
||||
font-size: 50px;
|
||||
line-height: 62px;
|
||||
|
||||
margin-top: 0px;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
.hero-container .text p{
|
||||
margin-top: 0px;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.hero-container a {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
background-color: #F07D3E;
|
||||
color: white;
|
||||
|
||||
padding: 8px 16px;
|
||||
width: 200px;
|
||||
background-color: #F07D3E;
|
||||
border: 1px solid #F07D3E;
|
||||
color: white;
|
||||
|
||||
background: linear-gradient(to left, #F07D3E 50%, white 50%) right;
|
||||
background-size: 200%;
|
||||
transition: .3s ease-out;
|
||||
}
|
||||
.hero-container a:hover {
|
||||
background-color: white;
|
||||
color: #F07D3E;
|
||||
border: 1px solid #F07D3E;
|
||||
|
||||
background-position: left;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -112,6 +145,8 @@ header nav span.menu_item.active {
|
||||
max-width: auto;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.povezave {
|
||||
|
||||
display: flex;
|
||||
@ -119,29 +154,45 @@ header nav span.menu_item.active {
|
||||
}
|
||||
|
||||
.title {
|
||||
text-align: center;
|
||||
font-weight: 400;
|
||||
|
||||
margin-bottom: 70px;
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-size: 32px;
|
||||
line-height: 36px;
|
||||
|
||||
text-align: center;
|
||||
margin-bottom: 50px;
|
||||
|
||||
}
|
||||
|
||||
.povezave h2 {
|
||||
font-size: 18px;
|
||||
font-style: normal;
|
||||
font-weight: 700;
|
||||
font-size: 18px;
|
||||
line-height: 23px;
|
||||
|
||||
margin-top: 25px;
|
||||
margin-bottom: 8px;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.povezave .col{
|
||||
|
||||
text-align: center;
|
||||
margin-left: 10px;
|
||||
|
||||
}
|
||||
|
||||
.povezave .col p {
|
||||
height: 110px;
|
||||
max-width: 300px;
|
||||
max-width: 253px;
|
||||
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-size: 16px;
|
||||
line-height: 26px;
|
||||
|
||||
margin-top: 0px;
|
||||
|
||||
|
||||
}
|
||||
@ -151,11 +202,19 @@ header nav span.menu_item.active {
|
||||
justify-content: space-between;
|
||||
|
||||
background-color: #F07D3E;
|
||||
border: 1px solid #F07D3E;
|
||||
color: white;
|
||||
font-size: 16px;
|
||||
line-height: 26px;
|
||||
|
||||
padding: 12px 16px;
|
||||
margin: 0px 20px;
|
||||
max-width: 196px;
|
||||
|
||||
background: linear-gradient(to left, #F07D3E 50%, white 50%) right;
|
||||
background-size: 200%;
|
||||
transition: .3s ease-out;
|
||||
|
||||
padding: 8px 16px;
|
||||
max-width: 150px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
#povezave-btn:hover {
|
||||
@ -163,20 +222,30 @@ header nav span.menu_item.active {
|
||||
background-color: white;
|
||||
|
||||
border: 1px solid #F07D3E;
|
||||
|
||||
background-position: left;
|
||||
}
|
||||
|
||||
|
||||
|
||||
footer .footer_content {
|
||||
padding: 0px;
|
||||
margin-top: 210px;
|
||||
}
|
||||
|
||||
footer h2 {
|
||||
text-transform: uppercase;
|
||||
font-weight: 700;
|
||||
font-size: 18px;
|
||||
line-height: 24px;
|
||||
|
||||
margin-bottom: 12px;
|
||||
|
||||
}
|
||||
|
||||
footer .col a {
|
||||
color: black;
|
||||
color: #343434;
|
||||
font-size: 16px;
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
.social_logo_flex img {
|
||||
@ -191,6 +260,9 @@ footer .col a {
|
||||
footer .footer_content .col span {
|
||||
font-weight: 400;
|
||||
}
|
||||
footer .footer_content .col span a {
|
||||
color: #343434;
|
||||
}
|
||||
|
||||
footer .footer_content .col1 .col1-flex {
|
||||
display: flex;
|
||||
@ -259,16 +331,27 @@ input[type=button]:hover,
|
||||
flex-direction: column-reverse;
|
||||
|
||||
|
||||
margin-top: 50px;
|
||||
margin-top: 70px;
|
||||
margin-bottom: 50px;
|
||||
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.hero-container img {
|
||||
max-width: 65%;
|
||||
}
|
||||
|
||||
max-width: 70%;
|
||||
height: auto;
|
||||
.hero-container .text h1 {
|
||||
margin-top: 50px;
|
||||
}
|
||||
.hero-container .text p {
|
||||
margin-bottom: 25px;
|
||||
max-width: 390px;
|
||||
}
|
||||
.hero-container .text a {
|
||||
width: 80%;
|
||||
max-width: 320px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.hero-container .text {
|
||||
@ -277,9 +360,7 @@ input[type=button]:hover,
|
||||
|
||||
}
|
||||
|
||||
.hero-container .text a {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
|
||||
.povezave{
|
||||
display: grid;
|
||||
@ -288,8 +369,15 @@ input[type=button]:hover,
|
||||
row-gap: 30px;
|
||||
}
|
||||
|
||||
.title {
|
||||
margin-top: 118px;
|
||||
margin-bottom: 0px;
|
||||
|
||||
}
|
||||
|
||||
.povezave .col {
|
||||
margin: auto;
|
||||
margin-top: 50px;
|
||||
|
||||
}
|
||||
|
||||
@ -299,6 +387,9 @@ input[type=button]:hover,
|
||||
height: 80px;
|
||||
|
||||
}
|
||||
#povezave-btn {
|
||||
margin: 0px auto;
|
||||
}
|
||||
|
||||
footer .footer_content {
|
||||
display: grid;
|
||||
@ -348,14 +439,13 @@ input[type=button]:hover,
|
||||
font-size: 50px;
|
||||
}
|
||||
|
||||
|
||||
.hero-container .text {
|
||||
max-width: 95%;
|
||||
|
||||
.hero-container img {
|
||||
max-width: 80%;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.hero-container .text a {
|
||||
width: 95%;
|
||||
color: white;
|
||||
}
|
||||
.hero-container .text a:hover {
|
||||
@ -375,7 +465,7 @@ input[type=button]:hover,
|
||||
}
|
||||
|
||||
.povezave .col {
|
||||
margin-bottom: 50px ;
|
||||
margin-top: 50px;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -4830,6 +4830,7 @@ $lang = array (
|
||||
"srv_chart_skin_7" => "Pastel",
|
||||
"srv_chart_skin_-1" => "Po meri",
|
||||
"srv_chart_skin_long" => "Nabor barv",
|
||||
"srv_chart_skin_long2" => "Barve v naboru",
|
||||
"srv_chart_skin_info" => "(Naknadno lahko urejate barve za vsak graf posebej)",
|
||||
"srv_chart_skin_preview" => "Predogled barv",
|
||||
"srv_chart_skin_default" => "Standardni nabori barv",
|
||||
@ -4861,7 +4862,7 @@ $lang = array (
|
||||
"srv_chart_hq" => "Visoka ločljivost",
|
||||
"srv_chart_hq_warning" => "Izbrali ste visoko ločljivost (2400px), ki je primerna za izpis PDF in RTF.\n\nIzdelava vsakega posameznega grafa lahko zato traja nekaj sekund! Datoteka bo tudi razmeroma velika!\n\nAli ste prepričani da želite nadaljevati?",
|
||||
"srv_chart_advanced_useLabels" => "Uporabi popravljene labele",
|
||||
"srv_chart_advanced_labelsWarning" => "* Omejitev za popravljene labele je 20 znakov!",
|
||||
"srv_chart_advanced_labelsWarning" => "* Omejitev za popravljene labele je 30 znakov!",
|
||||
"srv_chart_advanced_labels" => "Labele",
|
||||
"srv_chart_advanced_colors" => "Barve",
|
||||
"srv_chart_advanced_recoding" => "Rekodiranje",
|
||||
@ -4871,6 +4872,7 @@ $lang = array (
|
||||
"srv_chart_advancedLink_recoding" => "Rekodiranje",
|
||||
"srv_chart_advancedLink_limits" => "Meje",
|
||||
"srv_chart_advanced_default_color" => "Ponastavi na privzeto",
|
||||
"srv_chart_advanced_default_color2" => "Ponastavi spremembe barv",
|
||||
"srv_chart_advanced_skin" => "Izberi skin",
|
||||
"srv_chart_ttest_title" => "Povprečna vrednost za",
|
||||
"srv_chart_settings_fullScale" => "Polna skala",
|
||||
|
||||
@ -4803,6 +4803,7 @@ $lang = array (
|
||||
"srv_chart_skin_7" => "Pastel",
|
||||
"srv_chart_skin_-1" => "Custom",
|
||||
"srv_chart_skin_long" => "Color palette",
|
||||
"srv_chart_skin_long2" => "Colors in palette",
|
||||
"srv_chart_skin_info" => "(Subsequently, you can edit the color palette for each chart separately)",
|
||||
"srv_chart_skin_preview" => "Color preview",
|
||||
"srv_chart_skin_default" => "Standard color themes",
|
||||
@ -4834,7 +4835,7 @@ $lang = array (
|
||||
"srv_chart_hq" => "High resolution",
|
||||
"srv_chart_hq_warning" => "High resolution charts (2400px) are suitable for PDF and RTF exports.\n\nEach chart might take several seconds to generate! File will also be relatively large!\n\nAre you sure you want to continue?",
|
||||
"srv_chart_advanced_useLabels" => "Use custom labels",
|
||||
"srv_chart_advanced_labelsWarning" => "Text limit for custom labels is 20 characters!",
|
||||
"srv_chart_advanced_labelsWarning" => "Text limit for custom labels is 30 characters!",
|
||||
"srv_chart_advanced_labels" => "Labels",
|
||||
"srv_chart_advanced_colors" => "Colors",
|
||||
"srv_chart_advanced_recoding" => "Recoding",
|
||||
@ -4844,6 +4845,7 @@ $lang = array (
|
||||
"srv_chart_advancedLink_recoding" => "Recoding",
|
||||
"srv_chart_advancedLink_limits" => "Number limits",
|
||||
"srv_chart_advanced_default_color" => "Reset to default",
|
||||
"srv_chart_advanced_default_color2" => "Reset color changes",
|
||||
"srv_chart_advanced_skin" => "Select skin",
|
||||
"srv_chart_ttest_title" => "Average value",
|
||||
"srv_chart_settings_fullScale" => "Full scale",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -363,42 +363,6 @@ ul.vrednost_sort {
|
||||
}
|
||||
|
||||
|
||||
.chart_profiles_holder {
|
||||
width: 190px;
|
||||
border: 1px solid $grey_normal;
|
||||
height: 130px;
|
||||
display: inline-block;
|
||||
}
|
||||
#chart_profiles {
|
||||
overflow: auto;
|
||||
cursor: pointer;
|
||||
width: 190px;
|
||||
display: inline-block;
|
||||
height: 144px;
|
||||
.option {
|
||||
padding: 1px;
|
||||
}
|
||||
.active {
|
||||
background-color: $strong_blue_super_darken;
|
||||
color: white;
|
||||
border-bottom: 1px solid $grey_normal;
|
||||
}
|
||||
}
|
||||
#chart_profiles_custom {
|
||||
overflow: auto;
|
||||
cursor: pointer;
|
||||
width: 190px;
|
||||
display: inline-block;
|
||||
height: 130px;
|
||||
.option {
|
||||
padding: 1px;
|
||||
}
|
||||
.active {
|
||||
background-color: $strong_blue_super_darken;
|
||||
color: white;
|
||||
border-bottom: 1px solid $grey_normal;
|
||||
}
|
||||
}
|
||||
#chart_settings_profiles_right {
|
||||
#div_chart_skin_previews {
|
||||
position: fixed;
|
||||
|
||||
@ -30,6 +30,14 @@ p,span {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.bottom4 {
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.top4 {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
//Barve
|
||||
.warning,
|
||||
.red {
|
||||
|
||||
@ -450,6 +450,16 @@ div#div_condition_editing {
|
||||
}
|
||||
}
|
||||
|
||||
//Skrijemo gumbe pri pogoju znotraj filtra (ima svoje gumbe)
|
||||
div.popup_right {
|
||||
#div_cp_preview_content {
|
||||
#if_popup_butons {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Izračuni
|
||||
|
||||
#rec_spremenljivka_naslov {
|
||||
@ -528,7 +538,6 @@ table.question_recode_table {
|
||||
width: 190px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//Izbira spremenljivke pri kalkulaciji
|
||||
|
||||
@ -431,54 +431,14 @@ ul.vrednost_sort {
|
||||
text-indent: 0px;
|
||||
}
|
||||
|
||||
|
||||
.chart_profiles_holder {
|
||||
width: 190px;
|
||||
border: 1px solid $gray;
|
||||
height: 130px;
|
||||
display: inline-block;
|
||||
margin-top: 4px;
|
||||
}
|
||||
#chart_profiles {
|
||||
overflow: auto;
|
||||
cursor: pointer;
|
||||
width: 190px;
|
||||
display: inline-block;
|
||||
height: 144px;
|
||||
.option {
|
||||
padding: 1px;
|
||||
}
|
||||
.active {
|
||||
background-color: $blue;
|
||||
color: white;
|
||||
border-bottom: 1px solid $gray;
|
||||
}
|
||||
}
|
||||
#chart_profiles_custom {
|
||||
overflow: auto;
|
||||
cursor: pointer;
|
||||
width: 190px;
|
||||
display: inline-block;
|
||||
height: 130px;
|
||||
.option {
|
||||
padding: 1px;
|
||||
}
|
||||
.active {
|
||||
background-color: $blue;
|
||||
color: white;
|
||||
border-bottom: 1px solid $gray;
|
||||
}
|
||||
}
|
||||
#chart_settings_profiles_right {
|
||||
#chart_settings_profiles_middle {
|
||||
#div_chart_skin_previews {
|
||||
position: fixed;
|
||||
top: 100px;
|
||||
top: 193px;
|
||||
left: 90px;
|
||||
width: 200px;
|
||||
height: 140px;
|
||||
padding: 10px;
|
||||
padding: 16px;
|
||||
background-color: white;
|
||||
border: 4px solid $gray;
|
||||
box-shadow: 0 0 20px black;
|
||||
-moz-box-shadow: 0 0 20px black;
|
||||
-webkit-box-shadow: 0 0 20px black;
|
||||
@ -496,16 +456,8 @@ ul.vrednost_sort {
|
||||
}
|
||||
}
|
||||
}
|
||||
.form-item {
|
||||
padding: 3px;
|
||||
width: 200px;
|
||||
}
|
||||
.colorwell {
|
||||
width: 70px;
|
||||
height: 20px;
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
#newChartSkin {
|
||||
display: none;
|
||||
position: absolute;
|
||||
|
||||
@ -9,9 +9,7 @@
|
||||
position: relative;
|
||||
z-index: 90;
|
||||
|
||||
width: 650px;
|
||||
height: 500px;
|
||||
padding: 10px;
|
||||
width: 850px;
|
||||
|
||||
.as_link {
|
||||
color: $blue !important;
|
||||
@ -25,21 +23,109 @@
|
||||
|
||||
#chart_skin_note {
|
||||
width: auto;
|
||||
padding: 12px 16px;
|
||||
padding: 10px;
|
||||
border: 1px solid $gray;
|
||||
background-color: $light-gray;
|
||||
border-radius: 2px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
#chart_settings_profiles_wrap {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
#chart_settings_profiles_left {
|
||||
float: left;
|
||||
width: 30%;
|
||||
height: 200px;
|
||||
width: 265px;
|
||||
margin-right: 64px;
|
||||
|
||||
.chart_profiles_holder {
|
||||
|
||||
width: 100%;
|
||||
border: 1px solid $gray;
|
||||
height: 135px;
|
||||
margin-top: 4px;
|
||||
margin-bottom: 16px;
|
||||
|
||||
#chart_profiles,
|
||||
#chart_profiles_custom {
|
||||
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
height: 100%;
|
||||
|
||||
.option {
|
||||
padding: 4px;
|
||||
border-bottom: 1px solid $gray;
|
||||
}
|
||||
#chart_settings_profiles_right {
|
||||
padding: 20px;
|
||||
width: 60%;
|
||||
float: right;
|
||||
.active {
|
||||
color: $blue;
|
||||
background-color: $light-blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.button_holder {
|
||||
gap: 8px;
|
||||
justify-content: space-between;
|
||||
padding: 0 !important;
|
||||
border: none !important;
|
||||
margin-bottom: 8px;
|
||||
|
||||
button {
|
||||
min-width: 0;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
#chart_settings_profiles_middle {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
width: 200px;
|
||||
|
||||
.form-item {
|
||||
width: 200px;
|
||||
label {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
.colorwell {
|
||||
width: 70px;
|
||||
height: 28px;
|
||||
font-size: 14px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#chart_settings_profiles_right{
|
||||
width: 385px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
.button_holder {
|
||||
border-top: 1px solid $gray;
|
||||
padding-top: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
#chart_skin_previews {
|
||||
h2 {
|
||||
width: 100%;
|
||||
margin-bottom: 16px;
|
||||
padding-bottom: 8px;
|
||||
|
||||
font-weight: 600;
|
||||
font-size: 16px;
|
||||
text-transform: uppercase;
|
||||
|
||||
border-bottom: 1px $gray solid;
|
||||
|
||||
margin-block-start: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,22 +133,19 @@
|
||||
#chart_float_editing {
|
||||
display: none;
|
||||
position: relative;
|
||||
z-index: 999;
|
||||
|
||||
width: 815px;
|
||||
padding: 0 20px;
|
||||
|
||||
box-sizing: border-box;
|
||||
|
||||
.chartSettingsArea {
|
||||
position: absolute;
|
||||
overflow: auto;
|
||||
right: 20px;
|
||||
|
||||
width: 615px;
|
||||
height: 300px;
|
||||
padding: 20px;
|
||||
margin: 0 0 40px 0;
|
||||
box-sizing: border-box;
|
||||
|
||||
background-color: $blue;
|
||||
width: 615px;
|
||||
padding: 0 20px;
|
||||
|
||||
ul.vrednost_sort {
|
||||
li {
|
||||
@ -86,16 +169,62 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.new_labels {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
p {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.chart_editing {
|
||||
textarea {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
#vrednosti_holder {
|
||||
ul {
|
||||
li {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
textarea {
|
||||
width: 90%;
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.form-item {
|
||||
width: 200px;
|
||||
label {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
.colorwell {
|
||||
width: 70px;
|
||||
height: 28px;
|
||||
font-size: 14px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//// Nastavitve
|
||||
.chartSettingsTabs {
|
||||
position: absolute;
|
||||
box-sizing: border-box;
|
||||
|
||||
width: 160px;
|
||||
height: 260px;
|
||||
padding: 0px;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
background-color: white;
|
||||
background-color: $white;
|
||||
|
||||
ul {
|
||||
padding: 0;
|
||||
@ -110,20 +239,11 @@
|
||||
}
|
||||
|
||||
li.active {
|
||||
background-color: $blue;
|
||||
color: $blue;
|
||||
background-color: $light-blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.form-item {
|
||||
padding: 3px;
|
||||
width: 200px;
|
||||
}
|
||||
.colorwell {
|
||||
width: 70px;
|
||||
height: 20px;
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
/*color picker*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user