← All changes | classes/Visualizer/Render/Library.php +45 -47 1.6.6 → 1.7.0 View file →

		@@ -18,9 +18,8 @@
18	18	// | MA 02110-1301 USA |
19	19	// +----------------------------------------------------------------------+
20	20	// | Author: Eugene Manuilov <eugene@manuilov.org> |
21	21	// +----------------------------------------------------------------------+
22		-
23	22	/**
24	23	* Renders visualizer library page.
25	24	*
26	25	* @category Visualizer
		@@ -36,9 +35,9 @@
36	35	* @since 1.0.0
37	36	*
38	37	* @access private
39	38	* @param string $placeholder_id The placeholder's id for the chart.
40		- * @param int $chart_id The id of the chart.
	39	+ * @param int $chart_id The id of the chart.
41	40	*/
42	41	private function _renderChartBox( $placeholder_id, $chart_id ) {
43	42	$ajax_url = admin_url( 'admin-ajax.php' );
44	43
		@@ -54,13 +53,13 @@
54	53	'chart' => $chart_id,
55	54	'type' => $this->type,
56	55	), $ajax_url );
57	56
58		- $export_link = add_query_arg( array(
59		- 'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
60		- 'chart' => $chart_id,
61		- 'security' => wp_create_nonce(Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION),
62		- ), admin_url( 'admin-ajax.php' ) );
	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' ) );
63	62
64	63	echo '<div class="visualizer-chart">';
65	64	echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">';
66	65	echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
		@@ -65,14 +64,14 @@
65	64	echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">';
66	65	echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
67	66	echo '</div>';
68	67	echo '<div class="visualizer-chart-footer visualizer-clearfix">';
69		- echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', Visualizer_Plugin::NAME ), '" onclick="return showNotice.warn();"></a>';
70		- echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', Visualizer_Plugin::NAME ), '"></a>';
71		- echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', Visualizer_Plugin::NAME ), '" data-chart="', $chart_id, '"></a>';
72		- echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', Visualizer_Plugin::NAME ), '" data-chart="', $export_link, '"></a>';
	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>';
73	72
74		- echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', Visualizer_Plugin::NAME ), '">';
	73	+ echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">';
75	74	echo '&nbsp;[visualizer id=&quot;', $chart_id, '&quot;]&nbsp;';
76	75	echo '</span>';
77	76	echo '</div>';
78	77	echo '</div>';
		@@ -85,50 +84,49 @@
