Skip to content

Fix filter broken layout #943

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
vytisbulkevicius merged 1 commit into from
Oct 12, 2022
Merged

Fix filter broken layout #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion classes/Visualizer/Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ protected function get_inline_custom_css( $id, $settings ) {
}

$img_path = VISUALIZER_ABSURL . 'images';
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}";
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}";
$css .= '</style>';

$arguments = array( $css, $settings );
Expand Down
7 changes: 7 additions & 0 deletions classes/Visualizer/Module/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,13 @@ public function renderLibraryPage() {
$settings = $arguments[1];
}

if ( isset( $settings['controls']['ui']['labelStacking'] ) ) {
unset( $settings['controls']['ui']['labelStacking'] );
}
if ( isset( $settings['controls']['ui']['orientation'] ) ) {
unset( $settings['controls']['ui']['orientation'] );
}

// add chart to the array
$charts[ $id ] = array(
'id' => $chart->ID,
Expand Down
19 changes: 16 additions & 3 deletions css/frame.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,23 @@
}
#control_wrapper_canvas:not(:empty) {
margin: 15px 0 0 5px;
position: relative;
z-index: 1;
}
#control_wrapper_canvas:not(:empty) + #canvas .google-visualization-table {
top: 60px;
}
.vz-vertical .google-visualization-table {
left: 70px;
}
.google-visualization-controls-categoryfilter label.google-visualization-controls-label {
vertical-align: middle;
}
.google-visualization-controls-categoryfilter li.goog-inline-block {
margin: 0 0.2em;
}
#control_wrapper_canvas:not(:empty) + #canvas {
top: 55px;
left: 50px;
.google-visualization-controls-categoryfilter li {
padding: 0 0.2em;
}
.goog-combobox input {
min-height: auto;
Expand Down
11 changes: 11 additions & 0 deletions js/render-google.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ var chartWrapperError = [];
});

if ( withControlMode ) {
// alert( chart.is_library_page );
// Create a control wrapper, passing some options.
var controlWrapper = new gv.ControlWrapper( {
containerId: 'control_wrapper_' + id,
Expand All @@ -410,6 +411,16 @@ var chartWrapperError = [];
render.setOptions(settings);
chartWrapper.bind(controlWrapper, render);
chartWrapper.draw(table);

gv.events.addListener(controlWrapper, 'ready', function ( err ) {
if ( 'vertical' === settings.controls.ui.orientation ) {
if ( 'canvas' === id ) {
jQuery( '#' + id ).addClass( 'vz-vertical' );
}
} else {
jQuery( '#' + id ).removeClass( 'vz-vertical' );
}
});
} else {
$('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
render.draw(table, settings);
Expand Down