Skip to content

Add new setting fields #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selul merged 3 commits into from
May 25, 2021
Merged

Add new setting fields #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c48ba5
Add license and creator setting fields #794
girishpanchal30 May 3, 2021
674bae8
Merge branch 'development' of https://github.com/Codeinwp/visualizer …
girishpanchal30 May 5, 2021
5a7d760
Add description and license / creator setting fields #794
girishpanchal30 May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion classes/Visualizer/Module/Frontend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,48 @@ private function addSchema( $id ) {
return '';
}

$license = '';
if ( isset( $settings['license'] ) && ! empty( $settings['license'] ) ) {
$license = $settings['license'];
if ( is_array( $license ) ) {
$license = $settings['license']['text'];
}
}
$license = apply_filters( 'visualizer_schema_license', $license, $id );
if ( empty( $license ) ) {
if ( $show_errors ) {
return "<!-- Not showing structured data for chart $id because license is empty -->";
}
return '';
}

$creator = '';
if ( isset( $settings['creator'] ) && ! empty( $settings['creator'] ) ) {
$creator = $settings['creator'];
if ( is_array( $creator ) ) {
$creator = $settings['creator']['text'];
}
}
$creator = apply_filters( 'visualizer_schema_creator', $creator, $id );
if ( empty( $creator ) ) {
if ( $show_errors ) {
return "<!-- Not showing structured data for chart $id because creator is empty -->";
}
return '';
}

$schema = apply_filters(
'visualizer_schema',
'{
"@context":"https://schema.org/",
"@type":"Dataset",
"name":"' . esc_html( $title ) . '",
"description":"' . esc_html( $desc ) . '"
"description":"' . esc_html( $desc ) . '",
"license": "' . esc_html( $license ) . '",
"creator": {
"@type": "Person",
"name": "' . esc_html( $creator ) . '"
}
}',
$id
);
Expand Down
14 changes: 14 additions & 0 deletions classes/Visualizer/Render/Sidebar/ChartJS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,20 @@ protected function _renderGeneralSettings() {

$this->_renderAnimationSettings();

self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
self::_renderTextItem(
esc_html__( 'License', 'visualizer' ),
'license',
$this->license,
''
);
self::_renderTextItem(
esc_html__( 'Creator', 'visualizer' ),
'creator',
$this->creator,
''
);
self::_renderSectionEnd();
self::_renderGroupEnd();
}

Expand Down
15 changes: 14 additions & 1 deletion classes/Visualizer/Render/Sidebar/Google.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,20 @@ protected function _renderGeneralSettings() {
self::_renderSectionEnd();

$this->_renderAnimationSettings();

self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
self::_renderTextItem(
esc_html__( 'License', 'visualizer' ),
'license',
$this->license,
''
);
self::_renderTextItem(
esc_html__( 'Creator', 'visualizer' ),
'creator',
$this->creator,
''
);
self::_renderSectionEnd();
do_action( 'visualizer_chart_settings', get_class( $this ), $this->_data, 'general', array( 'generic' => true ) );

self::_renderGroupEnd();
Expand Down
22 changes: 22 additions & 0 deletions classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Gauge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,28 @@ protected function _renderGeneralSettings() {
$this->title,
esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
);

self::_renderTextAreaItem(
esc_html__( 'Chart Description', 'visualizer' ),
'description',
$this->description,
sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
);
self::_renderSectionEnd();

self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
self::_renderTextItem(
esc_html__( 'License', 'visualizer' ),
'license',
$this->license,
''
);
self::_renderTextItem(
esc_html__( 'Creator', 'visualizer' ),
'creator',
$this->creator,
''
);
self::_renderSectionEnd();

self::_renderGroupEnd();
Expand Down
21 changes: 21 additions & 0 deletions classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Geo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,27 @@ protected function _renderGeneralSettings() {
$this->title,
esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
);
self::_renderTextAreaItem(
esc_html__( 'Chart Description', 'visualizer' ),
'description',
$this->description,
sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
);
self::_renderSectionEnd();

self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
self::_renderTextItem(
esc_html__( 'License', 'visualizer' ),
'license',
$this->license,
''
);
self::_renderTextItem(
esc_html__( 'Creator', 'visualizer' ),
'creator',
$this->creator,
''
);
self::_renderSectionEnd();
self::_renderGroupEnd();
}
Expand Down
22 changes: 21 additions & 1 deletion classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Tabular.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,28 @@ protected function _renderGeneralSettings() {
$this->title,
esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
);
self::_renderTextAreaItem(
esc_html__( 'Chart Description', 'visualizer' ),
'description',
$this->description,
sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
);
self::_renderSectionEnd();
self::_renderGroupEnd();

self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
self::_renderTextItem(
esc_html__( 'License', 'visualizer' ),
'license',
$this->license,
''
);
self::_renderTextItem(
esc_html__( 'Creator', 'visualizer' ),
'creator',
$this->creator,
''
);
self::_renderGroupEnd();
}

/**
Expand Down