| @@ -18,8 +18,10 @@ | ||
| 18 | 18 | // | MA 02110-1301 USA | |
| 19 | 19 | // +----------------------------------------------------------------------+ |
| 20 | 20 | // | Author: Eugene Manuilov <eugene@manuilov.org> | |
| 21 | 21 | // +----------------------------------------------------------------------+ |
| 22 | + | |
| 23 | + | |
| 22 | 24 | /** |
| 23 | 25 | * Base class for all chart sidebar groups. |
| 24 | 26 | * |
| 25 | 27 | * @category Visualizer |
| @@ -83,24 +85,8 @@ | ||
| 83 | 85 | */ |
| 84 | 86 | protected $_alignments; |
| 85 | 87 | |
| 86 | 88 | /** |
| 87 | - * Whether this chart supports animation or not. | |
| 88 | - * | |
| 89 | - * @access protected | |
| 90 | - * @var bool | |
| 91 | - */ | |
| 92 | - protected $_supportsAnimation = true; | |
| 93 | - | |
| 94 | - /** | |
| 95 | - * Which library does this this chart implement? | |
| 96 | - * | |
| 97 | - * @access protected | |
| 98 | - * @var string | |
| 99 | - */ | |
| 100 | - protected $_library = null; | |
| 101 | - | |
| 102 | - /** | |
| 103 | 89 | * Constructor. |
| 104 | 90 | * |
| 105 | 91 | * @since 1.0.0 |
| 106 | 92 | * |
| @@ -111,30 +97,27 @@ | ||
| 111 | 97 | parent::__construct( $data ); |
| 112 | 98 | |
| 113 | 99 | $this->_legendPositions = array( |
| 114 | 100 | '' => '', |
| 115 | - 'left' => esc_html__( 'Left of the chart', 'visualizer' ), | |
| 116 | - 'right' => esc_html__( 'Right of the chart', 'visualizer' ), | |
| 117 | - 'top' => esc_html__( 'Above the chart', 'visualizer' ), | |
| 118 | - 'bottom' => esc_html__( 'Below the chart', 'visualizer' ), | |
| 119 | - 'in' => esc_html__( 'Inside the chart', 'visualizer' ), | |
| 120 | - 'none' => esc_html__( 'Omit the legend', 'visualizer' ), | |
| 101 | + 'right' => esc_html__( 'Right of the chart', Visualizer_Plugin::NAME ), | |
| 102 | + 'top' => esc_html__( 'Above the chart', Visualizer_Plugin::NAME ), | |
| 103 | + 'bottom' => esc_html__( 'Below the chart', Visualizer_Plugin::NAME ), | |
| 104 | + 'in' => esc_html__( 'Inside the chart', Visualizer_Plugin::NAME ), | |
| 105 | + 'none' => esc_html__( 'Omit the legend', Visualizer_Plugin::NAME ), | |
| 121 | 106 | ); |
| 122 | 107 | |
| 123 | 108 | $this->_alignments = array( |
| 124 | 109 | '' => '', |
| 125 | - 'start' => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ), | |
| 126 | - 'center' => esc_html__( 'Centered in the allocated area', 'visualizer' ), | |
| 127 | - 'end' => esc_html__( 'Aligned to the end of the allocated area', 'visualizer' ), | |
| 110 | + 'start' => esc_html__( 'Aligned to the start of the allocated area', Visualizer_Plugin::NAME ), | |
| 111 | + 'center' => esc_html__( 'Centered in the allocated area', Visualizer_Plugin::NAME ), | |
| 112 | + 'end' => esc_html__( 'Aligned to the end of the allocated area', Visualizer_Plugin::NAME ), | |
| 128 | 113 | ); |
| 129 | 114 | |
| 130 | 115 | $this->_yesno = array( |
| 131 | 116 | '' => '', |
| 132 | - '1' => esc_html__( 'Yes', 'visualizer' ), | |
| 133 | - '0' => esc_html__( 'No', 'visualizer' ), | |
| 117 | + '1' => esc_html__( 'Yes', Visualizer_Plugin::NAME ), | |
| 118 | + '0' => esc_html__( 'No', Visualizer_Plugin::NAME ), | |
| 134 | 119 | ); |
| 135 | - | |
| 136 | - $this->hooks(); | |
| 137 | 120 | } |
| 138 | 121 | |
| 139 | 122 | /** |
| 140 | 123 | * Renders chart title settings. |
| @@ -144,16 +127,16 @@ | ||
| 144 | 127 | * @access protected |
| 145 | 128 | */ |
| 146 | 129 | protected function _renderChartTitleSettings() { |
| 147 | 130 | self::_renderTextItem( |
| 148 | - esc_html__( 'Chart Title', 'visualizer' ), | |
| 131 | + esc_html__( 'Chart Title', Visualizer_Plugin::NAME ), | |
| 149 | 132 | 'title', |
| 150 | 133 | $this->title, |
| 151 | - esc_html__( 'Text to display above the chart.', 'visualizer' ) | |
| 134 | + esc_html__( 'Text to display above the chart.', Visualizer_Plugin::NAME ) | |
| 152 | 135 | ); |
| 153 | 136 | |
| 154 | 137 | self::_renderColorPickerItem( |
| 155 | - esc_html__( 'Chart Title Color', 'visualizer' ), | |
| 138 | + esc_html__( 'Chart Title Color', Visualizer_Plugin::NAME ), | |
| 156 | 139 | 'titleTextStyle[color]', |
| 157 | 140 | isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null, |
| 158 | 141 | '#000' |
| 159 | 142 | ); |
| @@ -159,112 +142,8 @@ | ||
| 159 | 142 | ); |
| 160 | 143 | } |
| 161 | 144 | |
| 162 | 145 | /** |
| 163 | - * Renders chart advanced settings group. | |
| 164 | - * | |
| 165 | - * @access protected | |
| 166 | - */ | |
| 167 | - protected function _renderAdvancedSettings() { | |
| 168 | - self::_renderGroupStart( esc_html__( 'Frontend Actions', 'visualizer' ) ); | |
| 169 | - self::_renderSectionStart(); | |
| 170 | - self::_renderSectionDescription( esc_html__( 'Configure frontend actions here.', 'visualizer' ) ); | |
| 171 | - self::_renderSectionEnd(); | |
| 172 | - | |
| 173 | - $this->_renderActionSettings(); | |
| 174 | - self::_renderGroupEnd(); | |
| 175 | - | |
| 176 | - self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) ); | |
| 177 | - self::_renderSectionStart(); | |
| 178 | - self::_renderSectionDescription( '<span class="viz-gvlink">' . sprintf( __( 'Configure the graph by providing configuration variables right from the %1$sGoogle Visualization API%2$s. You can refer to to some examples %3$shere%4$s.', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/gallery/?#configuration-options" target="_blank">', '</a>', '<a href="https://docs.themeisle.com/article/728-manual-configuration" target="_blank">', '</a>' ) . '</span>' ); | |
| 179 | - | |
| 180 | - $example = ' | |
| 181 | -{ | |
| 182 | - "vAxis": { | |
| 183 | - "ticks": [5, 10, 15, 20], | |
| 184 | - "titleTextStyle": { | |
| 185 | - "color": "red" | |
| 186 | - }, | |
| 187 | - "textPosition": "in" | |
| 188 | - } | |
| 189 | -}'; | |
| 190 | - | |
| 191 | - self::_renderTextAreaItem( | |
| 192 | - esc_html__( 'Configuration', 'visualizer' ), | |
| 193 | - 'manual', | |
| 194 | - $this->manual, | |
| 195 | - sprintf( | |
| 196 | - esc_html__( 'One per line in valid JSON (key:value) format e.g. %s', 'visualizer' ), | |
| 197 | - '<br><code>' . $example . '</code>' | |
| 198 | - ), | |
| 199 | - '', | |
| 200 | - array( 'rows' => 5 ) | |
| 201 | - ); | |
| 202 | - | |
| 203 | - self::_renderSectionEnd(); | |
| 204 | - self::_renderGroupEnd(); | |
| 205 | - | |
| 206 | - } | |
| 207 | - | |
| 208 | - /** | |
| 209 | - * Renders chart action buttons group. | |
| 210 | - * | |
| 211 | - * @access protected | |
| 212 | - */ | |
| 213 | - protected function _renderActionSettings() { | |
| 214 | - global $wp_version; | |
| 215 | - $disable_actions = version_compare( $wp_version, '4.7.0', '<' ); | |
| 216 | - self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false ); | |
| 217 | - self::_renderCheckboxItem( | |
| 218 | - esc_html__( 'Print', 'visualizer' ), | |
| 219 | - 'actions[]', | |
| 220 | - isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false, | |
| 221 | - 'print', | |
| 222 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the chart/data.', 'visualizer' ), | |
| 223 | - $disable_actions | |
| 224 | - ); | |
| 225 | - self::_renderCheckboxItem( | |
| 226 | - esc_html__( 'CSV', 'visualizer' ), | |
| 227 | - 'actions[]', | |
| 228 | - isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false, | |
| 229 | - 'csv;application/csv', | |
| 230 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' ), | |
| 231 | - $disable_actions | |
| 232 | - ); | |
| 233 | - | |
| 234 | - $disabled = ! self::is_excel_enabled(); | |
| 235 | - self::_renderCheckboxItem( | |
| 236 | - esc_html__( 'Excel', 'visualizer' ), | |
| 237 | - 'actions[]', | |
| 238 | - isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false, | |
| 239 | - 'xls;application/vnd.ms-excel', | |
| 240 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : ( $disabled ? '<span class="viz-section-error">' . esc_html__( 'Enable the ZIP and XML extensions to use this setting.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as an Excel spreadsheet.', 'visualizer' ) ), | |
| 241 | - $disable_actions || $disabled | |
| 242 | - ); | |
| 243 | - self::_renderCheckboxItem( | |
| 244 | - esc_html__( 'Copy', 'visualizer' ), | |
| 245 | - 'actions[]', | |
| 246 | - isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false, | |
| 247 | - 'copy', | |
| 248 | - $disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' ), | |
| 249 | - $disable_actions | |
| 250 | - ); | |
| 251 | - self::_renderSectionEnd(); | |
| 252 | - } | |
| 253 | - | |
| 254 | - /** | |
| 255 | - * Checks if the Excel module can be enabled. | |
| 256 | - */ | |
| 257 | - private static function is_excel_enabled() { | |
| 258 | - $vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php'; | |
| 259 | - if ( is_readable( $vendor_file ) ) { | |
| 260 | - include_once( $vendor_file ); | |
| 261 | - } | |
| 262 | - | |
| 263 | - return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ) && version_compare( PHP_VERSION, '5.6.0', '>' ); | |
| 264 | - } | |
| 265 | - | |
| 266 | - /** | |
| 267 | 146 | * Renders chart general settings group. |
| 268 | 147 | * |
| 269 | 148 | * @since 1.0.0 |
| 270 | 149 | * |
| @@ -270,70 +149,70 @@ | ||
| 270 | 149 | * |
| 271 | 150 | * @access protected |
| 272 | 151 | */ |
| 273 | 152 | protected function _renderGeneralSettings() { |
| 274 | - self::_renderGroupStart( esc_html__( 'General Settings', 'visualizer' ) ); | |
| 153 | + self::_renderGroupStart( esc_html__( 'General Settings', Visualizer_Plugin::NAME ) ); | |
| 275 | 154 | self::_renderSectionStart(); |
| 276 | - self::_renderSectionDescription( esc_html__( 'Configure title, font styles, tooltip, legend and else settings for the chart.', 'visualizer' ) ); | |
| 155 | + self::_renderSectionDescription( esc_html__( 'Configure title, font styles, tooltip, legend and else settings for the chart.', Visualizer_Plugin::NAME ) ); | |
| 277 | 156 | self::_renderSectionEnd(); |
| 278 | 157 | |
| 279 | - self::_renderSectionStart( esc_html__( 'Title', 'visualizer' ), false ); | |
| 158 | + self::_renderSectionStart( esc_html__( 'Title', Visualizer_Plugin::NAME ), false ); | |
| 280 | 159 | $this->_renderChartTitleSettings(); |
| 281 | 160 | self::_renderSectionEnd(); |
| 282 | 161 | |
| 283 | - self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); | |
| 284 | - echo '<div class="viz-section-item">'; | |
| 162 | + self::_renderSectionStart( esc_html__( 'Font Styles' ), false ); | |
| 163 | + echo '<div class="section-item">'; | |
| 285 | 164 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 286 | - echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; | |
| 165 | + echo '<b>', esc_html__( 'Family And Size', Visualizer_Plugin::NAME ), '</b>'; | |
| 287 | 166 | |
| 288 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 167 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 289 | 168 | echo '<tr>'; |
| 290 | - echo '<td class="viz-section-table-column">'; | |
| 169 | + echo '<td class="section-table-column">'; | |
| 291 | 170 | echo '<select name="fontName" class="control-select">'; |
| 292 | 171 | echo '<option></option>'; |
| 293 | - foreach ( self::$_fontFamilies as $font => $label ) { | |
| 294 | - echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; | |
| 295 | - echo $label; | |
| 296 | - echo '</option>'; | |
| 297 | - } | |
| 172 | + foreach ( self::$_fontFamilies as $font => $label ) { | |
| 173 | + echo '<option value="', $font, '"', selected( $font, $this->fontName, false ), '>'; | |
| 174 | + echo $label; | |
| 175 | + echo '</option>'; | |
| 176 | + } | |
| 298 | 177 | echo '</select>'; |
| 299 | 178 | echo '</td>'; |
| 300 | - echo '<td class="viz-section-table-column">'; | |
| 179 | + echo '<td class="section-table-column">'; | |
| 301 | 180 | echo '<select name="fontSize" class="control-select">'; |
| 302 | 181 | echo '<option></option>'; |
| 303 | - for ( $i = 7; $i <= 20; $i++ ) { | |
| 304 | - echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; | |
| 305 | - } | |
| 182 | + for ( $i = 7; $i <= 20; $i++ ) { | |
| 183 | + echo '<option value="', $i, '"', selected( $i, $this->fontSize, false ), '>', $i, '</option>'; | |
| 184 | + } | |
| 306 | 185 | echo '</select>'; |
| 307 | 186 | echo '</td>'; |
| 308 | 187 | echo '</tr>'; |
| 309 | 188 | echo '</table>'; |
| 310 | 189 | |
| 311 | - echo '<p class="viz-section-description">'; | |
| 312 | - esc_html_e( 'The default font family and size for all text in the chart.', 'visualizer' ); | |
| 190 | + echo '<p class="section-description">'; | |
| 191 | + esc_html_e( 'The default font family and size for all text in the chart.', Visualizer_Plugin::NAME ); | |
| 313 | 192 | echo '</p>'; |
| 314 | 193 | echo '</div>'; |
| 315 | 194 | self::_renderSectionEnd(); |
| 316 | 195 | |
| 317 | - self::_renderSectionStart( esc_html__( 'Legend', 'visualizer' ), false ); | |
| 196 | + self::_renderSectionStart( esc_html__( 'Legend', Visualizer_Plugin::NAME ), false ); | |
| 318 | 197 | self::_renderSelectItem( |
| 319 | - esc_html__( 'Position', 'visualizer' ), | |
| 198 | + esc_html__( 'Position', Visualizer_Plugin::NAME ), | |
| 320 | 199 | 'legend[position]', |
| 321 | 200 | $this->legend['position'], |
| 322 | 201 | $this->_legendPositions, |
| 323 | - esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' ) | |
| 202 | + esc_html__( 'Determines where to place the legend, compared to the chart area.', Visualizer_Plugin::NAME ) | |
| 324 | 203 | ); |
| 325 | 204 | |
| 326 | 205 | self::_renderSelectItem( |
| 327 | - esc_html__( 'Alignment', 'visualizer' ), | |
| 206 | + esc_html__( 'Alignment', Visualizer_Plugin::NAME ), | |
| 328 | 207 | 'legend[alignment]', |
| 329 | 208 | $this->legend['alignment'], |
| 330 | 209 | $this->_alignments, |
| 331 | - esc_html__( 'Determines the alignment of the legend.', 'visualizer' ) | |
| 210 | + esc_html__( 'Determines the alignment of the legend.', Visualizer_Plugin::NAME ) | |
| 332 | 211 | ); |
| 333 | 212 | |
| 334 | 213 | self::_renderColorPickerItem( |
| 335 | - esc_html__( 'Font Color', 'visualizer' ), | |
| 214 | + esc_html__( 'Font Color', Visualizer_Plugin::NAME ), | |
| 336 | 215 | 'legend[textStyle][color]', |
| 337 | 216 | isset( $this->legend['textStyle']['color'] ) ? $this->legend['textStyle']['color'] : null, |
| 338 | 217 | '#000' |
| 339 | 218 | ); |
| @@ -338,64 +217,15 @@ | ||
| 338 | 217 | '#000' |
| 339 | 218 | ); |
| 340 | 219 | self::_renderSectionEnd(); |
| 341 | 220 | |
| 342 | - self::_renderSectionStart( esc_html__( 'Tooltip', 'visualizer' ), false ); | |
| 221 | + self::_renderSectionStart( esc_html__( 'Tooltip', Visualizer_Plugin::NAME ), false ); | |
| 343 | 222 | $this->_renderTooltipSettigns(); |
| 344 | 223 | self::_renderSectionEnd(); |
| 345 | - | |
| 346 | - $this->_renderAnimationSettings(); | |
| 347 | - | |
| 348 | 224 | self::_renderGroupEnd(); |
| 349 | 225 | } |
| 350 | 226 | |
| 351 | 227 | /** |
| 352 | - * Renders animation settings section. | |
| 353 | - * | |
| 354 | - * @access protected | |
| 355 | - */ | |
| 356 | - protected function _renderAnimationSettings() { | |
| 357 | - if ( ! $this->_supportsAnimation ) { | |
| 358 | - return; | |
| 359 | - } | |
| 360 | - | |
| 361 | - self::_renderSectionStart( esc_html__( 'Animation', 'visualizer' ), false ); | |
| 362 | - | |
| 363 | - self::_renderCheckboxItem( | |
| 364 | - esc_html__( 'Animate on startup', 'visualizer' ), | |
| 365 | - 'animation[startup]', | |
| 366 | - isset( $this->animation['startup'] ) ? $this->animation['startup'] : 0, | |
| 367 | - true, | |
| 368 | - esc_html__( 'Determines if the chart will animate on the initial draw.', 'visualizer' ) | |
| 369 | - ); | |
| 370 | - | |
| 371 | - self::_renderTextItem( | |
| 372 | - esc_html__( 'Duration', 'visualizer' ), | |
| 373 | - 'animation[duration]', | |
| 374 | - isset( $this->animation['duration'] ) ? $this->animation['duration'] : 0, | |
| 375 | - esc_html__( 'The duration of the animation, in milliseconds', 'visualizer' ), | |
| 376 | - 0, | |
| 377 | - 'number' | |
| 378 | - ); | |
| 379 | - | |
| 380 | - self::_renderSelectItem( | |
| 381 | - esc_html__( 'Easing', 'visualizer' ), | |
| 382 | - 'animation[easing]', | |
| 383 | - isset( $this->animation['easing'] ) ? $this->animation['easing'] : null, | |
| 384 | - array( | |
| 385 | - 'linear' => esc_html__( 'Constant speed', 'visualizer' ), | |
| 386 | - 'in' => esc_html__( 'Start slow and speed up', 'visualizer' ), | |
| 387 | - 'out' => esc_html__( 'Start fast and slow down', 'visualizer' ), | |
| 388 | - 'inAndOut' => esc_html__( 'Start slow, speed up, then slow down', 'visualizer' ), | |
| 389 | - ), | |
| 390 | - esc_html__( 'The easing function applied to the animation.', 'visualizer' ) | |
| 391 | - ); | |
| 392 | - | |
| 393 | - self::_renderSectionEnd(); | |
| 394 | - | |
| 395 | - } | |
| 396 | - | |
| 397 | - /** | |
| 398 | 228 | * Renders tooltip settings section. |
| 399 | 229 | * |
| 400 | 230 | * @since 1.4.0 |
| 401 | 231 | * |
| @@ -402,26 +232,26 @@ | ||
| 402 | 232 | * @access protected |
| 403 | 233 | */ |
| 404 | 234 | protected function _renderTooltipSettigns() { |
| 405 | 235 | self::_renderSelectItem( |
| 406 | - esc_html__( 'Trigger', 'visualizer' ), | |
| 236 | + esc_html__( 'Trigger', Visualizer_Plugin::NAME ), | |
| 407 | 237 | 'tooltip[trigger]', |
| 408 | 238 | isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null, |
| 409 | 239 | array( |
| 410 | 240 | '' => '', |
| 411 | - 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', 'visualizer' ), | |
| 412 | - 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', 'visualizer' ), | |
| 413 | - 'none' => esc_html__( 'The tooltip will not be displayed', 'visualizer' ), | |
| 241 | + 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', Visualizer_Plugin::NAME ), | |
| 242 | + 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', Visualizer_Plugin::NAME ), | |
| 243 | + 'none' => esc_html__( 'The tooltip will not be displayed', Visualizer_Plugin::NAME ), | |
| 414 | 244 | ), |
| 415 | - esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', 'visualizer' ) | |
| 245 | + esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', Visualizer_Plugin::NAME ) | |
| 416 | 246 | ); |
| 417 | 247 | |
| 418 | 248 | self::_renderSelectItem( |
| 419 | - esc_html__( 'Show Color Code', 'visualizer' ), | |
| 249 | + esc_html__( 'Show Color Code', Visualizer_Plugin::NAME ), | |
| 420 | 250 | 'tooltip[showColorCode]', |
| 421 | 251 | isset( $this->tooltip['showColorCode'] ) ? $this->tooltip['showColorCode'] : null, |
| 422 | 252 | $this->_yesno, |
| 423 | - esc_html__( 'If set to yes, will show colored squares next to the slice information in the tooltip.', 'visualizer' ) | |
| 253 | + esc_html__( 'If set to yes, will show colored squares next to the slice information in the tooltip.', Visualizer_Plugin::NAME ) | |
| 424 | 254 | ); |
| 425 | 255 | } |
| 426 | 256 | |
| 427 | 257 | /** |
| @@ -431,107 +261,107 @@ | ||
| 431 | 261 | * |
| 432 | 262 | * @access protected |
| 433 | 263 | */ |
| 434 | 264 | protected function _renderViewSettings() { |
| 435 | - self::_renderGroupStart( esc_html__( 'Layout & Chart Area', 'visualizer' ) ); | |
| 436 | - self::_renderSectionStart( esc_html__( 'Layout', 'visualizer' ), false ); | |
| 437 | - self::_renderSectionDescription( esc_html__( 'Configure the total size of the chart. Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', 'visualizer' ) ); | |
| 265 | + self::_renderGroupStart( esc_html__( 'Layout & Chart Area', Visualizer_Plugin::NAME ) ); | |
| 266 | + self::_renderSectionStart( esc_html__( 'Layout', Visualizer_Plugin::NAME ), false ); | |
| 267 | + self::_renderSectionDescription( esc_html__( 'Configure the total size of the chart. Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', Visualizer_Plugin::NAME ) ); | |
| 438 | 268 | |
| 439 | - echo '<div class="viz-section-item">'; | |
| 269 | + echo '<div class="section-item">'; | |
| 440 | 270 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 441 | - echo '<b>', esc_html__( 'Width And Height Of Chart', 'visualizer' ), '</b>'; | |
| 271 | + echo '<b>', esc_html__( 'Width And Height Of Chart', Visualizer_Plugin::NAME ), '</b>'; | |
| 442 | 272 | |
| 443 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 273 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 444 | 274 | echo '<tr>'; |
| 445 | - echo '<td class="viz-section-table-column">'; | |
| 275 | + echo '<td class="section-table-column">'; | |
| 446 | 276 | echo '<input type="text" name="width" class="control-text" value="', esc_attr( $this->width ), '" placeholder="100%">'; |
| 447 | 277 | echo '</td>'; |
| 448 | - echo '<td class="viz-section-table-column">'; | |
| 278 | + echo '<td class="section-table-column">'; | |
| 449 | 279 | echo '<input type="text" name="height" class="control-text" value="', esc_attr( $this->height ), '" placeholder="400">'; |
| 450 | 280 | echo '</td>'; |
| 451 | 281 | echo '</tr>'; |
| 452 | 282 | echo '</table>'; |
| 453 | 283 | |
| 454 | - echo '<p class="viz-section-description">'; | |
| 455 | - esc_html_e( 'Determines the total width and height of the chart.', 'visualizer' ); | |
| 284 | + echo '<p class="section-description">'; | |
| 285 | + esc_html_e( 'Determines the total width and height of the chart.', Visualizer_Plugin::NAME ); | |
| 456 | 286 | echo '</p>'; |
| 457 | 287 | echo '</div>'; |
| 458 | 288 | |
| 459 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 289 | + echo '<div class="section-delimiter"></div>'; | |
| 460 | 290 | |
| 461 | - self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); | |
| 291 | + self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', Visualizer_Plugin::NAME ) ); | |
| 462 | 292 | |
| 463 | 293 | self::_renderTextItem( |
| 464 | - esc_html__( 'Stroke Width', 'visualizer' ), | |
| 294 | + esc_html__( 'Stroke Width', Visualizer_Plugin::NAME ), | |
| 465 | 295 | 'backgroundColor[strokeWidth]', |
| 466 | 296 | isset( $this->backgroundColor['strokeWidth'] ) ? $this->backgroundColor['strokeWidth'] : null, |
| 467 | - esc_html__( 'The chart border width in pixels.', 'visualizer' ), | |
| 297 | + esc_html__( 'The chart border width in pixels.', Visualizer_Plugin::NAME ), | |
| 468 | 298 | '0' |
| 469 | 299 | ); |
| 470 | 300 | |
| 471 | 301 | self::_renderColorPickerItem( |
| 472 | - esc_html__( 'Stroke Color', 'visualizer' ), | |
| 302 | + esc_html__( 'Stroke Color', Visualizer_Plugin::NAME ), | |
| 473 | 303 | 'backgroundColor[stroke]', |
| 474 | - ! empty( $this->backgroundColor['stroke'] ) ? $this->backgroundColor['stroke'] : null, | |
| 304 | + !empty( $this->backgroundColor['stroke'] ) ? $this->backgroundColor['stroke'] : null, | |
| 475 | 305 | '#666' |
| 476 | 306 | ); |
| 477 | 307 | |
| 478 | - $background_color = ! empty( $this->backgroundColor['fill'] ) ? $this->backgroundColor['fill'] : null; | |
| 308 | + $background_color = !empty( $this->backgroundColor['fill'] ) ? $this->backgroundColor['fill'] : null; | |
| 479 | 309 | self::_renderColorPickerItem( |
| 480 | - esc_html__( 'Background Color', 'visualizer' ), | |
| 310 | + esc_html__( 'Background Color', Visualizer_Plugin::NAME ), | |
| 481 | 311 | 'backgroundColor[fill]', |
| 482 | 312 | $background_color, |
| 483 | 313 | '#fff' |
| 484 | 314 | ); |
| 485 | 315 | |
| 486 | - echo '<div class="viz-section-item">'; | |
| 316 | + echo '<div class="section-item">'; | |
| 487 | 317 | echo '<label>'; |
| 488 | 318 | echo '<input type="checkbox" class="control-checkbox" name="backgroundColor[fill]" value="transparent"', checked( $background_color, 'transparent', false ), '> '; |
| 489 | - esc_html_e( 'Transparent background', 'visualizer' ); | |
| 319 | + esc_html_e( 'Transparent background' ); | |
| 490 | 320 | echo '</label>'; |
| 491 | 321 | echo '</div>'; |
| 492 | 322 | self::_renderSectionEnd(); |
| 493 | 323 | |
| 494 | - self::_renderSectionStart( esc_html__( 'Chart Area', 'visualizer' ), false ); | |
| 495 | - self::_renderSectionDescription( esc_html__( 'Configure the placement and size of the chart area (where the chart itself is drawn, excluding axis and legends). Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', 'visualizer' ) ); | |
| 324 | + self::_renderSectionStart( esc_html__( 'Chart Area', Visualizer_Plugin::NAME ), false ); | |
| 325 | + self::_renderSectionDescription( esc_html__( 'Configure the placement and size of the chart area (where the chart itself is drawn, excluding axis and legends). Two formats are supported: a number, or a number followed by %. A simple number is a value in pixels; a number followed by % is a percentage.', Visualizer_Plugin::NAME ) ); | |
| 496 | 326 | |
| 497 | - echo '<div class="viz-section-item">'; | |
| 327 | + echo '<div class="section-item">'; | |
| 498 | 328 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 499 | - echo '<b>', esc_html__( 'Left And Top Margins', 'visualizer' ), '</b>'; | |
| 329 | + echo '<b>', esc_html__( 'Left And Top Margins', Visualizer_Plugin::NAME ), '</b>'; | |
| 500 | 330 | |
| 501 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 331 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 502 | 332 | echo '<tr>'; |
| 503 | - echo '<td class="viz-section-table-column">'; | |
| 504 | - echo '<input type="text" name="chartArea[left]" class="control-text" value="', $this->chartArea['left'] || $this->chartArea['left'] === '0' ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">'; | |
| 333 | + echo '<td class="section-table-column">'; | |
| 334 | + echo '<input type="text" name="chartArea[left]" class="control-text" value="', !empty( $this->chartArea['left'] ) ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">'; | |
| 505 | 335 | echo '</td>'; |
| 506 | - echo '<td class="viz-section-table-column">'; | |
| 507 | - echo '<input type="text" name="chartArea[top]" class="control-text" value="', $this->chartArea['top'] || $this->chartArea['top'] === '0' ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">'; | |
| 336 | + echo '<td class="section-table-column">'; | |
| 337 | + echo '<input type="text" name="chartArea[top]" class="control-text" value="', !empty( $this->chartArea['top'] ) ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">'; | |
| 508 | 338 | echo '</td>'; |
| 509 | 339 | echo '</tr>'; |
| 510 | 340 | echo '</table>'; |
| 511 | 341 | |
| 512 | - echo '<p class="viz-section-description">'; | |
| 513 | - esc_html_e( 'Determines how far to draw the chart from the left and top borders.', 'visualizer' ); | |
| 342 | + echo '<p class="section-description">'; | |
| 343 | + esc_html_e( 'Determines how far to draw the chart from the left and top borders.', Visualizer_Plugin::NAME ); | |
| 514 | 344 | echo '</p>'; |
| 515 | 345 | echo '</div>'; |
| 516 | 346 | |
| 517 | - echo '<div class="viz-section-item">'; | |
| 347 | + echo '<div class="section-item">'; | |
| 518 | 348 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 519 | - echo '<b>', esc_html__( 'Width And Height Of Chart Area', 'visualizer' ), '</b>'; | |
| 349 | + echo '<b>', esc_html__( 'Width And Height Of Chart Area', Visualizer_Plugin::NAME ), '</b>'; | |
| 520 | 350 | |
| 521 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 351 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 522 | 352 | echo '<tr>'; |
| 523 | - echo '<td class="viz-section-table-column">'; | |
| 524 | - echo '<input type="text" name="chartArea[width]" class="control-text" value="', ! empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; | |
| 353 | + echo '<td class="section-table-column">'; | |
| 354 | + echo '<input type="text" name="chartArea[width]" class="control-text" value="', !empty( $this->chartArea['width'] ) ? esc_attr( $this->chartArea['width'] ) : '', '" placeholder="60%">'; | |
| 525 | 355 | echo '</td>'; |
| 526 | - echo '<td class="viz-section-table-column">'; | |
| 527 | - echo '<input type="text" name="chartArea[height]" class="control-text" value="', ! empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; | |
| 356 | + echo '<td class="section-table-column">'; | |
| 357 | + echo '<input type="text" name="chartArea[height]" class="control-text" value="', !empty( $this->chartArea['height'] ) ? esc_attr( $this->chartArea['height'] ) : '', '" placeholder="60%">'; | |
| 528 | 358 | echo '</td>'; |
| 529 | 359 | echo '</tr>'; |
| 530 | 360 | echo '</table>'; |
| 531 | 361 | |
| 532 | - echo '<p class="viz-section-description">'; | |
| 533 | - esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); | |
| 362 | + echo '<p class="section-description">'; | |
| 363 | + esc_html_e( 'Determines the width and hight of the chart area.', Visualizer_Plugin::NAME ); | |
| 534 | 364 | echo '</p>'; |
| 535 | 365 | echo '</div>'; |
| 536 | 366 | self::_renderSectionEnd(); |
| 537 | 367 | self::_renderGroupEnd(); |
| @@ -542,37 +372,27 @@ | ||
| 542 | 372 | * |
| 543 | 373 | * @since 1.0.0 |
| 544 | 374 | * |
| 545 | 375 | * @static |
| 546 | - * @access public | |
| 376 | + * @access protected | |
| 547 | 377 | * @param string $title The title of the select item. |
| 548 | 378 | * @param string $name The name of the select item. |
| 549 | 379 | * @param string $value The actual value of the select item. |
| 550 | - * @param array $options The array of select options. | |
| 380 | + * @param array $options The array of select options. | |
| 551 | 381 | * @param string $desc The description of the select item. |
| 552 | - * @param bool $multiple Is this a multiple select box. | |
| 553 | - * @param array $classes Any additional classes. | |
| 554 | - * @param array $attributes Custom attributes. | |
| 555 | 382 | */ |
| 556 | - public static function _renderSelectItem( $title, $name, $value, array $options, $desc, $multiple = false, $classes = array(), $attributes = array() ) { | |
| 557 | - $atts = ''; | |
| 558 | - if ( $attributes ) { | |
| 559 | - foreach ( $attributes as $k => $v ) { | |
| 560 | - $atts .= ' data-visualizer-' . $k . '=' . esc_attr( $v ); | |
| 561 | - } | |
| 562 | - } | |
| 563 | - echo '<div class="viz-section-item">'; | |
| 383 | + protected static function _renderSelectItem( $title, $name, $value, array $options, $desc ) { | |
| 384 | + echo '<div class="section-item">'; | |
| 564 | 385 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 565 | 386 | echo '<b>', $title, '</b>'; |
| 566 | - echo '<select class="control-select ', implode( ' ', $classes ) , '" name="', $name, '" ', ( $multiple ? 'multiple' : '' ), ' ' , $atts, '>'; | |
| 567 | - foreach ( $options as $key => $label ) { | |
| 568 | - $extra = $multiple && is_array( $value ) ? ( in_array( $key, $value ) ? 'selected' : '' ) : selected( $key, $value, false ); | |
| 569 | - echo '<option value="', $key, '"', $extra, '>'; | |
| 570 | - echo $label; | |
| 571 | - echo '</option>'; | |
| 572 | - } | |
| 387 | + echo '<select class="control-select" name="', $name, '">'; | |
| 388 | + foreach ( $options as $key => $label ) { | |
| 389 | + echo '<option value="', $key, '"', selected( $key, $value, false ), '>'; | |
| 390 | + echo $label; | |
| 391 | + echo '</option>'; | |
| 392 | + } | |
| 573 | 393 | echo '</select>'; |
| 574 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 394 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 575 | 395 | echo '</div>'; |
| 576 | 396 | } |
| 577 | 397 | |
| 578 | 398 | /** |
| @@ -587,12 +407,12 @@ | ||
| 587 | 407 | * @param string $value The actual value of the select item. |
| 588 | 408 | * @param string $default The default value of the color picker. |
| 589 | 409 | */ |
| 590 | 410 | protected static function _renderColorPickerItem( $title, $name, $value, $default ) { |
| 591 | - echo '<div class="viz-section-item">'; | |
| 411 | + echo '<div class="section-item">'; | |
| 592 | 412 | echo '<b>', $title, '</b>'; |
| 593 | 413 | echo '<div>'; |
| 594 | - echo '<input type="text" class="color-picker-hex" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', 'visualizer' ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">'; | |
| 414 | + echo '<input type="text" class="color-picker-hex" name="', $name, '" maxlength="7" placeholder="', esc_attr__( 'Hex Value', Visualizer_Plugin::NAME ), '" value="', is_null( $value ) ? $default : esc_attr( $value ), '" data-default-color="', $default, '">'; | |
| 595 | 415 | echo '</div>'; |
| 596 | 416 | echo '</div>'; |
| 597 | 417 | } |
| 598 | 418 | |
| @@ -607,23 +427,15 @@ | ||
| 607 | 427 | * @param string $name The name of the select item. |
| 608 | 428 | * @param string $value The actual value of the select item. |
| 609 | 429 | * @param string $desc The description of the select item. |
| 610 | 430 | * @param string $placeholder The placeholder for the input. |
| 611 | - * @param string $type The type for the input (out of number, email, tel etc., default is text). | |
| 612 | - * @param array $custom_attributes The custom attributes. | |
| 613 | 431 | */ |
| 614 | - protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '', $type = 'text', $custom_attributes = array() ) { | |
| 615 | - $attributes = ''; | |
| 616 | - if ( $custom_attributes ) { | |
| 617 | - foreach ( $custom_attributes as $k => $v ) { | |
| 618 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 619 | - } | |
| 620 | - } | |
| 621 | - echo '<div class="viz-section-item">'; | |
| 432 | + protected static function _renderTextItem( $title, $name, $value, $desc, $placeholder = '' ) { | |
| 433 | + echo '<div class="section-item">'; | |
| 622 | 434 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 623 | 435 | echo '<b>', $title, '</b>'; |
| 624 | - echo '<input type="', $type, '" class="control-text" ', $attributes, ' name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 625 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 436 | + echo '<input type="text" class="control-text" name="', $name, '" value="', esc_attr( $value ), '" placeholder="', $placeholder, '">'; | |
| 437 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 626 | 438 | echo '</div>'; |
| 627 | 439 | } |
| 628 | 440 | |
| 629 | 441 | /** |
| @@ -631,18 +443,15 @@ | ||
| 631 | 443 | * |
| 632 | 444 | * @since 1.0.0 |
| 633 | 445 | * |
| 634 | 446 | * @static |
| 635 | - * @access public | |
| 447 | + * @access protected | |
| 636 | 448 | * @param string $title The title of this group. |
| 637 | - * @param string $html Any additional HTML. | |
| 638 | - * @param string $class Any additional classes. | |
| 639 | 449 | */ |
| 640 | - public static function _renderGroupStart( $title, $html = '', $class = '' ) { | |
| 641 | - echo '<li class="viz-group ' . $class . '">'; | |
| 642 | - echo '<h3 class="viz-group-title">', $title, '</h3>'; | |
| 643 | - echo $html; | |
| 644 | - echo '<ul class="viz-group-content">'; | |
| 450 | + protected static function _renderGroupStart( $title ) { | |
| 451 | + echo '<li class="group">'; | |
| 452 | + echo '<h3 class="group-title">', $title, '</h3>'; | |
| 453 | + echo '<ul class="group-content">'; | |
| 645 | 454 | } |
| 646 | 455 | |
| 647 | 456 | /** |
| 648 | 457 | * Renders the ending of a group. |
| @@ -649,11 +458,11 @@ | ||
| 649 | 458 | * |
| 650 | 459 | * @since 1.0.0 |
| 651 | 460 | * |
| 652 | 461 | * @static |
| 653 | - * @access public | |
| 462 | + * @access protected | |
| 654 | 463 | */ |
| 655 | - public static function _renderGroupEnd() { | |
| 464 | + protected static function _renderGroupEnd() { | |
| 656 | 465 | echo '</ul>'; |
| 657 | 466 | echo '</li>'; |
| 658 | 467 | } |
| 659 | 468 | |
| @@ -662,21 +471,18 @@ | ||
| 662 | 471 | * |
| 663 | 472 | * @since 1.0.0 |
| 664 | 473 | * |
| 665 | 474 | * @static |
| 666 | - * @access public | |
| 667 | - * @param string $title The title of this section. If the title is empty, no title will be displayed. | |
| 475 | + * @access protected | |
| 476 | + * @param string $title The title of this section. If the title is empty, no title will be displayed. | |
| 668 | 477 | * @param boolean $open Determines whether the section items block has to be expanded or collapsed. |
| 669 | 478 | */ |
| 670 | - public static function _renderSectionStart( $title = false, $open = true ) { | |
| 671 | - | |
| 672 | - if ( ! empty( $title ) ) { | |
| 673 | - echo '<li class="viz-subsection">'; | |
| 674 | - echo '<span class="viz-section-title">', $title, '</span>'; | |
| 675 | - } else { | |
| 676 | - echo '<li class=" ">'; | |
| 677 | - } | |
| 678 | - echo '<div class="viz-section-items section-items', $open ? ' open' : '', '">'; | |
| 479 | + protected static function _renderSectionStart( $title = false, $open = true ) { | |
| 480 | + echo '<li>'; | |
| 481 | + if ( !empty( $title ) ) { | |
| 482 | + echo '<span class="section-title">', $title, '</span>'; | |
| 483 | + } | |
| 484 | + echo '<div class="section-items', $open ? ' open' : '', '">'; | |
| 679 | 485 | } |
| 680 | 486 | |
| 681 | 487 | /** |
| 682 | 488 | * Renders the ending of a section. |
| @@ -682,15 +488,13 @@ | ||
| 682 | 488 | * Renders the ending of a section. |
| 683 | 489 | * |
| 684 | 490 | * @since 1.0.0 |
| 685 | 491 | * |
| 686 | - * @public | |
| 492 | + * @static | |
| 687 | 493 | * @access protected |
| 688 | - * @param string $html Any addition HTML to add. | |
| 689 | 494 | */ |
| 690 | - public static function _renderSectionEnd( $html = '' ) { | |
| 495 | + protected static function _renderSectionEnd() { | |
| 691 | 496 | echo '</div>'; |
| 692 | - echo $html; | |
| 693 | 497 | echo '</li>'; |
| 694 | 498 | } |
| 695 | 499 | |
| 696 | 500 | /** |
| @@ -698,14 +502,14 @@ | ||
| 698 | 502 | * |
| 699 | 503 | * @since 1.0.0 |
| 700 | 504 | * |
| 701 | 505 | * @static |
| 702 | - * @access public | |
| 506 | + * @access protected | |
| 703 | 507 | * @param string $description The description text. |
| 704 | 508 | */ |
| 705 | - public static function _renderSectionDescription( $description ) { | |
| 706 | - echo '<div class="viz-section-item">'; | |
| 707 | - echo '<div class="viz-section-description">', $description, '</div>'; | |
| 509 | + protected static function _renderSectionDescription( $description ) { | |
| 510 | + echo '<div class="section-item">'; | |
| 511 | + echo '<div class="section-description">', $description, '</div>'; | |
| 708 | 512 | echo '</div>'; |
| 709 | 513 | } |
| 710 | 514 | |
| 711 | 515 | /** |
| @@ -716,15 +520,15 @@ | ||
| 716 | 520 | * @access protected |
| 717 | 521 | * @param int $index The index of the series. |
| 718 | 522 | */ |
| 719 | 523 | protected function _renderFormatField( $index = 0 ) { |
| 720 | - switch ( $this->__series[ $index + 1 ]['type'] ) { | |
| 524 | + switch ( $this->__series[$index + 1]['type'] ) { | |
| 721 | 525 | case 'number': |
| 722 | 526 | self::_renderTextItem( |
| 723 | - esc_html__( 'Number Format', 'visualizer' ), | |
| 527 | + esc_html__( 'Number Format', Visualizer_Plugin::NAME ), | |
| 724 | 528 | 'series[' . $index . '][format]', |
| 725 | - isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '', | |
| 726 | - sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU pattern set%2$s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use % percentage format then your values will be multiplied by 100.', 'visualizer' ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ), | |
| 529 | + isset( $this->series[$index]['format'] ) ? $this->series[$index]['format'] : '', | |
| 530 | + sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %sICU pattern set%s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use #%% percentage format then your values will be multiplied by 100.', Visualizer_Plugin::NAME ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ), | |
| 727 | 531 | '#,###.##' |
| 728 | 532 | ); |
| 729 | 533 | break; |
| 730 | 534 | case 'date': |
| @@ -730,12 +534,12 @@ | ||
| 730 | 534 | case 'date': |
| 731 | 535 | case 'datetime': |
| 732 | 536 | case 'timeofday': |
| 733 | 537 | self::_renderTextItem( |
| 734 | - esc_html__( 'Date Format', 'visualizer' ), | |
| 538 | + esc_html__( 'Date Format', Visualizer_Plugin::NAME ), | |
| 735 | 539 | 'series[' . $index . '][format]', |
| 736 | - isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '', | |
| 737 | - sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU date and time format%2$s.', 'visualizer' ), '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ), | |
| 540 | + isset( $this->series[$index]['format'] ) ? $this->series[$index]['format'] : '', | |
| 541 | + sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %sICU date and time format%s.', Visualizer_Plugin::NAME ), '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ), | |
| 738 | 542 | 'eeee, dd LLLL yyyy' |
| 739 | 543 | ); |
| 740 | 544 | break; |
| 741 | 545 | } |
| @@ -740,42 +544,14 @@ | ||
| 740 | 544 | break; |
| 741 | 545 | } |
| 742 | 546 | } |
| 743 | 547 | |
| 744 | - /** | |
| 745 | - * Render a checkbox item | |
| 746 | - */ | |
| 747 | - protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc, $disabled = false ) { | |
| 748 | - echo '<div class="viz-section-item">'; | |
| 548 | + protected static function _renderCheckboxItem( $title, $name, $value, $default, $desc ) { | |
| 549 | + echo '<div class="section-item">'; | |
| 749 | 550 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 750 | 551 | echo '<b>', $title, '</b>'; |
| 751 | - echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>'; | |
| 752 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 552 | + echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ($value == $default ? "checked" : ""), '>'; | |
| 553 | + echo '<p class="section-description">', $desc, '</p>'; | |
| 753 | 554 | echo '</div>'; |
| 754 | 555 | } |
| 755 | 556 | |
| 756 | - /** | |
| 757 | - * Render a textarea item. | |
| 758 | - */ | |
| 759 | - protected static function _renderTextAreaItem( $title, $name, $value, $desc, $placeholder = '', $custom_attributes = array() ) { | |
| 760 | - $attributes = ''; | |
| 761 | - if ( $custom_attributes ) { | |
| 762 | - foreach ( $custom_attributes as $k => $v ) { | |
| 763 | - $attributes .= ' ' . $k . '="' . esc_attr( $v ) . '"'; | |
| 764 | - } | |
| 765 | - } | |
| 766 | - echo '<div class="viz-section-item">'; | |
| 767 | - echo '<a class="more-info" href="javascript:;">[?]</a>'; | |
| 768 | - echo '<b>', $title, '</b>'; | |
| 769 | - echo '<textarea class="control-text" ', $attributes, ' name="', $name, '" placeholder="', $placeholder, '">', $value, '</textarea>'; | |
| 770 | - echo '<p class="viz-section-description">', $desc, '</p>'; | |
| 771 | - echo '</div>'; | |
| 772 | - } | |
| 773 | - | |
| 774 | - /** | |
| 775 | - * Returns the library this chart implements. | |
| 776 | - */ | |
| 777 | - public function getLibrary() { | |
| 778 | - return $this->_library; | |
| 779 | - } | |
| 780 | - | |
| 781 | -} | |
| 557 | +} | |
