← All changes | includes/class-chart-builder-functions.php +61 -2 3.7.5 → 3.8.1 View file →

		@@ -1584,8 +1584,27 @@
1584	1584
1585	1585	// start_angle
1586	1586	$settings['start_angle'] = isset( $settings['start_angle'] ) && $settings['start_angle'] != '' ? esc_attr( absint($settings['start_angle']) ) : 0;
1587	1587
	1588	+ // rotation_degree
	1589	+ $settings['rotation_degree'] = isset( $settings['rotation_degree'] ) && $settings['rotation_degree'] != '' ? esc_attr( absint($settings['rotation_degree']) ) : 0;
	1590	+
	1591	+ // Tooltip text options
	1592	+ $tooltip_text_options = array(
	1593	+ "value" => __("Value", "chart-builder"),
	1594	+ "percentage" => __("Percent", "chart-builder"),
	1595	+ "both" => __("Value & Percent", "chart-builder")
	1596	+ );
	1597	+ $settings['tooltip_text_options'] = $tooltip_text_options;
	1598	+
	1599	+ // Tooltip text
	1600	+ $settings['tooltip_text'] = isset( $settings['tooltip_text'] ) && $settings['tooltip_text'] != '' ? esc_attr( $settings['tooltip_text'] ) : 'value';
	1601	+
	1602	+ // Data grouping settings
	1603	+ $settings['data_grouping_limit'] = isset( $settings['data_grouping_limit'] ) && $settings['data_grouping_limit'] != '' ? esc_attr( $settings['data_grouping_limit'] ) : '0.5';
	1604	+ $settings['data_grouping_label'] = isset( $settings['data_grouping_label'] ) && $settings['data_grouping_label'] != '' ? esc_attr( $settings['data_grouping_label'] ) : 'Other';
	1605	+ $settings['data_grouping_color'] = isset( $settings['data_grouping_color'] ) && $settings['data_grouping_color'] != '' ? esc_attr( $settings['data_grouping_color'] ) : '#ccc';
	1606	+
1588	1607	// Show chart description
1589	1608	if (!isset($settings['show_description'])) {
1590	1609	$settings['show_description'] = 'checked';
1591	1610	} else {
		@@ -1599,9 +1618,17 @@
1599	1618	} else {
1600	1619	$settings['show_title'] = ( $settings['show_title'] != '' ) ? $settings['show_title'] : 'off';
1601	1620	$settings['show_title'] = isset( $settings['show_title'] ) && $settings['show_title'] == 'on' ? 'checked' : '';
1602	1621	}
1603		-
	1622	+
	1623	+ // Enable interactivity
	1624	+ if (!isset($settings['enable_interactivity'])) {
	1625	+ $settings['enable_interactivity'] = 'checked';
	1626	+ } else {
	1627	+ $settings['enable_interactivity'] = ( $settings['enable_interactivity'] != '' ) ? $settings['enable_interactivity'] : 'off';
	1628	+ $settings['enable_interactivity'] = isset( $settings['enable_interactivity'] ) && $settings['enable_interactivity'] == 'on' ? 'checked' : '';
	1629	+ }
	1630	+
1604	1631	$counting_source = !empty($source) ? $source : array();
1605	1632	$count_slices = (isset($counting_source) && !is_null($counting_source) && count($counting_source) > 0) ? count($counting_source) - 1 : 0;
1606	1633
1607	1634	// Slices settings
		@@ -1624,8 +1651,23 @@
1624	1651	$settings['show_color_code'] = isset( $settings['show_color_code'] ) && $settings['show_color_code'] == 'on' ? 'checked' : '';
1625	1652
1626	1653	$settings['tooltip_italic'] = ( isset( $settings['tooltip_italic'] ) && $settings['tooltip_italic'] != '' ) ? $settings['tooltip_italic'] : 'off';
1627	1654	$settings['tooltip_italic'] = isset( $settings['tooltip_italic'] ) && $settings['tooltip_italic'] == 'on' ? 'checked' : '';
	1655	+
	1656	+ // Tooltip font size
	1657	+ $settings['tooltip_font_size'] = isset( $settings['tooltip_font_size'] ) && intval($settings['tooltip_font_size']) > 0 ? esc_attr( $settings['tooltip_font_size'] ) : '12';
	1658	+
	1659	+ // Tooltip bold options
	1660	+ $tooltip_bold_options = array(
	1661	+ "default" => __("Default", "chart-builder"),
	1662	+ "true" => __("Enable", "chart-builder"),
	1663	+ "false" => __("Disable", "chart-builder")
	1664	+ );
	1665	+
	1666	+ // Tooltip bold text
	1667	+ $settings['tooltip_bold'] = isset( $settings['tooltip_bold'] ) && $settings['tooltip_bold'] != '' ? esc_attr( $settings['tooltip_bold'] ) : 'default';
	1668	+ $settings['tooltip_bold_options'] = $tooltip_bold_options;
	1669	+
