Skip to content
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.

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

Jump to bottom

Remove inline styles from elements with id='serverstatusquerieschart_… #12823

Merged
merged 7 commits into from Jan 18, 2017
Merged

Remove inline styles from elements with id='serverstatusquerieschart_… #12823

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3899dd
Remove inline styles from elements with id='serverstatusquerieschart_…
clancelotti Dec 17, 2016
3330e4a
Remove unnecessary div and move data attibute to serverstatusqueriesc…
clancelotti Dec 22, 2016
059a43b
Adjust the test to new output
clancelotti Dec 24, 2016
0972666
Fix the problem of chart is not rendered
clancelotti Jan 8, 2017
d3d973f
Merge branch 'master' into issue_12262
clancelotti Jan 8, 2017
2c11b65
Exchange jQuery.parseJSON() for JSON.parse()
clancelotti Jan 8, 2017
f683adf
Merge branch 'issue_12262' of https://github.com/clancelotti/phpmyadm…
clancelotti Jan 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/server_status_queries.lib.php
View file
Open in desktop
Expand Up @@ -135,7 +135,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
$retval .= '</table>';

$retval .= '<div id="serverstatusquerieschart"></div>';
$retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
$retval .= '<div id="serverstatusquerieschart_data">';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO in this particular case the div should be rather removed and the data moved to data attribute of serverstatusquerieschart div.

if ($other_sum > 0) {
$chart_json[__('Other')] = $other_sum;
}
Expand Down
4 changes: 4 additions & 0 deletions themes/original/css/common.css.php
View file
Open in desktop
Expand Up @@ -1642,6 +1642,10 @@
vertical-align: baseline;
}

#serverstatusquerieschart_data {
display: none;
}

#popup_background {
display: none;
position: fixed;
Expand Down
4 changes: 4 additions & 0 deletions themes/pmahomme/css/common.css.php
View file
Open in desktop
Expand Up @@ -2140,6 +2140,10 @@
vertical-align: baseline;
}

#serverstatusquerieschart_data {
display: none;
}

#popup_background {
display: none;
position: fixed;
Expand Down