85	84	*
86	85	* @access private
87	86	*/
88	87	private function _renderLibrary() {
89		- // Added by Ash/Upwork
90		- $filterBy = null;
91		- if(isset($_GET["filter"]) && strlen($_GET["filter"]) > 0){
92		- $filterBy = filter_input( INPUT_GET, "filter", FILTER_SANITIZE_STRING );
93		- }
94		- echo '<div id="visualizer-search"><form action="" method="get">
	88	+ // Added by Ash/Upwork
	89	+ $filterBy = null;
	90	+ if ( isset( $_GET['filter'] ) && strlen( $_GET['filter'] ) > 0 ) {
	91	+ $filterBy = filter_input( INPUT_GET, 'filter', FILTER_SANITIZE_STRING );
	92	+ }
	93	+ echo '<div id="visualizer-search"><form action="" method="get">
95	94	<input type="text" name="filter" value="' . $filterBy . '">
96	95	<input type="hidden" name="page" value="visualizer">
97		- <input type="submit" class="button button-secondary" value="' . esc_attr__('Search', Visualizer_Plugin::NAME) . '">
	96	+ <input type="submit" class="button button-secondary" value="' . esc_attr__( 'Search', 'visualizer' ) . '">
98	97	</form></div>';
99		- // Added by Ash/Upwork
100		-
	98	+ // Added by Ash/Upwork
101	99	echo '<div id="visualizer-types" class="visualizer-clearfix">';
102	100	echo '<ul>';
103		- foreach ( $this->types as $type => $label ) {
104		- echo '<li class="visualizer-list-item">';
105		- if ( $type == $this->type ) {
106		- echo '<a class="page-numbers current" href="', esc_url(add_query_arg( 'vpage', false )), '">';
107		- echo $label;
108		- echo '</a>';
109		- } else {
110		- echo '<a class="page-numbers" href="', esc_url(add_query_arg( array( 'type' => $type, 'vpage' => false ) )), '">';
111		- echo $label;
112		- echo '</a>';
113		- }
114		- echo '</li>';
115		- }
	101	+ foreach ( $this->types as $type => $label ) {
	102	+ echo '<li class="visualizer-list-item">';
	103	+ if ( $type == $this->type ) {
	104	+ echo '<a class="page-numbers current" href="', esc_url( add_query_arg( 'vpage', false ) ), '">';
	105	+ echo $label;
	106	+ echo '</a>';
	107	+ } else {
	108	+ echo '<a class="page-numbers" href="', esc_url( add_query_arg( array( 'type' => $type, 'vpage' => false ) ) ), '">';
	109	+ echo $label;
	110	+ echo '</a>';
	111	+ }
	112	+ echo '</li>';
	113	+ }
116	114	echo '</ul>';
117	115	echo '</div>';
118	116
119		- if ( !empty( $this->charts ) ) {
	117	+ if ( ! empty( $this->charts ) ) {
120	118	echo '<div id="visualizer-library" class="visualizer-clearfix">';
121		- foreach ( $this->charts as $placeholder_id => $chart ) {
122		- $this->_renderChartBox( $placeholder_id, $chart['id'] );
123		- }
	119	+ foreach ( $this->charts as $placeholder_id => $chart ) {
	120	+ $this->_renderChartBox( $placeholder_id, $chart['id'] );
	121	+ }
124	122	echo '</div>';
125	123
126	124	if ( is_array( $this->pagination ) ) {
127	125	echo '<ul class="visualizer-library-pagination">';
128		- foreach ( $this->pagination as $page ) {
129		- echo '<li class="visualizer-list-item">', $page, '</li>';
130		- }
	126	+ foreach ( $this->pagination as $page ) {
	127	+ echo '<li class="visualizer-list-item">', $page, '</li>';
	128	+ }
131	129	echo '</ul>';
132	130	}
133	131	} else {
134	132	echo '<div id="visualizer-library" class="visualizer-clearfix">';
		@@ -133,9 +131,9 @@
133	131	} else {
134	132	echo '<div id="visualizer-library" class="visualizer-clearfix">';
135	133	echo '<div class="visualizer-chart">';
136	134	echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">';
137		- echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', Visualizer_Plugin::NAME ), '</div>';
	135	+ echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '</div>';
138	136	echo '</div>';
139	137	echo '<div class="visualizer-chart-footer visualizer-clearfix">';
140	138	echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';
141	139	echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>';
		@@ -161,10 +159,10 @@
161	159	protected function _toHTML() {
162	160	echo '<div class="wrap">';
163	161	echo '<div id="visualizer-icon" class="icon32"><br></div>';
164	162	echo '<h2>';
165		- esc_html_e( 'Visualizer Library', Visualizer_Plugin::NAME );
166		- echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', Visualizer_Plugin::NAME ), '</a>';
	163	+ esc_html_e( 'Visualizer Library', 'visualizer' );
	164	+ echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>';
167	165	echo '</h2>';
168	166
169	167	$this->_renderMessages();
170	168	$this->_renderLibrary();
		@@ -178,14 +176,14 @@
178	176	*
179	177	* @access private
180	178	*/
181	179	private function _renderMessages() {
182		- if ( !filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) {
	180	+ if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) {
183	181	echo '<div class="updated error">';
184	182	echo '<p>';
185		- 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_Plugin::NAME ), '<b>allow_url_fopen</b>' );
	183	+ 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>' );
186	184	echo '</p>';
187	185	echo '</div>';
188	186	}
189	187	}
190	188
191		-}
	189	+}