| @@ -93,10 +93,10 @@ | ||
| 93 | 93 | parent::_renderHorizontalAxisGeneralSettings(); |
| 94 | 94 | |
| 95 | 95 | self::_renderColorPickerItem( |
| 96 | 96 | esc_html__( 'Axis Text Color', 'visualizer' ), |
| 97 | - 'hAxis[textStyle]', | |
| 98 | - isset( $this->hAxis['textStyle'] ) ? $this->hAxis['textStyle'] : null, | |
| 97 | + 'vAxis[textStyle]', | |
| 98 | + isset( $this->vAxis['textStyle'] ) ? $this->vAxis['textStyle'] : null, | |
| 99 | 99 | '#000' |
| 100 | 100 | ); |
| 101 | 101 | |
| 102 | 102 | $this->_renderHorizontalAxisFormatField(); |
| @@ -113,10 +113,10 @@ | ||
| 113 | 113 | parent::_renderVerticalAxisGeneralSettings(); |
| 114 | 114 | |
| 115 | 115 | self::_renderColorPickerItem( |
| 116 | 116 | esc_html__( 'Axis Text Color', 'visualizer' ), |
| 117 | - 'vAxis[textStyle]', | |
| 118 | - isset( $this->vAxis['textStyle'] ) ? $this->vAxis['textStyle'] : null, | |
| 117 | + 'hAxis[textStyle]', | |
| 118 | + isset( $this->hAxis['textStyle'] ) ? $this->hAxis['textStyle'] : null, | |
| 119 | 119 | '#000' |
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | $this->_renderVerticalAxisFormatField(); |
| @@ -129,24 +129,24 @@ | ||
| 129 | 129 | * |
| 130 | 130 | * @access protected |
| 131 | 131 | */ |
| 132 | 132 | protected function _renderLineSettingsItems() { |
| 133 | - echo '<div class="viz-section-item">'; | |
| 133 | + echo '<div class="section-item">'; | |
| 134 | 134 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 135 | 135 | echo '<b>', esc_html__( 'Line Width And Point Size', 'visualizer' ), '</b>'; |
| 136 | 136 | |
| 137 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 137 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 138 | 138 | echo '<tr>'; |
| 139 | - echo '<td class="viz-section-table-column">'; | |
| 139 | + echo '<td class="section-table-column">'; | |
| 140 | 140 | echo '<input type="text" name="lineWidth" class="control-text" value="', esc_attr( $this->lineWidth ), '" placeholder="2">'; |
| 141 | 141 | echo '</td>'; |
| 142 | - echo '<td class="viz-section-table-column">'; | |
| 142 | + echo '<td class="section-table-column">'; | |
| 143 | 143 | echo '<input type="text" name="pointSize" class="control-text" value="', esc_attr( $this->pointSize ), '" placeholder="0">'; |
| 144 | 144 | echo '</td>'; |
| 145 | 145 | echo '</tr>'; |
| 146 | 146 | echo '</table>'; |
| 147 | 147 | |
| 148 | - echo '<p class="viz-section-description">'; | |
| 148 | + echo '<p class="section-description">'; | |
| 149 | 149 | esc_html_e( 'Data line width and diameter of displayed points in pixels. Use zero to hide all lines or points.', 'visualizer' ); |
| 150 | 150 | echo '</p>'; |
| 151 | 151 | echo '</div>'; |
| 152 | 152 | |
| @@ -159,9 +159,9 @@ | ||
| 159 | 159 | esc_html__( 'Determines whether the series has to be presented in the legend or not.', 'visualizer' ) |
| 160 | 160 | ); |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 163 | + echo '<div class="section-delimiter"></div>'; | |
| 164 | 164 | |
| 165 | 165 | if ( $this->_includeFocusTarget ) { |
| 166 | 166 | self::_renderSelectItem( |
| 167 | 167 | esc_html__( 'Focus Target', 'visualizer' ), |
| @@ -184,13 +184,13 @@ | ||
| 184 | 184 | '' => '', |
| 185 | 185 | 'single' => esc_html__( 'Single data point', 'visualizer' ), |
| 186 | 186 | 'multiple' => esc_html__( 'Multiple data points', 'visualizer' ), |
| 187 | 187 | ), |
| 188 | - esc_html__( 'Determines how many data points a user can select on a chart.', 'visualizer' ) | |
| 188 | + esc_html__( 'Determines how many data points an user can select on a chart.', 'visualizer' ) | |
| 189 | 189 | ); |
| 190 | 190 | |
| 191 | 191 | self::_renderSelectItem( |
| 192 | - esc_html__( 'Group Tooltips By', 'visualizer' ), | |
| 192 | + esc_html__( 'Aggregation Target', 'visualizer' ), | |
| 193 | 193 | 'aggregationTarget', |
| 194 | 194 | $this->aggregationTarget, |
| 195 | 195 | array( |
| 196 | 196 | '' => '', |
| @@ -198,12 +198,12 @@ | ||
| 198 | 198 | 'series' => esc_html__( 'Group selected data by series', 'visualizer' ), |
| 199 | 199 | 'auto' => esc_html__( 'Group selected data by x-value if all selections have the same x-value, and by series otherwise', 'visualizer' ), |
| 200 | 200 | 'none' => esc_html__( 'Show only one tooltip per selection', 'visualizer' ), |
| 201 | 201 | ), |
| 202 | - esc_html__( 'Determines how multiple data selections are rolled up into tooltips. To make it work, you need to set multiple selection mode and tooltip trigger to display it when a user selects an element.', 'visualizer' ) | |
| 202 | + esc_html__( 'Determines how multiple data selections are rolled up into tooltips. To make it working you need to set multiple selection mode and tooltip trigger to display it when an user selects an element.', 'visualizer' ) | |
| 203 | 203 | ); |
| 204 | 204 | |
| 205 | - echo '<div class="viz-section-delimiter"></div>'; | |
| 205 | + echo '<div class="section-delimiter"></div>'; | |
| 206 | 206 | |
| 207 | 207 | self::_renderTextItem( |
| 208 | 208 | esc_html__( 'Point Opacity', 'visualizer' ), |
| 209 | 209 | 'dataOpacity', |
| @@ -248,19 +248,19 @@ | ||
| 248 | 248 | ), |
| 249 | 249 | esc_html__( 'Determines whether the series has to be presented in the legend or not.', 'visualizer' ) |
| 250 | 250 | ); |
| 251 | 251 | |
| 252 | - echo '<div class="viz-section-item">'; | |
| 252 | + echo '<div class="section-item">'; | |
| 253 | 253 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 254 | 254 | echo '<b>', esc_html__( 'Line Width And Point Size', 'visualizer' ), '</b>'; |
| 255 | 255 | |
| 256 | - echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 256 | + echo '<table class="section-table" cellspacing="0" cellpadding="0" border="0">'; | |
| 257 | 257 | echo '<tr>'; |
| 258 | - echo '<td class="viz-section-table-column">'; | |
| 258 | + echo '<td class="section-table-column">'; | |
| 259 | 259 | $line_width = isset( $this->series[ $index ]['lineWidth'] ) ? $this->series[ $index ]['lineWidth'] : ''; |
| 260 | - echo '<input type="text" name="series[', $index, '][lineWidth]" class="control-text series-linewidth" value="', esc_attr( $line_width ), '" placeholder="2">'; | |
| 260 | + echo '<input type="text" name="series[', $index, '][lineWidth]" class="control-text" value="', esc_attr( $line_width ), '" placeholder="2">'; | |
| 261 | 261 | echo '</td>'; |
| 262 | - echo '<td class="viz-section-table-column">'; | |
| 262 | + echo '<td class="section-table-column">'; | |
| 263 | 263 | $point_size = isset( $this->series[ $index ]['pointSize'] ) ? $this->series[ $index ]['pointSize'] : ''; |
| 264 | 264 | echo '<input type="text" name="series[', $index, '][pointSize]" class="control-text" value="', esc_attr( $point_size ), '" placeholder="0">'; |
| 265 | 265 | echo '</td>'; |
| 266 | 266 | echo '</tr>'; |
| @@ -265,9 +265,9 @@ | ||
| 265 | 265 | echo '</td>'; |
| 266 | 266 | echo '</tr>'; |
| 267 | 267 | echo '</table>'; |
| 268 | 268 | |
| 269 | - echo '<p class="viz-section-description">'; | |
| 269 | + echo '<p class="section-description">'; | |
| 270 | 270 | esc_html_e( 'Overrides the global line width and point size values for this series.', 'visualizer' ); |
| 271 | 271 | echo '</p>'; |
| 272 | 272 | echo '</div>'; |
| 273 | 273 | |
| @@ -288,8 +288,7 @@ | ||
| 288 | 288 | 'series[' . $index . '][color]', |
| 289 | 289 | isset( $this->series[ $index ]['color'] ) ? $this->series[ $index ]['color'] : null, |
| 290 | 290 | null |
| 291 | 291 | ); |
| 292 | + } | |
| 292 | 293 | |
| 293 | - $this->_renderRoleField( $index ); | |
| 294 | - } | |
| 295 | 294 | } |