Skip to content

Commit ae00274

Browse files
selulselul
committed
added sidebar
1 parent e35f269 commit ae00274

File tree

2 files changed

+121
-98
lines changed

2 files changed

+121
-98
lines changed

‎classes/Visualizer/Render/Library.php

Lines changed: 97 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
// +----------------------------------------------------------------------+
43
// | Copyright 2013 Madpixels (email : [email protected]) |
54
// +----------------------------------------------------------------------+
@@ -19,6 +18,7 @@
1918
// +----------------------------------------------------------------------+
2019
// | Author: Eugene Manuilov <[email protected]> |
2120
// +----------------------------------------------------------------------+
21+
2222
/**
2323
* Renders visualizer library page.
2424
*
@@ -30,51 +30,39 @@
3030
class Visualizer_Render_Library extends Visualizer_Render {
3131

3232
/**
33-
* Renders chart's box block.
33+
* Renders library page.
3434
*
3535
* @since 1.0.0
3636
*
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+
* @access protected
4038
*/
41-
private function _renderChartBox( $placeholder_id, $chart_id ) {
42-
$ajax_url = admin_url( 'admin-ajax.php' );
43-
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">';
66-
echo '</div>';
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>';
39+
protected function _toHTML() {
40+
echo '<div class="wrap">';
41+
echo '<div id="visualizer-icon" class="icon32"><br></div>';
42+
echo '<h2>';
43+
esc_html_e( 'Visualizer Library', 'visualizer' );
44+
echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>';
45+
echo '</h2>';
46+
$this->_renderMessages();
47+
$this->_renderLibrary();
48+
echo '</div>';
49+
}
7250

73-
echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">';
74-
echo '&nbsp;[visualizer id=&quot;', $chart_id, '&quot;]&nbsp;';
75-
echo '</span>';
51+
/**
52+
* Renders notification messages if need be.
53+
*
54+
* @since 1.4.2
55+
*
56+
* @access private
57+
*/
58+
private function _renderMessages() {
59+
if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) {
60+
echo '<div class="updated error">';
61+
echo '<p>';
62+
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>' );
63+
echo '</p>';
7664
echo '</div>';
77-
echo '</div>';
65+
}
7866
}
7967