1628	1670	// Legend font color
1629	1671	$settings['legend_color'] = isset( $settings['legend_color'] ) && $settings['legend_color'] != '' ? esc_attr( $settings['legend_color'] ) : '#000000';
1630	1672
1631	1673	// Legend font size
		@@ -1678,9 +1720,12 @@
1678	1720	$settings['show_description'] = isset( $settings['show_description'] ) && $settings['show_description'] != '' ? esc_attr( $settings['show_description'] ) : 'on';
1679	1721
1680	1722	// Show chart title
1681	1723	$settings['show_title'] = isset( $settings['show_title'] ) && $settings['show_title'] != '' ? esc_attr( $settings['show_title'] ) : 'on';
1682		-
	1724	+
	1725	+ // Enable interactivity
	1726	+ $settings['enable_interactivity'] = isset( $settings['enable_interactivity'] ) && $settings['enable_interactivity'] != '' ? esc_attr( $settings['enable_interactivity'] ) : 'on';
	1727	+
1683	1728	// Title color
1684	1729	$settings['title_color'] = isset( $settings['title_color'] ) && $settings['title_color'] != '' ? esc_attr( $settings['title_color'] ) : '#000000';
1685	1730
1686	1731	// Title color
		@@ -1800,8 +1845,19 @@
1800	1845
1801	1846	// start_angle
1802	1847	$settings['start_angle'] = isset( $settings['start_angle'] ) && $settings['start_angle'] != '' ? esc_attr( absint($settings['start_angle']) ) : 0;
1803	1848
	1849	+ // rotation_degree
	1850	+ $settings['rotation_degree'] = isset( $settings['rotation_degree'] ) && $settings['rotation_degree'] != '' ? esc_attr( absint($settings['rotation_degree']) ) : 0;
	1851	+
	1852	+ // Tooltip text
	1853	+ $settings['tooltip_text'] = isset( $settings['tooltip_text'] ) && $settings['tooltip_text'] != '' ? esc_attr( $settings['tooltip_text'] ) : 'value';
	1854	+
	1855	+ // Data grouping settings
	1856	+ $settings['data_grouping_limit'] = isset( $settings['data_grouping_limit'] ) && $settings['data_grouping_limit'] != '' ? esc_attr( $settings['data_grouping_limit'] ) : '0.5';
	1857	+ $settings['data_grouping_label'] = isset( $settings['data_grouping_label'] ) && $settings['data_grouping_label'] != '' ? esc_attr( $settings['data_grouping_label'] ) : 'Other';
	1858	+ $settings['data_grouping_color'] = isset( $settings['data_grouping_color'] ) && $settings['data_grouping_color'] != '' ? esc_attr( $settings['data_grouping_color'] ) : '#ccc';
	1859	+
1804	1860	$count_slices = (isset($chartData['source']) && !is_null($chartData['source']) && count($chartData['source']) > 0) ? count($chartData['source']) - 1 : 0;
1805	1861	// Slices settings
1806	1862	$settings['slice_colors_default'] = $chart_default_colors;
1807	1863	$settings['slice_color'] = isset( $settings['slice_color'] ) && $settings['slice_color'] != '' ? json_decode($settings['slice_color'], true) : $chart_default_colors;
		@@ -1816,8 +1872,11 @@
1816	1872	$settings['slice_border_width'] = isset( $settings['slice_border_width'] ) && $settings['slice_border_width'] != '' ? esc_attr( $settings['slice_border_width'] ) : '1';
1817	1873
1818	1874	// Tooltip text color
1819	1875	$settings['tooltip_text_color'] = isset( $settings['tooltip_text_color'] ) && $settings['tooltip_text_color'] != '' ? esc_attr( $settings['tooltip_text_color'] ) : '#fff';
	1876	+
	1877	+ // Tooltip font size
	1878	+ $settings['tooltip_font_size'] = isset( $settings['tooltip_font_size'] ) && intval($settings['tooltip_font_size']) > 0 ? esc_attr( $settings['tooltip_font_size'] ) : 12;
1820	1879
1821	1880	// Show color code
1822	1881	$settings['show_color_code'] = isset( $settings['show_color_code'] ) && $settings['show_color_code'] != '' ? esc_attr( $settings['show_color_code'] ) : 'off';
1823	1882	$settings['show_color_code'] = isset( $settings['show_color_code'] ) && $settings['show_color_code'] == 'on' ? 'checked' : '';