| @@ -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 sidebar settigns of graph based charts. |
| 24 | 26 | * |
| 25 | 27 | * @category Visualizer |
| @@ -28,9 +30,9 @@ | ||
| 28 | 30 | * |
| 29 | 31 | * @since 1.0.0 |
| 30 | 32 | * @abstract |
| 31 | 33 | */ |
| 32 | -abstract class Visualizer_Render_Sidebar_Graph extends Visualizer_Render_Sidebar_Google { | |
| 34 | +abstract class Visualizer_Render_Sidebar_Graph extends Visualizer_Render_Sidebar { | |
| 33 | 35 | |
| 34 | 36 | /** |
| 35 | 37 | * Determines whether we need to render vertical gridlines options or not. |
| 36 | 38 | * |
| @@ -76,11 +78,11 @@ | ||
| 76 | 78 | $this->_horizontalGridLines = true; |
| 77 | 79 | |
| 78 | 80 | $this->_positions = array( |
| 79 | 81 | '' => '', |
| 80 | - 'in' => esc_html__( 'Inside the chart', 'visualizer' ), | |
| 81 | - 'out' => esc_html__( 'Outside the chart', 'visualizer' ), | |
| 82 | - 'none' => esc_html__( 'None', 'visualizer' ), | |
| 82 | + 'in' => esc_html__( 'Inside the chart', Visualizer_Plugin::NAME ), | |
| 83 | + 'out' => esc_html__( 'Outside the chart', Visualizer_Plugin::NAME ), | |
| 84 | + 'none' => esc_html__( 'None', Visualizer_Plugin::NAME ), | |
| 83 | 85 | ); |
| 84 | 86 | } |
| 85 | 87 | |
| 86 | 88 | /** |
| @@ -90,324 +92,145 @@ | ||
| 90 | 92 | * |
| 91 | 93 | * @access protected |
| 92 | 94 | */ |
| 93 | 95 | protected function _renderChartTitleSettings() { |
| 94 | - self::_renderTextItem( | |
| 95 | - esc_html__( 'Chart Title', 'visualizer' ), | |
| 96 | - 'title', | |
| 97 | - $this->title, | |
| 98 | - esc_html__( 'Text to display above the chart.', 'visualizer' ) | |
| 99 | - ); | |
| 96 | + parent::_renderChartTitleSettings(); | |
| 100 | 97 | |
| 101 | 98 | self::_renderSelectItem( |
| 102 | - esc_html__( 'Chart Title Position', 'visualizer' ), | |
| 99 | + esc_html__( 'Chart Title Position', Visualizer_Plugin::NAME ), | |
| 103 | 100 | 'titlePosition', |
| 104 | 101 | $this->titlePosition, |
| 105 | 102 | $this->_positions, |
| 106 | - esc_html__( 'Where to place the chart title, compared to the chart area.', 'visualizer' ) | |
| 103 | + esc_html__( 'Where to place the chart title, compared to the chart area.', Visualizer_Plugin::NAME ) | |
| 107 | 104 | ); |
| 108 | - | |
| 109 | - self::_renderColorPickerItem( | |
| 110 | - esc_html__( 'Chart Title Color', 'visualizer' ), | |
| 111 | - 'titleTextStyle[color]', | |
| 112 | - isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null, | |
| 113 | - '#000' | |
| 114 | - ); | |
| 115 | - | |
| 116 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 117 | - | |
| 118 | - self::_renderSelectItem( | |
| 119 | - esc_html__( 'Axes Titles Position', 'visualizer' ), | |
| 120 | - 'axisTitlesPosition', | |
| 121 | - $this->axisTitlesPosition, | |
| 122 | - $this->_positions, | |
| 123 | - esc_html__( 'Determines where to place the axis titles, compared to the chart area.', 'visualizer' ) | |
| 124 | - ); | |
| 125 | - | |
| 126 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 127 | - | |
| 128 | - self::_renderTextAreaItem( | |
| 129 | - esc_html__( 'Chart Description', 'visualizer' ), | |
| 130 | - 'description', | |
| 131 | - $this->description, | |
| 132 | - sprintf( | |
| 133 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag. | |
| 134 | - esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), | |
| 135 | - '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', | |
| 136 | - '</a>' | |
| 137 | - ) | |
| 138 | - ); | |
| 139 | 105 | } |
| 140 | 106 | |
| 141 | 107 | /** |
| 142 | - * Renders general settings block for horizontal axis settings. | |
| 108 | + * Renders chart axes settings. | |
| 143 | 109 | * |
| 144 | - * @since 1.4.0 | |
| 110 | + * @since 1.0.0 | |
| 145 | 111 | * |
| 146 | 112 | * @access protected |
| 147 | 113 | */ |
| 148 | - protected function _renderHorizontalAxisGeneralSettings() { | |
| 149 | - self::_renderTextItem( | |
| 150 | - esc_html__( 'Axis Title', 'visualizer' ), | |
| 151 | - 'hAxis[title]', | |
| 152 | - isset( $this->hAxis['title'] ) ? $this->hAxis['title'] : '', | |
| 153 | - esc_html__( 'The title of the horizontal axis.', 'visualizer' ) | |
| 114 | + protected function _renderAxesSettings() { | |
| 115 | + $directions = array( | |
| 116 | + '' => '', | |
| 117 | + '1' => esc_html__( 'Identical Direction', Visualizer_Plugin::NAME ), | |
| 118 | + '-1' => esc_html__( 'Reverse Direction', Visualizer_Plugin::NAME ), | |
| 154 | 119 | ); |
| 155 | 120 | |
| 156 | - self::_renderSelectItem( | |
| 157 | - esc_html__( 'Slanted Text', 'visualizer' ), | |
| 158 | - 'hAxis[slantedText]', | |
| 159 | - isset( $this->hAxis['slantedText'] ) ? $this->hAxis['slantedText'] : false, | |
| 160 | - array( | |
| 161 | - false => 'False', | |
| 162 | - true => 'True', | |
| 163 | - ), | |
| 164 | - '', | |
| 165 | - false | |
| 166 | - ); | |
| 167 | - | |
| 168 | - self::_renderTextItem( | |
| 169 | - esc_html__( 'Slanted Text Angle', 'visualizer' ), | |
| 170 | - 'hAxis[slantedTextAngle]', | |
| 171 | - isset( $this->hAxis['slantedTextAngle'] ) ? $this->hAxis['slantedTextAngle'] : 45, | |
| 172 | - '', | |
| 173 | - 45, | |
| 174 | - 'number', | |
| 175 | - array( | |
| 176 | - 'min' => 1, | |
| 177 | - 'step' => 15, | |
| 178 | - ) | |
| 179 | - ); | |
| 180 | - | |
| 181 | - self::_renderSelectItem( | |
| 182 | - esc_html__( 'Text Position', 'visualizer' ), | |
| 183 | - 'hAxis[textPosition]', | |
| 184 | - isset( $this->hAxis['textPosition'] ) ? $this->hAxis['textPosition'] : '', | |
| 185 | - $this->_positions, | |
| 186 | - esc_html__( 'Position of the horizontal axis text, relative to the chart area.', 'visualizer' ) | |
| 187 | - ); | |
| 188 | - | |
| 189 | - self::_renderSelectItem( | |
| 190 | - esc_html__( 'Direction', 'visualizer' ), | |
| 191 | - 'hAxis[direction]', | |
| 192 | - isset( $this->hAxis['direction'] ) ? $this->hAxis['direction'] : '', | |
| 193 | - array( | |
| 194 | - '' => '', | |
| 195 | - '1' => esc_html__( 'Default Direction', 'visualizer' ), | |
| 196 | - '-1' => esc_html__( 'Reverse Direction', 'visualizer' ), | |
| 197 | - ), | |
| 198 | - esc_html__( 'The direction in which the values along the horizontal axis grow.', 'visualizer' ) | |
| 199 | - ); | |
| 200 | - | |
| 201 | - self::_renderColorPickerItem( | |
| 202 | - esc_html__( 'Base Line Color', 'visualizer' ), | |
| 203 | - 'vAxis[baselineColor]', | |
| 204 | - isset( $this->vAxis['baselineColor'] ) ? $this->vAxis['baselineColor'] : null, | |
| 205 | - '#000' | |
| 206 | - ); | |
| 207 | - } | |
| 208 | - | |
| 209 | - /** | |
| 210 | - * Renders horizontal axis settings. | |
| 211 | - * | |
| 212 | - * @since 1.2.0 | |
| 213 | - * | |
| 214 | - * @access protected | |
| 215 | - */ | |
| 216 | - protected function _renderHorizontalAxisSettings() { | |
| 217 | - self::_renderGroupStart( esc_html__( 'Horizontal Axis Settings', 'visualizer' ) ); | |
| 218 | - self::_renderSectionStart( esc_html__( 'General Settings', 'visualizer' ), false ); | |
| 219 | - $this->_renderHorizontalAxisGeneralSettings(); | |
| 121 | + self::_renderGroupStart( esc_html__( 'Horizontal & Vertical Axes', Visualizer_Plugin::NAME ) ); | |
| 122 | + self::_renderSectionStart(); | |
| 123 | + self::_renderSelectItem( | |
| 124 | + esc_html__( 'Axes Titles Position', Visualizer_Plugin::NAME ), | |
| 125 | + 'axisTitlesPosition', | |
| 126 | + $this->axisTitlesPosition, | |
| 127 | + $this->_positions, | |
| 128 | + esc_html__( 'Determines where to place the axis titles, compared to the chart area.', Visualizer_Plugin::NAME ) | |
| 129 | + ); | |
| 220 | 130 | self::_renderSectionEnd(); |
| 221 | - if ( $this->_horizontalGridLines ) { | |
| 222 | - self::_renderSectionStart( esc_html__( 'Grid Lines', 'visualizer' ), false ); | |
| 223 | - self::_renderTextItem( | |
| 224 | - esc_html__( 'Count', 'visualizer' ), | |
| 225 | - 'hAxis[gridlines][count]', | |
| 226 | - isset( $this->hAxis['gridlines']['count'] ) ? $this->hAxis['gridlines']['count'] : '', | |
| 227 | - esc_html__( 'The approximate number of horizontal gridlines inside the chart area. You can specify a value of -1 to automatically compute the number of gridlines, 0 or 1 to draw no gridlines, or 2 or more to only draw gridline. Any number greater than 2 will be used to compute the minSpacing between gridlines.', 'visualizer' ), | |
| 228 | - 5, | |
| 229 | - 'number', | |
| 230 | - array( 'min' => -1, 'max' => 1000, 'step' => 1 ) | |
| 231 | - ); | |
| 232 | 131 | |
| 233 | - self::_renderColorPickerItem( | |
| 234 | - esc_html__( 'Color', 'visualizer' ), | |
| 235 | - 'hAxis[gridlines][color]', | |
| 236 | - isset( $this->hAxis['gridlines']['color'] ) ? $this->hAxis['gridlines']['color'] : null, | |
| 237 | - '#ccc' | |
| 238 | - ); | |
| 239 | - self::_renderSectionEnd(); | |
| 132 | + self::_renderSectionStart( esc_html__( 'Horizontal Axis', Visualizer_Plugin::NAME ), false ); | |
| 133 | + self::_renderTextItem( | |
| 134 | + esc_html__( 'Axis Title', Visualizer_Plugin::NAME ), | |
| 135 | + 'hAxis[title]', | |
| 136 | + isset( $this->hAxis['title'] ) ? $this->hAxis['title'] : '', | |
| 137 | + esc_html__( 'The title of the horizontal axis.', Visualizer_Plugin::NAME ) | |
| 138 | + ); | |
| 240 | 139 | |
| 241 | - self::_renderSectionStart( esc_html__( 'Minor Grid Lines', 'visualizer' ), false ); | |
| 242 | - self::_renderTextItem( | |
| 243 | - esc_html__( 'Count', 'visualizer' ), | |
| 244 | - 'hAxis[minorGridlines][count]', | |
| 245 | - isset( $this->hAxis['minorGridlines']['count'] ) ? $this->hAxis['minorGridlines']['count'] : '', | |
| 246 | - esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ), | |
| 247 | - 0, | |
| 248 | - 'number', | |
| 249 | - array( 'min' => 0, 'step' => 1 ) | |
| 250 | - ); | |
| 140 | + self::_renderSelectItem( | |
| 141 | + esc_html__( 'Text Position', Visualizer_Plugin::NAME ), | |
| 142 | + 'vAxis[textPosition]', | |
| 143 | + isset( $this->vAxis['textPosition'] ) ? $this->vAxis['textPosition'] : '', | |
| 144 | + $this->_positions, | |
| 145 | + esc_html__( 'Position of the horizontal axis text, relative to the chart area.', Visualizer_Plugin::NAME ) | |
| 146 | + ); | |
| 251 | 147 | |
| 252 | - self::_renderColorPickerItem( | |
| 253 | - esc_html__( 'Color', 'visualizer' ), | |
| 254 | - 'hAxis[minorGridlines][color]', | |
| 255 | - isset( $this->hAxis['minorGridlines']['color'] ) ? $this->hAxis['minorGridlines']['color'] : null, | |
| 256 | - null | |
| 257 | - ); | |
| 258 | - self::_renderSectionEnd(); | |
| 259 | - } | |
| 148 | + self::_renderSelectItem( | |
| 149 | + esc_html__( 'Direction', Visualizer_Plugin::NAME ), | |
| 150 | + 'hAxis[direction]', | |
| 151 | + isset( $this->hAxis['direction'] ) ? $this->hAxis['direction'] : '', | |
| 152 | + $directions, | |
| 153 | + esc_html__( 'The direction in which the values along the horizontal axis grow.', Visualizer_Plugin::NAME ) | |
| 154 | + ); | |
| 260 | 155 | |
| 261 | - if ( $this->_horizontalGridLines ) { | |
| 262 | - self::_renderSectionStart( esc_html__( 'View Window', 'visualizer' ), false ); | |
| 263 | - self::_renderTextItem( | |
| 264 | - esc_html__( 'Maximum Value', 'visualizer' ), | |
| 265 | - 'hAxis[viewWindow][max]', | |
| 266 | - isset( $this->hAxis['viewWindow']['max'] ) ? $this->hAxis['viewWindow']['max'] : '', | |
| 267 | - 'The maximum vertical data value to render.' | |
| 268 | - ); | |
| 156 | + if ( $this->_horizontalGridLines ) { | |
| 157 | + self::_renderTextItem( | |
| 158 | + esc_html__( 'Grid Lines Count', Visualizer_Plugin::NAME ), | |
| 159 | + 'vAxis[gridlines][count]', | |
| 160 | + isset( $this->vAxis['gridlines']['count'] ) ? $this->vAxis['gridlines']['count'] : '', | |
| 161 | + esc_html__( 'The number of horizontal gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.', Visualizer_Plugin::NAME ), | |
| 162 | + 5 | |
| 163 | + ); | |
| 269 | 164 | |
| 270 | - self::_renderTextItem( | |
| 271 | - esc_html__( 'Minimum Value', 'visualizer' ), | |
| 272 | - 'hAxis[viewWindow][min]', | |
| 273 | - isset( $this->hAxis['viewWindow']['min'] ) ? $this->hAxis['viewWindow']['min'] : '', | |
| 274 | - 'The minimum vertical data value to render.' | |
| 275 | - ); | |
| 276 | - self::_renderSectionEnd(); | |
| 277 | - } | |
| 278 | - self::_renderGroupEnd(); | |
| 279 | - } | |
| 165 | + self::_renderColorPickerItem( | |
| 166 | + esc_html__( 'Grid Lines Color', Visualizer_Plugin::NAME ), | |
| 167 | + 'vAxis[gridlines][color]', | |
| 168 | + isset( $this->vAxis['gridlines']['color'] ) ? $this->vAxis['gridlines']['color'] : null, | |
| 169 | + '#ccc' | |
| 170 | + ); | |
| 171 | + } | |
| 280 | 172 | |
| 281 | - /** | |
| 282 | - * Renders general settings block for vertical axis settings. | |
| 283 | - * | |
| 284 | - * @since 1.4.0 | |
| 285 | - * | |
| 286 | - * @access protected | |
| 287 | - */ | |
| 288 | - protected function _renderVerticalAxisGeneralSettings() { | |
| 289 | - self::_renderTextItem( | |
| 290 | - esc_html__( 'Axis Title', 'visualizer' ), | |
| 291 | - 'vAxis[title]', | |
| 292 | - isset( $this->vAxis['title'] ) ? $this->vAxis['title'] : '', | |
| 293 | - esc_html__( 'The title of the vertical axis.', 'visualizer' ) | |
| 294 | - ); | |
| 295 | - | |
| 296 | - self::_renderSelectItem( | |
| 297 | - esc_html__( 'Text Position', 'visualizer' ), | |
| 298 | - 'vAxis[textPosition]', | |
| 299 | - isset( $this->vAxis['textPosition'] ) ? $this->vAxis['textPosition'] : '', | |
| 300 | - $this->_positions, | |
| 301 | - esc_html__( 'Position of the vertical axis text, relative to the chart area.', 'visualizer' ) | |
| 302 | - ); | |
| 303 | - | |
| 304 | - self::_renderSelectItem( | |
| 305 | - esc_html__( 'Direction', 'visualizer' ), | |
| 306 | - 'vAxis[direction]', | |
| 307 | - isset( $this->vAxis['direction'] ) ? $this->vAxis['direction'] : '', | |
| 308 | - array( | |
| 309 | - '' => '', | |
| 310 | - '1' => esc_html__( 'Default Direction', 'visualizer' ), | |
| 311 | - '-1' => esc_html__( 'Reverse Direction', 'visualizer' ), | |
| 312 | - ), | |
| 313 | - esc_html__( 'The direction in which the values along the vertical axis grow.', 'visualizer' ) | |
| 314 | - ); | |
| 315 | - | |
| 316 | - self::_renderColorPickerItem( | |
| 317 | - esc_html__( 'Base Line Color', 'visualizer' ), | |
| 318 | - 'hAxis[baselineColor]', | |
| 319 | - isset( $this->hAxis['baselineColor'] ) ? $this->hAxis['baselineColor'] : null, | |
| 320 | - '#000' | |
| 321 | - ); | |
| 322 | - } | |
| 323 | - | |
| 324 | - /** | |
| 325 | - * Renders vertical axis settings. | |
| 326 | - * | |
| 327 | - * @since 1.2.0 | |
| 328 | - * | |
| 329 | - * @access protected | |
| 330 | - */ | |
| 331 | - protected function _renderVerticalAxisSettings() { | |
| 332 | - self::_renderGroupStart( esc_html__( 'Vertical Axis Settings', 'visualizer' ) ); | |
| 333 | - self::_renderSectionStart( esc_html__( 'General Settings', 'visualizer' ), false ); | |
| 334 | - $this->_renderVerticalAxisGeneralSettings(); | |
| 173 | + self::_renderColorPickerItem( | |
| 174 | + esc_html__( 'Base Line Color', Visualizer_Plugin::NAME ), | |
| 175 | + 'vAxis[baselineColor]', | |
| 176 | + isset( $this->vAxis['baselineColor'] ) ? $this->vAxis['baselineColor'] : null, | |
| 177 | + '#000' | |
| 178 | + ); | |
| 335 | 179 | self::_renderSectionEnd(); |
| 336 | 180 | |
| 337 | - if ( $this->_verticalGridLines ) { | |
| 338 | - self::_renderSectionStart( esc_html__( 'Grid Lines', 'visualizer' ), false ); | |
| 339 | - self::_renderTextItem( | |
| 340 | - esc_html__( 'Count', 'visualizer' ), | |
| 341 | - 'vAxis[gridlines][count]', | |
| 342 | - isset( $this->vAxis['gridlines']['count'] ) ? $this->vAxis['gridlines']['count'] : '', | |
| 343 | - esc_html__( 'The approximate number of vertical gridlines inside the chart area. You can specify a value of -1 to automatically compute the number of gridlines, 0 or 1 to draw no gridlines, or 2 or more to only draw gridline. Any number greater than 2 will be used to compute the minSpacing between gridlines.', 'visualizer' ), | |
| 344 | - 5, | |
| 345 | - 'number', | |
| 346 | - array( 'min' => -1, 'max' => 1000, 'step' => 1 ) | |
| 347 | - ); | |
| 181 | + self::_renderSectionStart( esc_html__( 'Vertical Axis', Visualizer_Plugin::NAME ), false ); | |
| 182 | + self::_renderTextItem( | |
| 183 | + esc_html__( 'Axis Title', Visualizer_Plugin::NAME ), | |
| 184 | + 'vAxis[title]', | |
| 185 | + isset( $this->vAxis['title'] ) ? $this->vAxis['title'] : '', | |
| 186 | + esc_html__( 'The title of the vertical axis.', Visualizer_Plugin::NAME ) | |
| 187 | + ); | |
| 348 | 188 | |
| 349 | - self::_renderColorPickerItem( | |
| 350 | - esc_html__( 'Color', 'visualizer' ), | |
| 351 | - 'vAxis[gridlines][color]', | |
| 352 | - isset( $this->vAxis['gridlines']['color'] ) ? $this->vAxis['gridlines']['color'] : null, | |
| 353 | - '#ccc' | |
| 354 | - ); | |
| 355 | - self::_renderSectionEnd(); | |
| 189 | + self::_renderSelectItem( | |
| 190 | + esc_html__( 'Text Position', Visualizer_Plugin::NAME ), | |
| 191 | + 'hAxis[textPosition]', | |
| 192 | + isset( $this->hAxis['textPosition'] ) ? $this->hAxis['textPosition'] : '', | |
| 193 | + $this->_positions, | |
| 194 | + esc_html__( 'Position of the vertical axis text, relative to the chart area.', Visualizer_Plugin::NAME ) | |
| 195 | + ); | |
| 356 | 196 | |
| 357 | - self::_renderSectionStart( esc_html__( 'Minor Grid Lines', 'visualizer' ), false ); | |
| 358 | - self::_renderTextItem( | |
| 359 | - esc_html__( 'Count', 'visualizer' ), | |
| 360 | - 'vAxis[minorGridlines][count]', | |
| 361 | - isset( $this->vAxis['minorGridlines']['count'] ) ? $this->vAxis['minorGridlines']['count'] : '', | |
| 362 | - esc_html__( 'Specify 0 to disable the minor gridlines.', 'visualizer' ), | |
| 363 | - 0, | |
| 364 | - 'number', | |
| 365 | - array( 'min' => 0, 'step' => 1 ) | |
| 366 | - ); | |
| 197 | + self::_renderSelectItem( | |
| 198 | + esc_html__( 'Direction', Visualizer_Plugin::NAME ), | |
| 199 | + 'vAxis[direction]', | |
| 200 | + isset( $this->vAxis['direction'] ) ? $this->vAxis['direction'] : '', | |
| 201 | + $directions, | |
| 202 | + esc_html__( 'The direction in which the values along the vertical axis grow.', Visualizer_Plugin::NAME ) | |
| 203 | + ); | |
| 367 | 204 | |
| 368 | - self::_renderColorPickerItem( | |
| 369 | - esc_html__( 'Color', 'visualizer' ), | |
| 370 | - 'vAxis[minorGridlines][color]', | |
| 371 | - isset( $this->vAxis['minorGridlines']['color'] ) ? $this->vAxis['minorGridlines']['color'] : null, | |
| 372 | - null | |
| 373 | - ); | |
| 374 | - self::_renderSectionEnd(); | |
| 375 | - } | |
| 205 | + if ( $this->_verticalGridLines ) { | |
| 206 | + self::_renderTextItem( | |
| 207 | + esc_html__( 'Grid Lines Count', Visualizer_Plugin::NAME ), | |
| 208 | + 'hAxis[gridlines][count]', | |
| 209 | + isset( $this->hAxis['gridlines']['count'] ) ? $this->hAxis['gridlines']['count'] : '', | |
| 210 | + esc_html__( 'The number of vertical gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.', Visualizer_Plugin::NAME ), | |
| 211 | + 5 | |
| 212 | + ); | |
| 376 | 213 | |
| 377 | - if ( $this->_verticalGridLines ) { | |
| 378 | - self::_renderSectionStart( esc_html__( 'View Window', 'visualizer' ), false ); | |
| 379 | - self::_renderTextItem( | |
| 380 | - esc_html__( 'Maximum Value', 'visualizer' ), | |
| 381 | - 'vAxis[viewWindow][max]', | |
| 382 | - isset( $this->vAxis['viewWindow']['max'] ) ? $this->vAxis['viewWindow']['max'] : '', | |
| 383 | - 'The maximum vertical data value to render.' | |
| 384 | - ); | |
| 214 | + self::_renderColorPickerItem( | |
| 215 | + esc_html__( 'Grid Lines Color', Visualizer_Plugin::NAME ), | |
| 216 | + 'hAxis[gridlines][color]', | |
| 217 | + isset( $this->hAxis['gridlines']['color'] ) ? $this->hAxis['gridlines']['color'] : null, | |
| 218 | + '#ccc' | |
| 219 | + ); | |
| 220 | + } | |
| 385 | 221 | |
| 386 | - self::_renderTextItem( | |
| 387 | - esc_html__( 'Minimum Value', 'visualizer' ), | |
| 388 | - 'vAxis[viewWindow][min]', | |
| 389 | - isset( $this->vAxis['viewWindow']['min'] ) ? $this->vAxis['viewWindow']['min'] : '', | |
| 390 | - 'The minimum vertical data value to render.' | |
| 391 | - ); | |
| 222 | + self::_renderColorPickerItem( | |
| 223 | + esc_html__( 'Base Line Color', Visualizer_Plugin::NAME ), | |
| 224 | + 'hAxis[baselineColor]', | |
| 225 | + isset( $this->hAxis['baselineColor'] ) ? $this->hAxis['baselineColor'] : null, | |
| 226 | + '#000' | |
| 227 | + ); | |
| 392 | 228 | self::_renderSectionEnd(); |
| 393 | - } | |
| 394 | 229 | self::_renderGroupEnd(); |
| 395 | 230 | } |
| 396 | 231 | |
| 397 | 232 | /** |
| 398 | - * Renders chart axes settings. | |
| 399 | - * | |
| 400 | - * @since 1.0.0 | |
| 401 | - * | |
| 402 | - * @access protected | |
| 403 | - */ | |
| 404 | - protected function _renderAxesSettings() { | |
| 405 | - $this->_renderHorizontalAxisSettings(); | |
| 406 | - $this->_renderVerticalAxisSettings(); | |
| 407 | - } | |
| 408 | - | |
| 409 | - /** | |
| 410 | 233 | * Renders series settings group. |
| 411 | 234 | * |
| 412 | 235 | * @since 1.0.0 |
| 413 | 236 | * |
| @@ -413,20 +236,16 @@ | ||
| 413 | 236 | * |
| 414 | 237 | * @access protected |
| 415 | 238 | */ |
| 416 | 239 | protected function _renderSeriesSettings() { |
| 417 | - self::_renderGroupStart( esc_html__( 'Series Settings', 'visualizer' ) ); | |
| 418 | - self::_renderSectionStart(); | |
| 419 | - self::_renderSectionDescription( esc_html__( 'If you have just updated/modified the chart data, you may need to save it before the new data reflects in the settings.', 'visualizer' ), 'viz-info-msg' ); | |
| 420 | - self::_renderSectionEnd(); | |
| 421 | - | |
| 422 | - for ( $i = 1, $cnt = count( $this->__series ); $i < $cnt; $i++ ) { | |
| 423 | - if ( ! empty( $this->__series[ $i ]['label'] ) ) { | |
| 424 | - self::_renderSectionStart( esc_html( $this->__series[ $i ]['label'] ), false ); | |
| 425 | - $this->_renderSeries( $i - 1 ); | |
| 426 | - self::_renderSectionEnd(); | |
| 240 | + self::_renderGroupStart( esc_html__( 'Series Settings', Visualizer_Plugin::NAME ) ); | |
| 241 | + for ( $i = 1, $cnt = count( $this->__series ); $i < $cnt; $i++ ) { | |
| 242 | + if ( !empty( $this->__series[$i]['label'] ) ) { | |
| 243 | + self::_renderSectionStart( esc_html( $this->__series[$i]['label'] ), false ); | |
| 244 | + $this->_renderSeries( $i - 1 ); | |
| 245 | + self::_renderSectionEnd(); | |
| 246 | + } | |
| 427 | 247 | } |
| 428 | - } | |
| 429 | 248 | self::_renderGroupEnd(); |
| 430 | 249 | } |
| 431 | 250 | |
| 432 | 251 | /** |
| @@ -438,89 +257,24 @@ | ||
| 438 | 257 | * @param int $index The series index. |
| 439 | 258 | */ |
| 440 | 259 | protected function _renderSeries( $index ) { |
| 441 | 260 | self::_renderSelectItem( |
| 442 | - esc_html__( 'Visible In Legend', 'visualizer' ), | |
| 261 | + esc_html__( 'Visible In Legend', Visualizer_Plugin::NAME ), | |
| 443 | 262 | 'series[' . $index . '][visibleInLegend]', |
| 444 | - isset( $this->series[ $index ]['visibleInLegend'] ) ? $this->series[ $index ]['visibleInLegend'] : '', | |
| 263 | + isset( $this->series[$index]['visibleInLegend'] ) ? $this->series[$index]['visibleInLegend'] : '', | |
| 445 | 264 | array( |
| 446 | 265 | '' => '', |
| 447 | - '0' => esc_html__( 'No', 'visualizer' ), | |
| 448 | - '1' => esc_html__( 'Yes', 'visualizer' ), | |
| 266 | + '0' => esc_html__( 'No', Visualizer_Plugin::NAME ), | |
| 267 | + '1' => esc_html__( 'Yes', Visualizer_Plugin::NAME ), | |
| 449 | 268 | ), |
| 450 | - esc_html__( 'Determines whether the series has to be presented in the legend or not.', 'visualizer' ) | |
| 269 | + esc_html__( 'Determines whether the series has to be presented in the legend or not.', Visualizer_Plugin::NAME ) | |
| 451 | 270 | ); |
| 452 | 271 | |
| 453 | - $this->_renderFormatField( $index ); | |
| 454 | - | |
| 455 | 272 | self::_renderColorPickerItem( |
| 456 | - esc_html__( 'Color', 'visualizer' ), | |
| 273 | + esc_html__( 'Color', Visualizer_Plugin::NAME ), | |
| 457 | 274 | 'series[' . $index . '][color]', |
| 458 | - isset( $this->series[ $index ]['color'] ) ? $this->series[ $index ]['color'] : null, | |
| 275 | + isset( $this->series[$index]['color'] ) ? $this->series[$index]['color'] : null, | |
| 459 | 276 | null |
| 460 | 277 | ); |
| 461 | - | |
| 462 | - $this->_renderRoleField( $index ); | |
| 463 | 278 | } |
| 464 | 279 | |
| 465 | - /** | |
| 466 | - * Renders format field for horizontal axis. | |
| 467 | - * | |
| 468 | - * @since 1.4.3 | |
| 469 | - * | |
| 470 | - * @access protected | |
| 471 | - */ | |
| 472 | - protected function _renderHorizontalAxisFormatField() { | |
| 473 | - self::_renderTextItem( | |
| 474 | - esc_html__( 'Number Format', 'visualizer' ), | |
| 475 | - 'hAxis[format]', | |
| 476 | - isset( $this->hAxis['format'] ) ? $this->hAxis['format'] : '', | |
| 477 | - sprintf( | |
| 478 | - '%s<br><br>%s<br><br>%s', | |
| 479 | - esc_html__( 'Enter custom format pattern to apply to horizontal axis labels.', 'visualizer' ), | |
| 480 | - sprintf( | |
| 481 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag. | |
| 482 | - esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Note: Using the #%% percentage format will multiply your values by 100.', 'visualizer' ), | |
| 483 | - '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', | |
| 484 | - '</a>' | |
| 485 | - ), | |
| 486 | - sprintf( | |
| 487 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag. | |
| 488 | - esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ), | |
| 489 | - '<a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax" target="_blank">', | |
| 490 | - '</a>' | |
| 491 | - ) | |
| 492 | - ) | |
| 493 | - ); | |
| 494 | - } | |
| 495 | - | |
| 496 | - /** | |
| 497 | - * Renders format field for vertical axis settings. | |
| 498 | - * | |
| 499 | - * @since 1.4.3 | |
| 500 | - * | |
| 501 | - * @access protected | |
| 502 | - */ | |
| 503 | - protected function _renderVerticalAxisFormatField() { | |
| 504 | - self::_renderTextItem( | |
| 505 | - esc_html__( 'Number Format', 'visualizer' ), | |
| 506 | - 'vAxis[format]', | |
| 507 | - isset( $this->vAxis['format'] ) ? $this->vAxis['format'] : '', | |
| 508 | - sprintf( | |
| 509 | - '%s<br><br>%s<br><br>%s', | |
| 510 | - esc_html__( 'Enter custom format pattern to apply to vertical axis labels.', 'visualizer' ), | |
| 511 | - sprintf( | |
| 512 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag. | |
| 513 | - esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Note: Using the #%% percentage format will multiply your values by 100.', 'visualizer' ), | |
| 514 | - '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', | |
| 515 | - '</a>' | |
| 516 | - ), | |
| 517 | - sprintf( | |
| 518 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag. | |
| 519 | - esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ), | |
| 520 | - '<a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax" target="_blank">', | |
| 521 | - '</a>' | |
| 522 | - ) | |
| 523 | - ) | |
| 524 | - ); | |
| 525 | - } | |
| 526 | -} | |
| 280 | +} | |
