Skip to content

Commit ae65434

Browse files
selulselul
authored
Merge pull request #121 from contactashish13/development
remove footer banner #120
2 parents 9bb055d + 3ab5474 commit ae65434

File tree

8 files changed

+65
-84
lines changed

8 files changed

+65
-84
lines changed

‎classes/Visualizer/Module/Admin.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,20 @@ public function __construct( Visualizer_Plugin $plugin ) {
7474
*/
7575
public static function _getChartTypesLocalized() {
7676
$types = array(
77-
'all' => esc_html__( 'All', 'visualizer' ),
78-
'pie' => esc_html__( 'Pie', 'visualizer' ),
79-
'line' => esc_html__( 'Line', 'visualizer' ),
80-
'area' => esc_html__( 'Area', 'visualizer' ),
81-
'geo' => esc_html__( 'Geo', 'visualizer' ),
82-
'bar' => esc_html__( 'Bar', 'visualizer' ),
83-
'column' => esc_html__( 'Column', 'visualizer' ),
84-
'gauge' => esc_html__( 'Gauge', 'visualizer' ),
85-
'scatter' => esc_html__( 'Scatter', 'visualizer' ),
86-
'candlestick' => esc_html__( 'Candlestick', 'visualizer' ),
77+
'all' => array( 'name' => esc_html__( 'All', 'visualizer' ), 'enabled' => true ),
78+
'pie' => array( 'name' => esc_html__( 'Pie', 'visualizer' ), 'enabled' => true ),
79+
'line' => array( 'name' => esc_html__( 'Line', 'visualizer' ), 'enabled' => true ),
80+
'area' => array( 'name' => esc_html__( 'Area', 'visualizer' ), 'enabled' => true ),
81+
'geo' => array( 'name' => esc_html__( 'Geo', 'visualizer' ), 'enabled' => true ),
82+
'bar' => array( 'name' => esc_html__( 'Bar', 'visualizer' ), 'enabled' => true ),
83+
'column' => array( 'name' => esc_html__( 'Column', 'visualizer' ), 'enabled' => true ),
84+
'gauge' => array( 'name' => esc_html__( 'Gauge', 'visualizer' ), 'enabled' => true ),
85+
'scatter' => array( 'name' => esc_html__( 'Scatter', 'visualizer' ), 'enabled' => true ),
86+
'candlestick' => array( 'name' => esc_html__( 'Candlestick', 'visualizer' ), 'enabled' => true ),
87+
// pro types
88+
'table' => array( 'name' => esc_html__( 'Table', 'visualizer' ), 'enabled' => false ),
89+
'timeline' => array( 'name' => esc_html__( 'Timeline', 'visualizer' ), 'enabled' => false ),
90+
'combo' => array( 'name' => esc_html__( 'Combo', 'visualizer' ), 'enabled' => false ),
8791
);
8892

8993
$types = apply_filters( 'visualizer_pro_chart_types', $types );

‎classes/Visualizer/Module/Chart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private function _handleTypesPage() {
300300

301301
$render = new Visualizer_Render_Page_Types();
302302
$render->type = get_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
303-
$render->types = Visualizer_Plugin::getChartTypes();
303+
$render->types = Visualizer_Module_Admin::_getChartTypesLocalized();
304304
$render->chart = $this->_chart;
305305

306306
wp_enqueue_style( 'visualizer-frame' );

‎classes/Visualizer/Render/Library.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,19 @@ private function _renderLibrary() {
9898
// Added by Ash/Upwork
9999
echo '<div id="visualizer-types" class="visualizer-clearfix">';
100100
echo '<ul>';
101-
foreach ( $this->types as $type => $label ) {
101+
foreach ( $this->types as $type => $array ) {
102+
$label = $array['name'];
103+
$link = '<a class="page-numbers" href="' . esc_url( add_query_arg( array( 'type' => $type, 'vpage' => false ) ) ) . '">';
104+
if ( ! $array['enabled'] ) {
105+
$link = "<a class='pro-upsell page-numbers' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
106+
}
102107
echo '<li class="visualizer-list-item">';
103108
if ( $type == $this->type ) {
104109
echo '<a class="page-numbers current" href="', esc_url( add_query_arg( 'vpage', false ) ), '">';
105110
echo $label;
106111
echo '</a>';
107112
} else {
108-
echo '<a class="page-numbers" href="', esc_url( add_query_arg( array( 'type' => $type, 'vpage' => false ) ) ), '">';
113+
echo $link;
109114
echo $label;
110115
echo '</a>';
111116
}

‎classes/Visualizer/Render/Page/Types.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,19 @@ protected function _toHTML() {
5353
*/
5454
protected function _renderContent() {
5555
echo '<div id="type-picker">';
56-
foreach ( $this->types as $type ) {
56+
foreach ( $this->types as $type => $array ) {
5757
echo '<div class="type-box type-box-', $type, '">';
58+
if ( ! $array['enabled'] ) {
59+
echo "<a class='pro-upsell' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
60+
}
5861
echo '<label class="type-label', $type == $this->type ? ' type-label-selected' : '', '">';
62+
if ( $array['enabled'] ) {
5963
echo '<input type="radio" class="type-radio" name="type" value="', $type, '"', checked( $type, $this->type, false ), '>';
64+
}
6065
echo '</label>';
66+
if ( ! $array['enabled'] ) {
67+
echo '</a>';
68+
}
6169
echo '</div>';
6270
}
6371
echo '</div>';
@@ -82,11 +90,6 @@ protected function _renderSidebar() {}
8290
protected function _renderToolbar() {
8391
if ( defined( 'Visualizer_Pro' ) ) {
8492
global $Visualizer_Pro;
85-
} else {
86-
echo "<a class='pro-upsell' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
87-
echo "<span class='dashicons dashicons-plus-alt'></span>";
88-
echo esc_html( 'Three Additional Chart Types Available in the Pro Version ( Table, Timeline and Combo Chart ) ', 'visualizer' );
89-
echo '</a>';
9093
}
9194
echo '<input type="submit" class="button button-primary button-large push-right" value="', esc_attr__( 'Next', 'visualizer' ), '">';
9295
}

‎classes/Visualizer/Render/Sidebar.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ protected function _renderFormatField( $index = 0 ) {
526526
esc_html__( 'Number Format', 'visualizer' ),
527527
'series[' . $index . '][format]',
528528
isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '',
529-
sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU pattern set%1$s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use &#37; percentage format then your values will be multiplied by 100.', 'visualizer' ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ),
529+
sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU pattern set%2$s. Use something like #,### to get 1,234 as output, or $# to add dollar sign before digits. Pay attention that if you use &#37; percentage format then your values will be multiplied by 100.', 'visualizer' ), '<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">', '</a>' ),
530530
'#,###.##'
531531
);
532532
break;
@@ -537,7 +537,7 @@ protected function _renderFormatField( $index = 0 ) {
537537
esc_html__( 'Date Format', 'visualizer' ),
538538
'series[' . $index . '][format]',
539539
isset( $this->series[ $index ]['format'] ) ? $this->series[ $index ]['format'] : '',
540-
sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU date and time format%1$s.', 'visualizer' ), '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ),
540+
sprintf( esc_html__( 'Enter custom format pattern to apply to this series value, similar to the %1$sICU date and time format%2$s.', 'visualizer' ), '<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">', '</a>' ),
541541
'eeee, dd LLLL yyyy'
542542
);
543543
break;

‎classes/Visualizer/Source.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@ public function getRawData() {
118118
*/
119119
protected function _normalizeData( $data ) {
120120
// normalize values
121-
// print_r($data);
121+
// error_log(print_r($data,true));
122122
foreach ( $this->_series as $i => $series ) {
123123
// if no value exists for the seires, then add null
124124
if ( ! isset( $data[ $i ] ) ) {
125125
$data[ $i ] = null;
126126
}
127127

128-
if ( is_null( $data[ $i ] ) && ! is_numeric( $data[ $i ] ) ) {
128+
if ( is_null( $data[ $i ] ) ) {
129129
continue;
130130
}
131131

132132
switch ( $series['type'] ) {
133133
case 'number':
134-
$data[ $i ] = ( is_numeric( $data[ $i ] ) ) ? floatval( $data[ $i ] ) : null;
134+
$data[ $i ] = ( is_numeric( $data[ $i ] ) ) ? floatval( $data[ $i ] ) : (is_numeric( str_replace( ',', '', $data[ $i ] ) ) ? floatval( str_replace( ',', '', $data[ $i ] ) ) : null);
135135
break;
136136
case 'boolean':
137137
$data[ $i ] = ! empty( $data[ $i ] ) ? filter_validate( $data[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
@@ -149,6 +149,7 @@ protected function _normalizeData( $data ) {
149149
break;
150150
}
151151
}
152+
// error_log(print_r($data,true));
152153
return $data;
153154
}
154155

‎css/frame.css

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -419,50 +419,6 @@ div.group-content .group-description {
419419
background-position: -597px -670px;
420420
}
421421

422-
a.pro-upsell {
423-
display: -webkit-box;
424-
display: -webkit-flex;
425-
display: -ms-flexbox;
426-
display: flex;
427-
position: relative;
428-
top: 10px;
429-
height: 20px;
430-
margin: 0;
431-
padding: 10px 20px;
432-
border: 1px solid #2c80d6;
433-
border-radius: 50px;
434-
background-color: #4285f4;
435-
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
436-
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
437-
text-decoration: none;
438-
-webkit-transition: all 0.5s ease-in;
439-
transition: all 0.5s ease-in;
440-
441-
-webkit-align-items: center;
442-
align-items: center;
443-
-webkit-box-align: center;
444-
-ms-flex-align: center;
445-
}
446-
447-
a.pro-upsell:hover {
448-
background-color: #5a95f5;
449-
-webkit-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
450-
box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15);
451-
}
452-
453-
a.pro-upsell span {
454-
display: inline-block;
455-
margin-right: 10px;
456-
color: #fff;
457-
}
458-
459-
a.pro-upsell {
460-
display: inline;
461-
color: #fff;
462-
font-size: 13px;
463-
font-weight: bold;
464-
}
465-
466422
/******************************************************************************/
467423
/******************************** OTHER STYLES ******************************/
468424
/******************************************************************************/

‎languages/visualizer.pot

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the GPL v2.0 or later.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Visualizer: Charts and Graphs Lite 1.7.1\n"
5+
"Project-Id-Version: Visualizer: Charts and Graphs Lite 1.7.2\n"
66
"Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
7-
"POT-Creation-Date: 2016-11-23 13:55:43+00:00\n"
7+
"POT-Creation-Date: 2016-12-09 13:24:51+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -64,32 +64,44 @@ msgstr ""
6464
msgid "Candlestick"
6565
msgstr ""
6666

67-
#: classes/Visualizer/Module/Admin.php:136
67+
#: classes/Visualizer/Module/Admin.php:88
68+
msgid "Table"
69+
msgstr ""
70+
71+
#: classes/Visualizer/Module/Admin.php:89
72+
msgid "Timeline"
73+
msgstr ""
74+
75+
#: classes/Visualizer/Module/Admin.php:90
76+
msgid "Combo"
77+
msgstr ""
78+
79+
#: classes/Visualizer/Module/Admin.php:140
6880
msgid "Visualizations"
6981
msgstr ""
7082

71-
#: classes/Visualizer/Module/Admin.php:139
83+
#: classes/Visualizer/Module/Admin.php:143
7284
msgid "From Library"
7385
msgstr ""
7486

75-
#: classes/Visualizer/Module/Admin.php:140
87+
#: classes/Visualizer/Module/Admin.php:144
7688
msgid "Create New"
7789
msgstr ""
7890

79-
#: classes/Visualizer/Module/Admin.php:218
80-
#: classes/Visualizer/Render/Library.php:163
91+
#: classes/Visualizer/Module/Admin.php:222
92+
#: classes/Visualizer/Render/Library.php:168
8193
msgid "Visualizer Library"
8294
msgstr ""
8395

84-
#: classes/Visualizer/Module/Admin.php:342
96+
#: classes/Visualizer/Module/Admin.php:346
8597
msgid "Library"
8698
msgstr ""
8799

88-
#: classes/Visualizer/Module/Admin.php:365
100+
#: classes/Visualizer/Module/Admin.php:369
89101
msgid "Knowledge Base"
90102
msgstr ""
91103

92-
#: classes/Visualizer/Module/Admin.php:370
104+
#: classes/Visualizer/Module/Admin.php:374
93105
msgid "Pro Addon"
94106
msgstr ""
95107

@@ -149,16 +161,16 @@ msgstr ""
149161
msgid "Search"
150162
msgstr ""
151163

152-
#: classes/Visualizer/Render/Library.php:135
164+
#: classes/Visualizer/Render/Library.php:140
153165
#: classes/Visualizer/Render/Templates.php:85
154166
msgid "No charts found"
155167
msgstr ""
156168

157-
#: classes/Visualizer/Render/Library.php:164
169+
#: classes/Visualizer/Render/Library.php:169
158170
msgid "Add New"
159171
msgstr ""
160172

161-
#: classes/Visualizer/Render/Library.php:183
173+
#: classes/Visualizer/Render/Library.php:188
162174
msgid ""
163175
"%s option is disabled in your php.ini config. Please, enable it by change "
164176
"its value to 1. This option increases the speed of remote CSV uploading."
@@ -202,7 +214,7 @@ msgstr ""
202214
msgid "Back"
203215
msgstr ""
204216

205-
#: classes/Visualizer/Render/Page/Types.php:91
217+
#: classes/Visualizer/Render/Page/Types.php:94
206218
msgid "Next"
207219
msgstr ""
208220

@@ -1306,7 +1318,7 @@ msgstr ""
13061318
#: classes/Visualizer/Render/Sidebar.php:529
13071319
msgid ""
13081320
"Enter custom format pattern to apply to this series value, similar to the "
1309-
"%1$sICU pattern set%1$s. Use something like #,### to get 1,234 as output, "
1321+
"%1$sICU pattern set%2$s. Use something like #,### to get 1,234 as output, "
13101322
"or $# to add dollar sign before digits. Pay attention that if you use &#37; "
13111323
"percentage format then your values will be multiplied by 100."
13121324
msgstr ""
@@ -1318,7 +1330,7 @@ msgstr ""
13181330
#: classes/Visualizer/Render/Sidebar.php:540
13191331
msgid ""
13201332
"Enter custom format pattern to apply to this series value, similar to the "
1321-
"%1$sICU date and time format%1$s."
1333+
"%1$sICU date and time format%2$s."
13221334
msgstr ""
13231335

13241336
#: classes/Visualizer/Render/Templates.php:69

0 commit comments

Comments
 (0)