| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | <?php |
| 2 | + | |
| 2 | 3 | // +----------------------------------------------------------------------+ |
| 3 | 4 | // | Copyright 2013 Madpixels (email : visualizer@madpixels.net) | |
| 4 | 5 | // +----------------------------------------------------------------------+ |
| 5 | 6 | // | This program is free software; you can redistribute it and/or modify | |
| @@ -28,41 +29,53 @@ | ||
| 28 | 29 | */ |
| 29 | 30 | class Visualizer_Render_Library extends Visualizer_Render { |
| 30 | 31 | |
| 31 | 32 | /** |
| 32 | - * Renders library page. | |
| 33 | + * Renders chart's box block. | |
| 33 | 34 | * |
| 34 | 35 | * @since 1.0.0 |
| 35 | 36 | * |
| 36 | - * @access protected | |
| 37 | + * @access private | |
| 38 | + * @param string $placeholder_id The placeholder's id for the chart. | |
| 39 | + * @param int $chart_id The id of the chart. | |
| 37 | 40 | */ |
| 38 | - protected function _toHTML() { | |
| 39 | - echo '<div class="wrap">'; | |
| 40 | - echo '<div id="visualizer-icon" class="icon32"><br></div>'; | |
| 41 | - echo '<h2>'; | |
| 42 | - esc_html_e( 'Visualizer Library', 'visualizer' ); | |
| 43 | - echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>'; | |
| 44 | - echo '</h2>'; | |
| 45 | - $this->_renderMessages(); | |
| 46 | - $this->_renderLibrary(); | |
| 47 | - echo '</div>'; | |
| 48 | - } | |
| 41 | + private function _renderChartBox( $placeholder_id, $chart_id ) { | |
| 42 | + $ajax_url = admin_url( 'admin-ajax.php' ); | |
| 49 | 43 | |
| 50 | - /** | |
| 51 | - * Renders notification messages if need be. | |
| 52 | - * | |
| 53 | - * @since 1.4.2 | |
| 54 | - * | |
| 55 | - * @access private | |
| 56 | - */ | |
| 57 | - private function _renderMessages() { | |
| 58 | - if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) { | |
| 59 | - echo '<div class="updated error">'; | |
| 60 | - echo '<p>'; | |
| 61 | - printf( esc_html__( '%s option is disabled in your php.ini config. Please, enable it by change its value to 1. This option increases the speed of remote CSV uploading.', 'visualizer' ), '<b>allow_url_fopen</b>' ); | |
| 62 | - echo '</p>'; | |
| 44 | + $delete_url = add_query_arg( array( | |
| 45 | + 'action' => Visualizer_Plugin::ACTION_DELETE_CHART, | |
| 46 | + 'nonce' => wp_create_nonce(), | |
| 47 | + 'chart' => $chart_id, | |
| 48 | + ), $ajax_url ); | |
| 49 | + | |
| 50 | + $clone_url = add_query_arg( array( | |
| 51 | + 'action' => Visualizer_Plugin::ACTION_CLONE_CHART, | |
| 52 | + 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ), | |
| 53 | + 'chart' => $chart_id, | |
| 54 | + 'type' => $this->type, | |
| 55 | + ), $ajax_url ); | |
| 56 | + | |
| 57 | + $export_link = add_query_arg( array( | |
| 58 | + 'action' => Visualizer_Plugin::ACTION_EXPORT_DATA, | |
| 59 | + 'chart' => $chart_id, | |
| 60 | + 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION ), | |
| 61 | + ), admin_url( 'admin-ajax.php' ) ); | |
| 62 | + | |
| 63 | + echo '<div class="visualizer-chart">'; | |
| 64 | + echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">'; | |
| 65 | + echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">'; | |
| 63 | 66 | echo '</div>'; |
| 64 | - } | |
| 67 | + echo '<div class="visualizer-chart-footer visualizer-clearfix">'; | |
| 68 | + echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', 'visualizer' ), '" onclick="return showNotice.warn();"></a>'; | |
| 69 | + echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', 'visualizer' ), '"></a>'; | |
| 70 | + echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', 'visualizer' ), '" data-chart="', $chart_id, '"></a>'; | |
| 71 | + echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', 'visualizer' ), '" data-chart="', $export_link, '"></a>'; | |
| 72 | + | |
| 73 | + echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">'; | |
| 74 | + echo ' [visualizer id="', $chart_id, '"] '; | |
| 75 | + echo '</span>'; | |
| 76 | + echo '</div>'; | |
| 77 | + echo '</div>'; | |
| 65 | 78 | } |
| 66 | 79 | |
| 67 | 80 | /** |
| 68 | 81 | * Renders library content. |
| @@ -72,36 +85,29 @@ | ||
| 72 | 85 | * @access private |
| 73 | 86 | */ |
| 74 | 87 | private function _renderLibrary() { |
| 75 | 88 | // Added by Ash/Upwork |
| 76 | - $filterBy = null; | |
| 77 | - if ( isset( $_GET['s'] ) && strlen( $_GET['s'] ) > 0 ) { | |
| 78 | - $filterBy = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING ); | |
| 89 | + $filterBy = null; | |
| 90 | + if ( isset( $_GET['filter'] ) && strlen( $_GET['filter'] ) > 0 ) { | |
| 91 | + $filterBy = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING ); | |
| 79 | 92 | } |
| 93 | + echo '<div id="visualizer-search"><form action="" method="get"> | |
| 94 | + <input type="text" name="filter" value="' . $filterBy . '"> | |
| 95 | + <input type="hidden" name="page" value="visualizer"> | |
| 96 | + <input type="submit" class="button button-secondary" value="' . esc_attr__( 'Search', 'visualizer' ) . '"> | |
| 97 | + </form></div>'; | |
| 80 | 98 | // Added by Ash/Upwork |
| 81 | - echo $this->custom_css; | |
| 82 | 99 | echo '<div id="visualizer-types" class="visualizer-clearfix">'; |
| 83 | - echo '<ul class="subsubsub">'; | |
| 100 | + echo '<ul>'; | |
| 84 | 101 | foreach ( $this->types as $type => $array ) { |
| 85 | - if ( ! is_array( $array ) ) { | |
| 86 | - // support for old pro | |
| 87 | - $array = array( 'enabled' => true, 'name' => $array ); | |
| 88 | - } | |
| 89 | - $label = $array['name']; | |
| 90 | - $link = '<a class=" " href="' . esc_url( | |
| 91 | - add_query_arg( | |
| 92 | - array( | |
| 93 | - 'type' => $type, | |
| 94 | - 'vpage' => false, | |
| 95 | - ) | |
| 96 | - ) | |
| 97 | - ) . '">'; | |
| 102 | + $label = $array['name']; | |
| 103 | + $link = '<a class="page-numbers" href="' . esc_url( add_query_arg( array( 'type' => $type, 'vpage' => false ) ) ) . '">'; | |
| 98 | 104 | if ( ! $array['enabled'] ) { |
| 99 | - $link = "<a class=' visualizer-pro-only' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>"; | |
| 105 | + $link = "<a class='pro-upsell page-numbers' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>"; | |
| 100 | 106 | } |
| 101 | - echo '<li class="visualizer-list-item all">'; | |
| 107 | + echo '<li class="visualizer-list-item">'; | |
| 102 | 108 | if ( $type == $this->type ) { |
| 103 | - echo '<a class=" current" href="', esc_url( add_query_arg( 'vpage', false ) ), '">'; | |
| 109 | + echo '<a class="page-numbers current" href="', esc_url( add_query_arg( 'vpage', false ) ), '">'; | |
| 104 | 110 | echo $label; |
| 105 | 111 | echo '</a>'; |
| 106 | 112 | } else { |
| 107 | 113 | echo $link; |
| @@ -107,127 +113,81 @@ | ||
| 107 | 113 | echo $link; |
| 108 | 114 | echo $label; |
| 109 | 115 | echo '</a>'; |
| 110 | 116 | } |
| 111 | - echo ' | </li>'; | |
| 117 | + echo '</li>'; | |
| 112 | 118 | } |
| 113 | - echo '</ul>'; | |
| 114 | - echo '<form action="" method="get"><p id="visualizer-search" class="search-box"> | |
| 115 | - <input type="search" name="s" value="' . $filterBy . '"> | |
| 116 | - <input type="hidden" name="page" value="visualizer"> | |
| 117 | - <input type="submit" id="search-submit" class="button button-secondary" value="' . esc_attr__( 'Search', 'visualizer' ) . '"> | |
| 118 | - </p> </form>'; | |
| 119 | + echo '</ul>'; | |
| 119 | 120 | echo '</div>'; |
| 120 | - echo '<div id="visualizer-content-wrapper">'; | |
| 121 | + | |
| 121 | 122 | if ( ! empty( $this->charts ) ) { |
| 122 | 123 | echo '<div id="visualizer-library" class="visualizer-clearfix">'; |
| 123 | - foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 124 | + foreach ( $this->charts as $placeholder_id => $chart ) { | |
| 124 | 125 | $this->_renderChartBox( $placeholder_id, $chart['id'] ); |
| 125 | 126 | } |
| 126 | 127 | echo '</div>'; |
| 128 | + | |
| 129 | + if ( is_array( $this->pagination ) ) { | |
| 130 | + echo '<ul class="visualizer-library-pagination">'; | |
| 131 | + foreach ( $this->pagination as $page ) { | |
| 132 | + echo '<li class="visualizer-list-item">', $page, '</li>'; | |
| 133 | + } | |
| 134 | + echo '</ul>'; | |
| 135 | + } | |
| 127 | 136 | } else { |
| 128 | 137 | echo '<div id="visualizer-library" class="visualizer-clearfix">'; |
| 129 | - echo '<div class="visualizer-chart">'; | |
| 130 | - echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">'; | |
| 131 | - echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '</div>'; | |
| 138 | + echo '<div class="visualizer-chart">'; | |
| 139 | + echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">'; | |
| 140 | + echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '</div>'; | |
| 141 | + echo '</div>'; | |
| 142 | + echo '<div class="visualizer-chart-footer visualizer-clearfix">'; | |
| 143 | + echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>'; | |
| 144 | + echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>'; | |
| 145 | + echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>'; | |
| 146 | + echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>'; | |
| 147 | + | |
| 148 | + echo '<span class="visualizer-chart-shortcode">'; | |
| 149 | + echo ' [visualizer] '; | |
| 150 | + echo '</span>'; | |
| 151 | + echo '</div>'; | |
| 152 | + echo '</div>'; | |
| 132 | 153 | echo '</div>'; |
| 133 | - echo '<div class="visualizer-chart-footer visualizer-clearfix">'; | |
| 134 | - echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>'; | |
| 135 | - echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>'; | |
| 136 | - echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>'; | |
| 137 | - echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>'; | |
| 138 | - echo '<span class="visualizer-chart-shortcode">'; | |
| 139 | - echo ' [visualizer] '; | |
| 140 | - echo '</span>'; | |
| 141 | - echo '</div>'; | |
| 142 | - echo '</div>'; | |
| 143 | - echo '</div>'; | |
| 144 | 154 | } |
| 145 | - $this->_renderSidebar(); | |
| 146 | - echo '</div>'; | |
| 147 | - if ( is_array( $this->pagination ) ) { | |
| 148 | - echo '<ul class=" subsubsub">'; | |
| 149 | - foreach ( $this->pagination as $page ) { | |
| 150 | - echo '<li class="all">', $page, '</li>'; | |
| 151 | - } | |
| 152 | - echo '</ul>'; | |
| 153 | - } | |
| 154 | 155 | } |
| 155 | 156 | |
| 156 | 157 | /** |
| 157 | - * Renders chart's box block. | |
| 158 | + * Renders library page. | |
| 158 | 159 | * |
| 159 | 160 | * @since 1.0.0 |
| 160 | 161 | * |
| 161 | - * @access private | |
| 162 | - * | |
| 163 | - * @param string $placeholder_id The placeholder's id for the chart. | |
| 164 | - * @param int $chart_id The id of the chart. | |
| 162 | + * @access protected | |
| 165 | 163 | */ |
| 166 | - private function _renderChartBox( $placeholder_id, $chart_id ) { | |
| 167 | - $settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS ); | |
| 168 | - $title = '#' . $chart_id; | |
| 169 | - if ( ! empty( $settings[0]['title'] ) ) { | |
| 170 | - $title = $settings[0]['title']; | |
| 171 | - } | |
| 172 | - $ajax_url = admin_url( 'admin-ajax.php' ); | |
| 173 | - $delete_url = add_query_arg( | |
| 174 | - array( | |
| 175 | - 'action' => Visualizer_Plugin::ACTION_DELETE_CHART, | |
| 176 | - 'nonce' => wp_create_nonce(), | |
| 177 | - 'chart' => $chart_id, | |
| 178 | - ), | |
| 179 | - $ajax_url | |
| 180 | - ); | |
| 181 | - $clone_url = add_query_arg( | |
| 182 | - array( | |
| 183 | - 'action' => Visualizer_Plugin::ACTION_CLONE_CHART, | |
| 184 | - 'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ), | |
| 185 | - 'chart' => $chart_id, | |
| 186 | - 'type' => $this->type, | |
| 187 | - ), | |
| 188 | - $ajax_url | |
| 189 | - ); | |
| 190 | - $export_link = add_query_arg( | |
| 191 | - array( | |
| 192 | - 'action' => Visualizer_Plugin::ACTION_EXPORT_DATA, | |
| 193 | - 'chart' => $chart_id, | |
| 194 | - 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION ), | |
| 195 | - ), | |
| 196 | - admin_url( 'admin-ajax.php' ) | |
| 197 | - ); | |
| 198 | - echo '<div class="visualizer-chart"><div class="visualizer-chart-title">', esc_html( $title ), '</div>'; | |
| 199 | - echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">'; | |
| 200 | - echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">'; | |
| 164 | + protected function _toHTML() { | |
| 165 | + echo '<div class="wrap">'; | |
| 166 | + echo '<div id="visualizer-icon" class="icon32"><br></div>'; | |
| 167 | + echo '<h2>'; | |
| 168 | + esc_html_e( 'Visualizer Library', 'visualizer' ); | |
| 169 | + echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>'; | |
| 170 | + echo '</h2>'; | |
| 171 | + | |
| 172 | + $this->_renderMessages(); | |
| 173 | + $this->_renderLibrary(); | |
| 201 | 174 | echo '</div>'; |
| 202 | - echo '<div class="visualizer-chart-footer visualizer-clearfix">'; | |
| 203 | - echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', 'visualizer' ), '" onclick="return showNotice.warn();"></a>'; | |
| 204 | - echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', 'visualizer' ), '"></a>'; | |
| 205 | - echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', 'visualizer' ), '" data-chart="', $chart_id, '"></a>'; | |
| 206 | - echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', 'visualizer' ), '" data-chart="', $export_link, '"></a>'; | |
| 207 | - echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">'; | |
| 208 | - echo ' [visualizer id="', $chart_id, '"] '; | |
| 209 | - echo '</span>'; | |
| 210 | - echo '</div>'; | |
| 211 | - echo '</div>'; | |
| 212 | 175 | } |
| 213 | 176 | |
| 214 | 177 | /** |
| 215 | - * Render sidebar. | |
| 178 | + * Renders notification messages if need be. | |
| 179 | + * | |
| 180 | + * @since 1.4.2 | |
| 181 | + * | |
| 182 | + * @access private | |
| 216 | 183 | */ |
| 217 | - private function _renderSidebar() { | |
| 218 | - if ( ! VISUALIZER_PRO ) { | |
| 219 | - echo '<div id="visualizer-sidebar">'; | |
| 220 | - echo '<div class="visualizer-sidebar-box">'; | |
| 221 | - echo '<h3>' . __( 'Gain more editing power', 'visualizer' ) . '</h3><ul>'; | |
| 222 | - echo '<li>' . __( 'Spreadsheet like editor', 'visualizer' ) . '</li>'; | |
| 223 | - echo '<li>' . __( 'Import from other charts', 'visualizer' ) . '</li>'; | |
| 224 | - echo '<li>' . __( 'Frontend editor', 'visualizer' ) . '</li>'; | |
| 225 | - echo '<li>' . __( 'Private charts', 'visualizer' ) . '</li>'; | |
| 226 | - echo '<li>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li>'; | |
| 227 | - echo '<li>' . __( '3 more chart types', 'visualizer' ) . '</li></ul>'; | |
| 228 | - echo '<a href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a>'; | |
| 229 | - echo '</div>'; | |
| 184 | + private function _renderMessages() { | |
| 185 | + if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) { | |
| 186 | + echo '<div class="updated error">'; | |
| 187 | + echo '<p>'; | |
| 188 | + printf( esc_html__( '%s option is disabled in your php.ini config. Please, enable it by change its value to 1. This option increases the speed of remote CSV uploading.', 'visualizer' ), '<b>allow_url_fopen</b>' ); | |
| 189 | + echo '</p>'; | |
| 230 | 190 | echo '</div>'; |
| 231 | 191 | } |
| 232 | 192 | } |
| 233 | 193 | |
