diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | js/pmd/move.js | 12 | ||||
| -rw-r--r-- | libraries/db_designer.lib.php | 6 | ||||
| -rw-r--r-- | themes/original/css/common.css.php | 4 | ||||
| -rw-r--r-- | themes/pmahomme/css/pmd.css.php | 6 |
5 files changed, 22 insertions, 8 deletions
@@ -31,6 +31,8 @@ phpMyAdmin - ChangeLog 4.4.5.0 (not yet released) - bug Table overhead stats: missing space before the unit +- bug Fix resize icon in Designer +- bug #4879 Exit fullscreen in Designer does not change the button text 4.4.4.0 (2015-04-26) - bug #4863 Edit vs Change diff --git a/js/pmd/move.js b/js/pmd/move.js index 96b9c2acc2..31ad5557e2 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -26,7 +26,10 @@ AJAX.registerOnload('pmd/move.js', function () { if (! $.FullScreen.isFullScreen()) { $('#page_content').removeClass('content_fullscreen') .css({'width': 'auto', 'height': 'auto'}); - $('#toggleFullscreen').show(); + var $img = $('#toggleFullscreen img'); + $img.attr('src', $img.data('enter')); + var $span = $img.siblings('span'); + $span.text($span.data('enter')); } }); } else { @@ -520,16 +523,17 @@ function Rect(x1, y1, w, h, color) //--------------------------- FULLSCREEN ------------------------------------- function Toggle_fullscreen() { - var button = $('#toggleFullscreen').children().last(); + var $img = $('#toggleFullscreen img'); + var $span = $img.siblings('span'); if (! $.FullScreen.isFullScreen()) { - button.html(button.attr('data-exit')); + $img.attr('src', $img.data('exit')) + $span.text($span.data('exit')); $('#page_content') .addClass('content_fullscreen') .css({'width': screen.width - 5, 'height': screen.height - 5}) .requestFullScreen(); } if ($.FullScreen.isFullScreen()) { - button.html(button.attr('data-enter')); $.FullScreen.cancelFullScreen(); } } diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 2d1caa8932..92fd4c39f1 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -262,7 +262,11 @@ function PMA_getDesignerPageMenu($visualBuilder, $selected_page) $html .= '<a href="#" id="toggleFullscreen" class="M_butt" target="_self">'; $html .= '<img class="' . $iconClass . '" title="' . __('View in fullscreen') . '" alt="" src="' - . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png') . '" />'; + . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png') . '" ' + . 'data-enter="' + . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png') . '" ' + . 'data-exit="' + . $_SESSION['PMA_Theme']->getImgPath('pmd/exitFullscreen.png') . '" />'; $html .= '<span class="' . $textClass . '" data-exit="' . __('Exit fullscreen'); $html .= '" data-enter="' . __('View in fullscreen') . '">' . __('View in fullscreen') . '</span>'; diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 730de22e33..502d812191 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -181,6 +181,10 @@ button { margin-<?php echo $right; ?>: 1em; } +.floatright { + float: <?php echo $right; ?>; +} + table.nospacing { border-spacing: 0; } diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php index 7292760320..328687ef11 100644 --- a/themes/pmahomme/css/pmd.css.php +++ b/themes/pmahomme/css/pmd.css.php @@ -387,11 +387,11 @@ a.M_butt:hover { #layer_menu_sizer { background-image: url(<?php echo $resizeImg; ?>); - cursor: ne-resize; + cursor: e-resize; } -.left #layer_menu_sizer { - cursor: nw-resize; +#layer_menu_sizer .icon { + margin: 0; } .panel { |