8068
/**
@@ -86,22 +74,21 @@ private function _renderChartBox( $placeholder_id, $chart_id ) {
8674
*/
8775
private function _renderLibrary() {
8876
// Added by Ash/Upwork
89-
$filterBy = null;
77+
$filterBy = null;
9078
if ( isset( $_GET['s'] ) && strlen( $_GET['s'] ) > 0 ) {
91-
$filterBy = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
79+
$filterBy = filter_input( INPUT_GET, 's', FILTER_SANITIZE_STRING );
9280
}
93-
9481
// Added by Ash/Upwork
9582
echo '<div id="visualizer-types" class="visualizer-clearfix">';
96-
echo '<ul class="subsubsub">';
83+
echo '<ul class="subsubsub">';
9784
foreach ( $this->types as $type => $array ) {
98-
$label = $array['name'];
99-
$link = '<a class=" " href="' . esc_url( add_query_arg( array(
100-
'type' => $type,
101-
'vpage' => false,
102-
) ) ) . '">';
85+
$label = $array['name'];
86+
$link = '<a class=" " href="' . esc_url( add_query_arg( array(
87+
'type' => $type,
88+
'vpage' => false,
89+
) ) ) . '">';
10390
if ( ! $array['enabled'] ) {
104-
$link = "<a class=' visualizer-pro-only' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
91+
$link = "<a class=' visualizer-pro-only' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
10592
}
10693
echo '<li class="visualizer-list-item all">';
10794
if ( $type == $this->type ) {
@@ -115,21 +102,19 @@ private function _renderLibrary() {
115102
}
116103
echo ' | </li>';
117104
}
118-
echo '</ul>';
105+
echo '</ul>';
119106
echo '<form action="" method="get"><p id="visualizer-search" class="search-box">
120107
<input type="search" name="s" value="' . $filterBy . '">
121108
<input type="hidden" name="page" value="visualizer">
122109
<input type="submit" id="search-submit" class="button button-secondary" value="' . esc_attr__( 'Search', 'visualizer' ) . '">
123110
</p> </form>';
124111
echo '</div>';
125-
126112
if ( ! empty( $this->charts ) ) {
127113
echo '<div id="visualizer-library" class="visualizer-clearfix">';
128-
foreach ( $this->charts as $placeholder_id => $chart ) {
114+
foreach ( $this->charts as $placeholder_id => $chart ) {
129115
$this->_renderChartBox( $placeholder_id, $chart['id'] );
130116
}
131117
echo '</div>';
132-
133118
if ( is_array( $this->pagination ) ) {
134119
echo '<ul class=" subsubsub">';
135120
foreach ( $this->pagination as $page ) {
@@ -139,60 +124,74 @@ private function _renderLibrary() {
139124
}
140125
} else {
141126
echo '<div id="visualizer-library" class="visualizer-clearfix">';
142-
echo '<div class="visualizer-chart">';
143-
echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">';
144-
echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '</div>';
145-
echo '</div>';
146-
echo '<div class="visualizer-chart-footer visualizer-clearfix">';
147-
echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';
148-
echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>';
149-
echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>';
150-
echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>';
151-
152-
echo '<span class="visualizer-chart-shortcode">';
153-
echo '&nbsp;[visualizer]&nbsp;';
154-
echo '</span>';
155-
echo '</div>';
156-
echo '</div>';
127+
echo '<div class="visualizer-chart">';
128+
echo '<div class="visualizer-chart-canvas visualizer-nochart-canvas">';
129+
echo '<div class="visualizer-notfound">', esc_html__( 'No charts found', 'visualizer' ), '</div>';
130+
echo '</div>';
131+
echo '<div class="visualizer-chart-footer visualizer-clearfix">';
132+
echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';
133+
echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>';
134+
echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>';
135+
echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>';
136+
echo '<span class="visualizer-chart-shortcode">';
137+
echo '&nbsp;[visualizer]&nbsp;';
138+
echo '</span>';
139+
echo '</div>';
140+
echo '</div>';
141+
echo '</div>';
142+
echo '<div id="visualizer-sidebar">';
143+
echo '<div class="visualizer-sidebar-box">';
144+
echo '<h3>' . __( 'Upgrade to PRO', 'visualizer' ) . '</h3><ul>';
145+
echo '<li>' . __( 'Upgrade to PRO', 'visualizer' ) . '</li>';
146+
echo '<li>' . __( 'Upgrade to PRO', 'visualizer' ) . '</li>';
147+
echo '<li>' . __( 'Upgrade to PRO', 'visualizer' ) . '</li></ul>';
148+
echo '</div>';
157149
echo '</div>';
158150
}
159151
}
160152

161153
/**
162-
* Renders library page.
154+
* Renders chart's box block.
163155
*
164156
* @since 1.0.0
165157
*
166-
* @access protected
167-
*/
168-
protected function _toHTML() {
169-
echo '<div class="wrap">';
170-
echo '<div id="visualizer-icon" class="icon32"><br></div>';
171-
echo '<h2>';
172-
esc_html_e( 'Visualizer Library', 'visualizer' );
173-
echo ' <a href="javascript:;" class="add-new-h2">', esc_html__( 'Add New', 'visualizer' ), '</a>';
174-
echo '</h2>';
175-
176-
$this->_renderMessages();
177-
$this->_renderLibrary();
178-
echo '</div>';
179-
}
180-
181-
/**
182-
* Renders notification messages if need be.
183-
*
184-
* @since 1.4.2
185-
*
186158
* @access private
159+
*
160+
* @param string $placeholder_id The placeholder's id for the chart.
161+
* @param int $chart_id The id of the chart.
187162
*/
188-
private function _renderMessages() {
189-
if ( ! filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN ) ) {
190-
echo '<div class="updated error">';
191-
echo '<p>';
192-
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>' );
193-
echo '</p>';
194-
echo '</div>';
195-
}
163+
private function _renderChartBox( $placeholder_id, $chart_id ) {
164+
$ajax_url = admin_url( 'admin-ajax.php' );
165+
$delete_url = add_query_arg( array(
166+
'action' => Visualizer_Plugin::ACTION_DELETE_CHART,
167+
'nonce' => wp_create_nonce(),
168+
'chart' => $chart_id,
169+
), $ajax_url );
170+
$clone_url = add_query_arg( array(
171+
'action' => Visualizer_Plugin::ACTION_CLONE_CHART,
172+
'nonce' => wp_create_nonce( Visualizer_Plugin::ACTION_CLONE_CHART ),
173+
'chart' => $chart_id,
174+
'type' => $this->type,
175+
), $ajax_url );
176+
$export_link = add_query_arg( array(
177+
'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
178+
'chart' => $chart_id,
179+
'security' => wp_create_nonce( Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION ),
180+
), admin_url( 'admin-ajax.php' ) );
181+
echo '<div class="visualizer-chart">';
182+
echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">';
183+
echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
184+
echo '</div>';
185+
echo '<div class="visualizer-chart-footer visualizer-clearfix">';
186+
echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', 'visualizer' ), '" onclick="return showNotice.warn();"></a>';
187+
echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', 'visualizer' ), '"></a>';
188+
echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', 'visualizer' ), '" data-chart="', $chart_id, '"></a>';
189+
echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', 'visualizer' ), '" data-chart="', $export_link, '"></a>';
190+
echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">';
191+
echo '&nbsp;[visualizer id=&quot;', $chart_id, '&quot;]&nbsp;';
192+
echo '</span>';
193+
echo '</div>';
194+
echo '</div>';
196195
}
197196

198197
}

‎css/library.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
#visualizer-library {
2929
margin: 20px 0;
30+
width:80%;
31+
float:left;
3032
}
3133

3234
.loader {
@@ -144,3 +146,25 @@
144146
#visualizer-search form {
145147
text-align: right;
146148
}
149+
#visualizer-sidebar{
150+
width:20%;
151+
float:left;
152+
}
153+
154+
.visualizer-sidebar-box ul{
155+
list-style: circle;
156+
width:70%;
157+
}
158+
.visualizer-sidebar-box{
159+
160+
width: 95%;
161+
display: block;
162+
height: 200px;
163+
background: white;
164+
margin: 0px;
165+
margin-left:2.5%;
166+
padding: 0px;
167+
padding-top:10px;
168+
text-align: center;
169+
color:#0073aa;
170+
}

0 commit comments

Comments
 (0)