| @@ -43,19 +43,13 @@ | ||
| 43 | 43 | $Visualizer_Pro->_addEditor( $this->chart->ID ); |
| 44 | 44 | if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) { |
| 45 | 45 | $Visualizer_Pro->_addFilterWizard( $this->chart->ID ); |
| 46 | 46 | } |
| 47 | - } else { | |
| 48 | - Visualizer_Render_Layout::show( 'faux-editor' ); | |
| 49 | 47 | } |
| 50 | - | |
| 51 | - $this->add_additional_content(); | |
| 52 | - | |
| 53 | 48 | // Added by Ash/Upwork |
| 54 | 49 | echo '<div id="canvas">'; |
| 55 | 50 | echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">'; |
| 56 | 51 | echo '</div>'; |
| 57 | - echo $this->custom_css; | |
| 58 | 52 | } |
| 59 | 53 | |
| 60 | 54 | /** |
| 61 | 55 | * Renders sidebar content. |
| @@ -69,30 +63,25 @@ | ||
| 69 | 63 | array( |
| 70 | 64 | 'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA, |
| 71 | 65 | 'nonce' => wp_create_nonce(), |
| 72 | 66 | 'chart' => $this->chart->ID, |
| 73 | - ), | |
| 74 | - admin_url( 'admin-ajax.php' ) | |
| 67 | + ), admin_url( 'admin-ajax.php' ) | |
| 75 | 68 | ); |
| 76 | - | |
| 77 | - // this will allow us to open the correct source tab by default. | |
| 78 | - $source_of_chart = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) ); | |
| 79 | - $type = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true ); | |
| 80 | 69 | ?> |
| 81 | - <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>" data-chart-source="<?php echo $source_of_chart; ?>" data-chart-type="<?php echo $type; ?>"></span> | |
| 70 | + <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>"></span> | |
| 82 | 71 | <iframe id="thehole" name="thehole"></iframe> |
| 83 | - <ul class="viz-group-wrapper full-height"> | |
| 84 | - <li class="viz-group viz-group-category open" id="vz-chart-source"> | |
| 85 | - <div class="viz-group-header"> | |
| 86 | - <h2 class="viz-group-title viz-main-group"><?php _e( 'Chart Data', 'visualizer' ); ?></h2> | |
| 72 | + <ul class="group-wrapper full-height"> | |
| 73 | + <li class="group group-category open" id="vz-chart-source"> | |
| 74 | + <div class="group-header"> | |
| 75 | + <h2 class="group-title main-group"><?php _e( 'Chart Data', 'visualizer' ); ?></h2> | |
| 87 | 76 | </div> |
| 88 | - <ul class="viz-group-content"> | |
| 89 | - <ul class="viz-group-wrapper"> | |
| 90 | - <li class="viz-group visualizer_source_csv"> | |
| 91 | - <h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from file', 'visualizer' ); ?></h2> | |
| 92 | - <div class="viz-group-content"> | |
| 93 | - <p class="viz-group-description"><?php esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?></p> | |
| 94 | - <p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p> | |
| 77 | + <ul class="group-content"> | |
| 78 | + <ul class="group-wrapper"> | |
| 79 | + <li class="group"> | |
| 80 | + <h2 class="group-title sub-group visualizer-src-tab"><?php _e( 'Import data from file', 'visualizer' ); ?></h2> | |
| 81 | + <div class="group-content"> | |
| 82 | + <p class="group-description"><?php esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?></p> | |
| 83 | + <p class="group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p> | |
| 95 | 84 | <form id="vz-csv-file-form" action="<?php echo $upload_link; ?>" method="post" |
| 96 | 85 | target="thehole" enctype="multipart/form-data"> |
| 97 | 86 | <input type="hidden" id="remote-data" name="remote_data"> |
| 98 | 87 | <div class=""> |
| @@ -102,18 +91,18 @@ | ||
| 102 | 91 | value="<?php _e( 'Import', 'visualizer' ); ?>"> |
| 103 | 92 | </form> |
| 104 | 93 | </div> |
| 105 | 94 | </li> |
| 106 | - <li class="viz-group visualizer-import-url visualizer_source_csv_remote"> | |
| 107 | - <h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2> | |
| 108 | - <ul class="viz-group-content"> | |
| 109 | - <li class="viz-subsection"> | |
| 110 | - <span class="viz-section-title"><?php _e( 'One time import', 'visualizer' ); ?></span> | |
| 95 | + <li class="group visualizer-import-url"> | |
| 96 | + <h2 class="group-title sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2> | |
| 97 | + <ul class="group-content"> | |
| 98 | + <li class="subsection"> | |
| 99 | + <span class="section-title"><?php _e( 'One time import', 'visualizer' ); ?></span> | |
| 111 | 100 | |
| 112 | - <div class="viz-section-items section-items"> | |
| 113 | - <p class="viz-group-description"><?php _e( 'You can use this to import data from a remote CSV file. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?> </p> | |
| 114 | - <p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p> | |
| 115 | - <p class="viz-group-description"> <?php _e( 'You can also import data from Google Spreadsheet, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p> | |
| 101 | + <div class="section-items"> | |
| 102 | + <p class="group-description"><?php _e( 'You can use this to import data from a remote CSV file. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?> </p> | |
| 103 | + <p class="group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p> | |
| 104 | + <p class="group-description"> <?php _e( 'You can also import data from Google Spreadsheet, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p> | |
| 116 | 105 | <form id="vz-one-time-import" action="<?php echo $upload_link; ?>" method="post" |
| 117 | 106 | target="thehole" enctype="multipart/form-data"> |
| 118 | 107 | <div class="remote-file-section"> |
| 119 | 108 | <input type="url" id="remote-data" name="remote_data" |
| @@ -125,16 +114,16 @@ | ||
| 125 | 114 | value="<?php _e( 'Import', 'visualizer' ); ?>"> |
| 126 | 115 | </form> |
| 127 | 116 | </div> |
| 128 | 117 | </li> |
| 129 | - <li class="viz-subsection <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?>"> | |
| 130 | - <span class="viz-section-title visualizer-import-url-schedule"><?php _e( 'Schedule Import', 'visualizer' ); ?> | |
| 118 | + <li class="subsection <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?>"> | |
| 119 | + <span class="section-title visualizer-import-url-schedule"><?php _e( 'Schedule Import', 'visualizer' ); ?> | |
| 131 | 120 | <span |
| 132 | 121 | class="dashicons dashicons-lock"></span></span> |
| 133 | - <div class="viz-section-items section-items"> | |
| 134 | - <p class="viz-group-description"><?php _e( 'You can choose here to synchronize your chart data with a remote CSV file.', 'visualizer' ); ?> </p> | |
| 135 | - <p class="viz-group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p> | |
| 136 | - <p class="viz-group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwritting the current data with the one from the URL.', 'visualizer' ); ?></p> | |
| 122 | + <div class="section-items"> | |
| 123 | + <p class="group-description"><?php _e( 'You can choose here to synchronize your chart data with a remote CSV file.', 'visualizer' ); ?> </p> | |
| 124 | + <p class="group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p> | |
| 125 | + <p class="group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwritting the current data with the one from the URL.', 'visualizer' ); ?></p> | |
| 137 | 126 | <form id="vz-schedule-import" action="<?php echo $upload_link; ?>" method="post" |
| 138 | 127 | target="thehole" enctype="multipart/form-data"> |
| 139 | 128 | <div class="remote-file-section"> |
| 140 | 129 | <input type="url" id="vz-schedule-url" name="remote_data" |
| @@ -140,20 +129,18 @@ | ||
| 140 | 129 | <input type="url" id="vz-schedule-url" name="remote_data" |
| 141 | 130 | value="<?php echo get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_URL, true ); ?>" |
| 142 | 131 | placeholder="<?php esc_html_e( 'Please enter the URL of CSV file', 'visualizer' ); ?>" |
| 143 | 132 | class="visualizer-input visualizer-remote-url"> |
| 144 | - <p class="viz-group-description"><?php _e( 'How often do you want to check the url', 'visualizer' ); ?></p> | |
| 133 | + <p class="group-description"><?php _e( 'How often do you want to check the url', 'visualizer' ); ?></p> | |
| 145 | 134 | <select name="vz-import-time" id="vz-import-time" |
| 146 | 135 | class="visualizer-select"> |
| 147 | 136 | <?php |
| 148 | 137 | $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_SCHEDULE, true ); |
| 149 | - $schedules = apply_filters( | |
| 150 | - 'visualizer_chart_schedules', array( | |
| 151 | - '1' => __( 'Each hour', 'visualizer' ), | |
| 152 | - '12' => __( 'Each 12 hours', 'visualizer' ), | |
| 153 | - '24' => __( 'Each day', 'visualizer' ), | |
| 154 | - '72' => __( 'Each 3 days', 'visualizer' ), | |
| 155 | - ) | |
| 138 | + $schedules = array( | |
| 139 | + '1' => __( 'Each hour', 'visualizer' ), | |
| 140 | + '12' => __( 'Each 12 hours', 'visualizer' ), | |
| 141 | + '24' => __( 'Each day', 'visualizer' ), | |
| 142 | + '36' => __( 'Each 3 days', 'visualizer' ), | |
| 156 | 143 | ); |
| 157 | 144 | foreach ( $schedules as $num => $name ) { |
| 158 | 145 | $extra = $num == $hours ? 'selected' : ''; |
| 159 | 146 | ?> |
| @@ -171,15 +158,15 @@ | ||
| 171 | 158 | </div> |
| 172 | 159 | </li> |
| 173 | 160 | </ul> |
| 174 | 161 | </li> |
| 175 | - <li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>"> | |
| 176 | - <h2 class="viz-group-title viz-sub-group" | |
| 162 | + <li class="group <?php echo apply_filters( 'visualizer_pro_upsell_class', '' ); ?> "> | |
| 163 | + <h2 class="group-title sub-group" | |
| 177 | 164 | data-current="chart"><?php _e( 'Import from other chart', 'visualizer' ); ?><span |
| 178 | 165 | class="dashicons dashicons-lock"></span></h2> |
| 179 | - <div class="viz-group-content edit-data-content"> | |
| 166 | + <div class="group-content edit-data-content"> | |
| 180 | 167 | <div> |
| 181 | - <p class="viz-group-description"><?php _e( 'You can import here data from your previously created charts', 'visualizer' ); ?></p> | |
| 168 | + <p class="group-description"><?php _e( 'You can import here data from your previously created charts', 'visualizer' ); ?></p> | |
| 182 | 169 | <form> |
| 183 | 170 | <select name="vz-import-from-chart" id="chart-id" class="visualizer-select"> |
| 184 | 171 | <?php |
| 185 | 172 | $fetch_link = add_query_arg( |
| @@ -185,10 +172,9 @@ | ||
| 185 | 172 | $fetch_link = add_query_arg( |
| 186 | 173 | array( |
| 187 | 174 | 'action' => ( VISUALIZER_PRO ) ? Visualizer_Pro::ACTION_FETCH_DATA : '', |
| 188 | 175 | 'nonce' => wp_create_nonce(), |
| 189 | - ), | |
| 190 | - admin_url( 'admin-ajax.php' ) | |
| 176 | + ), admin_url( 'admin-ajax.php' ) | |
| 191 | 177 | ); |
| 192 | 178 | $query_args_charts = array( |
| 193 | 179 | 'post_type' => Visualizer_Plugin::CPT_VISUALIZER, |
| 194 | 180 | 'posts_per_page' => 300, |
| @@ -214,14 +200,14 @@ | ||
| 214 | 200 | </div> |
| 215 | 201 | </div> |
| 216 | 202 | </li> |
| 217 | 203 | |
| 218 | - <li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?> "> | |
| 219 | - <h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from WordPress', 'visualizer' ); ?><span | |
| 204 | + <li class="group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?> "> | |
| 205 | + <h2 class="group-title sub-group"><?php _e( 'Import from WordPress', 'visualizer' ); ?><span | |
| 220 | 206 | class="dashicons dashicons-lock"></span></h2> |
| 221 | - <div class="viz-group-content edit-data-content"> | |
| 207 | + <div class="group-content edit-data-content"> | |
| 222 | 208 | <div> |
| 223 | - <p class="viz-group-description"><?php _e( 'You can import data from WordPress here.', 'visualizer' ); ?></p> | |
| 209 | + <p class="group-description"><?php _e( 'You can import here data from WordPress', 'visualizer' ); ?></p> | |
| 224 | 210 | <input type="button" id="filter-chart-button" class="button button-primary " |
| 225 | 211 | value="<?php _e( 'Create Filters', 'visualizer' ); ?>" data-current="chart" |
| 226 | 212 | data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>" |
| 227 | 213 | data-t-chart="<?php _e( 'Create Filters', 'visualizer' ); ?>"> |
| @@ -229,67 +215,11 @@ | ||
| 229 | 215 | </div> |
| 230 | 216 | </div> |
| 231 | 217 | </li> |
| 232 | 218 | |
| 233 | - <?php | |
| 234 | - $save_query = add_query_arg( | |
| 235 | - array( | |
| 236 | - 'action' => Visualizer_Plugin::ACTION_SAVE_DB_QUERY, | |
| 237 | - 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION ), | |
| 238 | - 'chart' => $this->chart->ID, | |
| 239 | - ), admin_url( 'admin-ajax.php' ) | |
| 240 | - ); | |
| 241 | - ?> | |
| 242 | - <li class="viz-group visualizer_source_query <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'db-query' ); ?>"> | |
| 243 | - <h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from database', 'visualizer' ); ?><span | |
| 244 | - class="dashicons dashicons-lock"></span></h2> | |
| 245 | - <div class="viz-group-content edit-data-content"> | |
| 246 | - <div> | |
| 247 | - <p class="viz-group-description"><?php _e( 'You can import data from the database here.', 'visualizer' ); ?></p> | |
| 248 | - <form id="vz-db-wizard" action="<?php echo $save_query; ?>" method="post" target="thehole"> | |
| 249 | - <p class="viz-group-description"><?php _e( 'How often do you want to refresh the data from the database.', 'visualizer' ); ?></p> | |
| 250 | - <select name="refresh" id="vz-db-import-time" class="visualizer-select"> | |
| 251 | - <?php | |
| 252 | - $bttn_label = 'visualizer_source_query' === $source_of_chart ? __( 'Modify Query', 'visualizer' ) : __( 'Create Query', 'visualizer' ); | |
| 253 | - $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_SCHEDULE, true ); | |
| 254 | - $schedules = apply_filters( | |
| 255 | - 'visualizer_schedules', array( | |
| 256 | - '0' => __( 'Live', 'visualizer' ), | |
| 257 | - '1' => __( 'Each hour', 'visualizer' ), | |
| 258 | - '12' => __( 'Each 12 hours', 'visualizer' ), | |
| 259 | - '24' => __( 'Each day', 'visualizer' ), | |
| 260 | - '72' => __( 'Each 3 days', 'visualizer' ), | |
| 261 | - ) | |
| 262 | - ); | |
| 263 | - foreach ( $schedules as $num => $name ) { | |
| 264 | - $extra = $num == $hours ? 'selected' : ''; | |
| 265 | - ?> | |
| 266 | - <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option> | |
| 267 | - <?php | |
| 268 | - } | |
| 269 | - ?> | |
| 270 | - </select> | |
| 271 | - <input type="hidden" name="params" id="viz-db-wizard-params"> | |
| 272 | - | |
| 273 | - <input type="button" id="db-chart-button" class="button button-secondary " | |
| 274 | - value="<?php echo $bttn_label; ?>" data-current="chart" | |
| 275 | - data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>" | |
| 276 | - data-t-chart="<?php echo $bttn_label; ?>"> | |
| 277 | - <input type="button" id="db-chart-save-button" class="button button-primary " | |
| 278 | - value="<?php _e( 'Save Schedule', 'visualizer' ); ?>"> | |
| 279 | - <?php echo apply_filters( 'visualizer_pro_upsell', '', 'db-query' ); ?> | |
| 280 | - </form> | |
| 281 | - </div> | |
| 282 | - </div> | |
| 283 | - </li> | |
| 284 | - | |
| 285 | - <?php | |
| 286 | - // we will auto-open the manual data feature but only when pro is active and source is empty. | |
| 287 | - $pro_class = apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); | |
| 288 | - ?> | |
| 289 | - <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $source_of_chart ) && empty( $pro_class ) ? 'open' : ''; ?> "> | |
| 290 | - <h2 class="viz-group-title viz-sub-group visualizer-editor-tab" | |
| 291 | - data-current="chart"><?php _e( 'Manual Data', 'visualizer' ); ?><span | |
| 219 | + <li class="group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>"> | |
| 220 | + <h2 class="group-title sub-group visualizer-editor-tab" | |
| 221 | + data-current="chart"><?php _e( 'Add data manually', 'visualizer' ); ?><span | |
| 292 | 222 | class="dashicons dashicons-lock"></span></h2> |
| 293 | 223 | <form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole"> |
| 294 | 224 | <input type="hidden" id="chart-data" name="chart_data"> |
| 295 | 225 | <input type="hidden" id="chart-data-src" name="chart_data_src"> |
| @@ -294,11 +224,11 @@ | ||
| 294 | 224 | <input type="hidden" id="chart-data" name="chart_data"> |
| 295 | 225 | <input type="hidden" id="chart-data-src" name="chart_data_src"> |
| 296 | 226 | </form> |
| 297 | 227 | |
| 298 | - <div class="viz-group-content edit-data-content"> | |
| 228 | + <div class="group-content edit-data-content"> | |
| 299 | 229 | <div> |
| 300 | - <p class="viz-group-description"><?php _e( 'You can manually edit the chart data using the spreadsheet like editor.', 'visualizer' ); ?></p> | |
| 230 | + <p class="group-description"><?php _e( 'You can manually edit the chart data using the spreadsheet like editor.', 'visualizer' ); ?></p> | |
| 301 | 231 | <input type="button" id="editor-chart-button" class="button button-primary " |
| 302 | 232 | value="<?php _e( 'View Editor', 'visualizer' ); ?>" data-current="chart" |
| 303 | 233 | data-t-editor="<?php _e( 'Show Chart', 'visualizer' ); ?>" |
| 304 | 234 | data-t-chart="<?php _e( 'View Editor', 'visualizer' ); ?>"> |
| @@ -309,29 +239,25 @@ | ||
| 309 | 239 | </li> |
| 310 | 240 | </ul> |
| 311 | 241 | </li> |
| 312 | 242 | </ul> |
| 313 | - <li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-settings"> | |
| 243 | + <li class="group group-category bottom-fixed sidebar-footer-link" id="vz-chart-settings"> | |
| 314 | 244 | <h2><span class="dashicons dashicons-admin-tools"></span><?php _e( 'Advanced', 'visualizer' ); ?></h2> |
| 315 | - <div class="viz-group-header"> | |
| 245 | + <div class="group-header"> | |
| 316 | 246 | <button class="customize-section-back" tabindex="0"></button> |
| 317 | - <h3 class="viz-group-title viz-main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3> | |
| 247 | + <h3 class="group-title main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3> | |
| 318 | 248 | </div> |
| 319 | - <ul class="viz-group-content"> | |
| 249 | + <ul class="group-content"> | |
| 320 | 250 | <form id="settings-form" action="<?php echo add_query_arg( 'nonce', wp_create_nonce() ); ?>" |
| 321 | 251 | method="post"> |
| 322 | 252 | <?php echo $this->sidebar; ?> |
| 323 | - <input type="hidden" name="save" value="1"> | |
| 324 | 253 | </form> |
| 325 | - <form id="cancel-form" action="<?php echo add_query_arg( 'nonce', wp_create_nonce() ); ?>" method="post"> | |
| 326 | - <input type="hidden" name="cancel" value="1"> | |
| 327 | - </form> | |
| 328 | 254 | </ul> |
| 329 | 255 | </li> |
| 330 | 256 | |
| 331 | 257 | <?php $this->getPermissionsLink( $this->chart->ID ); ?> |
| 332 | 258 | |
| 333 | - <li class="viz-group bottom-fixed" id="vz-chart-copyright">Visualizer © <?php echo date( 'Y', current_time( 'timestamp' ) ); ?></li> | |
| 259 | + <li class="group bottom-fixed" id="vz-chart-copyright">Visualizer © <?php echo date( 'Y', current_time( 'timestamp' ) ); ?></li> | |
| 334 | 260 | </ul> |
| 335 | 261 | <?php |
| 336 | 262 | // changed by Ash/Upwork |
| 337 | 263 | } |
| @@ -348,16 +274,16 @@ | ||
| 348 | 274 | foreach ( $permissions as $k => $v ) { |
| 349 | 275 | $this->$k = $v; |
| 350 | 276 | } |
| 351 | 277 | } |
| 352 | - ?> | |
| 353 | - <li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-permissions"> | |
| 278 | +?> | |
| 279 | + <li class="group group-category bottom-fixed sidebar-footer-link" id="vz-chart-permissions"> | |
| 354 | 280 | <h2><span class="dashicons dashicons-admin-users"></span><?php _e( 'Permissions', 'visualizer' ); ?></h2> |
| 355 | - <div class="viz-group-header"> | |
| 281 | + <div class="group-header"> | |
| 356 | 282 | <button class="customize-section-back" tabindex="0"></button> |
| 357 | - <h3 class="viz-group-title viz-main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3> | |
| 283 | + <h3 class="group-title main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3> | |
| 358 | 284 | </div> |
| 359 | - <ul class="viz-group-content"> | |
| 285 | + <ul class="group-content"> | |
| 360 | 286 | <form id="permissions-form" target="thehole" action=" |
| 361 | 287 | <?php |
| 362 | 288 | echo add_query_arg( |
| 363 | 289 | array( |
| @@ -362,18 +288,17 @@ | ||
| 362 | 288 | echo add_query_arg( |
| 363 | 289 | array( |
| 364 | 290 | 'nonce' => wp_create_nonce(), |
| 365 | 291 | 'tab' => 'permissions', |
| 366 | - ), | |
| 367 | - remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] ) | |
| 292 | + ), remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] ) | |
| 368 | 293 | ); |
| 369 | - ?> | |
| 294 | +?> | |
| 370 | 295 | " method="post"> |
| 371 | 296 | <?php $this->permissionsSidebar(); ?> |
| 372 | 297 | </form> |
| 373 | 298 | </ul> |
| 374 | 299 | </li> |
| 375 | - <?php | |
| 300 | +<?php | |
| 376 | 301 | } |
| 377 | 302 | |
| 378 | 303 | /** |
| 379 | 304 | * Generates the permissions form. |
| @@ -380,17 +305,11 @@ | ||
| 380 | 305 | * |
| 381 | 306 | * @access private |
| 382 | 307 | */ |
| 383 | 308 | private function permissionsSidebar() { |
| 384 | - // ignore for unit tests because Travis throws the error "Indirect modification of overloaded property Visualizer_Render_Page_Data::$permissions has no effect". | |
| 385 | - if ( defined( 'WP_TESTS_DOMAIN' ) ) { | |
| 386 | - return; | |
| 387 | - } | |
| 388 | 309 | Visualizer_Render_Sidebar::_renderGroupStart( |
| 389 | 310 | esc_html__( 'Who can see this chart?', 'visualizer' ) . '<span |
| 390 | - class="dashicons dashicons-lock"></span>', | |
| 391 | - '', | |
| 392 | - apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ) | |
| 311 | + class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ) | |
| 393 | 312 | ); |
| 394 | 313 | Visualizer_Render_Sidebar::_renderSectionStart(); |
| 395 | 314 | Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can view the chart on the front-end.', 'visualizer' ) ); |
| 396 | 315 | |
| @@ -430,11 +349,9 @@ | ||
| 430 | 349 | Visualizer_Render_Sidebar::_renderGroupEnd(); |
| 431 | 350 | |
| 432 | 351 | Visualizer_Render_Sidebar::_renderGroupStart( |
| 433 | 352 | esc_html__( 'Who can edit this chart?', 'visualizer' ) . '<span |
| 434 | - class="dashicons dashicons-lock"></span>', | |
| 435 | - '', | |
| 436 | - apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ) | |
| 353 | + class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' ) | |
| 437 | 354 | ); |
| 438 | 355 | Visualizer_Render_Sidebar::_renderSectionStart(); |
| 439 | 356 | Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can edit the chart on the front-end.', 'visualizer' ) ); |
| 440 | 357 | |
| @@ -483,34 +400,16 @@ | ||
| 483 | 400 | * |
| 484 | 401 | * @access protected |
| 485 | 402 | */ |
| 486 | 403 | protected function _renderToolbar() { |
| 487 | - // don't show back button at all. | |
| 488 | - // NOTE: We can't be selective on the post_status here because when a new chart reaches the settings screen, its status changes to publish. | |
| 489 | - if ( ! VISUALIZER_SKIP_CHART_TYPE_PAGE ) { | |
| 490 | - echo '<div class="toolbar-div">'; | |
| 491 | - echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">'; | |
| 492 | - esc_html_e( 'Back', 'visualizer' ); | |
| 493 | - echo '</a>'; | |
| 494 | - echo '</div>'; | |
| 495 | - } | |
| 404 | + // changed by Ash/Upwork | |
| 405 | + echo '<div class="toolbar-div">'; | |
| 406 | + echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">'; | |
| 407 | + esc_html_e( 'Back', 'visualizer' ); | |
| 408 | + echo '</a>'; | |
| 409 | + echo '</div>'; | |
| 496 | 410 | echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">'; |
| 497 | - if ( isset( $this->cancel_button ) ) { | |
| 498 | - echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-left" value="', $this->cancel_button, '">'; | |
| 499 | - } | |
| 500 | - } | |
| 411 | + echo '</div>'; | |
| 501 | 412 | |
| 502 | - /** | |
| 503 | - * Renders the additional content. | |
| 504 | - * | |
| 505 | - * @access private | |
| 506 | - */ | |
| 507 | - private function add_additional_content() { | |
| 508 | - $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) ); | |
| 509 | - $query = ''; | |
| 510 | - if ( 'visualizer_source_query' === $source ) { | |
| 511 | - $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true ); | |
| 512 | - } | |
| 513 | - Visualizer_Render_Layout::show( 'db-query', $query ); | |
| 514 | 413 | } |
| 515 | 414 | |
| 516 | 415 | } |
