nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where non-footnote notices were being hidden; footnotes given their own div classes

Browse Source
This commit is contained in:
lorilee
2010-07-16 00:09:58 -07:00
parent b63b7552d0
commit 7b46075360
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/tooltip.js
View File

@@ -217,7 +217,10 @@ function mouseMove(e) {
$(document).ready(function() { $(document).ready(function() {
// Hide the footnotes from the footer (which are displayed for // Hide the footnotes from the footer (which are displayed for
// JavaScript-disabled browsers) since the tooltip is sufficient // JavaScript-disabled browsers) since the tooltip is sufficient
$(".notice").hide(); $(".footnotes").hide();
// The border and padding must be removed otherwise a thin yellow box remains visible
$(".footnotes").css("border", "none");
$(".footnotes").css("padding", "0px");
// Replace the superscripts with the help icon // Replace the superscripts with the help icon
$("sup[class='footnotemarker']").remove(); $("sup[class='footnotemarker']").remove();
$("img[class='footnotemarker']").show(); $("img[class='footnotemarker']").show();

2
libraries/footer.inc.php
View File

@@ -68,7 +68,7 @@ if ($GLOBALS['error_handler']->hasDisplayErrors()) {
} }
if (count($GLOBALS['footnotes'])) { if (count($GLOBALS['footnotes'])) {
echo '<div class="notice">'; echo '<div class="footnotes">';
foreach ($GLOBALS['footnotes'] as $footnote) { foreach ($GLOBALS['footnotes'] as $footnote) {
echo '<span id="footnote_' . $footnote['nr'] . '"><sup>' echo '<span id="footnote_' . $footnote['nr'] . '"><sup>'
. $footnote['nr'] . '</sup> ' . $footnote['note'] . '</span><br />'; . $footnote['nr'] . '</sup> ' . $footnote['note'] . '</span><br />';

9
themes/original/css/theme_right.css.php
View File

@@ -387,7 +387,8 @@ div.error h1 {
div.success, div.success,
div.notice, div.notice,
div.warning, div.warning,
div.error { div.error,
div.footnotes {
margin: 0.3em 0 0 0; margin: 0.3em 0 0 0;
border: 2px solid; border: 2px solid;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
@@ -419,12 +420,13 @@ div.success {
border-color: #00FF00; border-color: #00FF00;
} }
.notice { .notice, .footnotes {
color: #000000; color: #000000;
background-color: #FFFFDD; background-color: #FFFFDD;
} }
h1.notice, h1.notice,
div.notice { div.notice,
div.footnotes {
border-color: #FFD700; border-color: #FFD700;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png); background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
@@ -488,6 +490,7 @@ fieldset.confirmation legend {
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
} }
/* end messageboxes */ /* end messageboxes */