From 7d0c11c2568998b8ff64c158b2485457c165179d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Oct 2010 09:05:54 -0400 Subject: [PATCH 1/3] class nowrap was missing; div not allowed here --- libraries/common.lib.php | 4 ++-- themes/darkblue_orange/css/theme_right.css.php | 4 ++++ themes/original/css/theme_right.css.php | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 846016919..e91eab163 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -102,7 +102,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f } if ($include_box) { - $button .= '
'; + $button .= ''; } if ($include_icon) { @@ -120,7 +120,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f } if ($include_box) { - $button .= '
'; + $button .= ''; } return $button; diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index f828fa2dd..b2dafa05e 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -610,6 +610,10 @@ td.disabled { background-color: #cccccc; } +.nowrap { + white-space: nowrap; +} + /** * login form */ diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index c04bedb56..9a8e6d1e5 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -585,6 +585,10 @@ td.disabled { background-color: #cccccc; } +.nowrap { + white-space: nowrap; +} + /** * login form */ From 1406bd83b045e3e195b379ffb02848dd4ca7d7e1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Oct 2010 09:33:57 -0400 Subject: [PATCH 2/3] use PMA_getIcon() --- libraries/build_action_titles.inc.php | 50 +++++++-------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/libraries/build_action_titles.inc.php b/libraries/build_action_titles.inc.php index e9da5f65f..fe9dd5ffa 100644 --- a/libraries/build_action_titles.inc.php +++ b/libraries/build_action_titles.inc.php @@ -9,43 +9,17 @@ if (! defined('PHPMYADMIN')) { } $titles = array(); -if (true == $cfg['PropertiesIconic']) { - $titles['Browse'] = '' . __('Browse') . ''; - $titles['NoBrowse'] = '' . __('Browse') . ''; - $titles['Search'] = '' . __('Search') . ''; - $titles['NoSearch'] = '' . __('Search') . ''; - $titles['Insert'] = '' . __('Insert') . ''; - $titles['NoInsert'] = '' . __('Insert') . ''; - $titles['Structure'] = '' . __('Structure') . ''; - $titles['Drop'] = '' . __('Drop') . ''; - $titles['NoDrop'] = '' . __('Drop') . ''; - $titles['Empty'] = '' . __('Empty') . ''; - $titles['NoEmpty'] = '' . __('Empty') . ''; - if ('both' === $cfg['PropertiesIconic']) { - $titles['Browse'] .= __('Browse'); - $titles['Search'] .= __('Search'); - $titles['NoBrowse'] .= __('Browse'); - $titles['NoSearch'] .= __('Search'); - $titles['Insert'] .= __('Insert'); - $titles['NoInsert'] .= __('Insert'); - $titles['Structure'] .= __('Structure'); - $titles['Drop'] .= __('Drop'); - $titles['NoDrop'] .= __('Drop'); - $titles['Empty'] .= __('Empty'); - $titles['NoEmpty'] .= __('Empty'); - } -} else { - $titles['Browse'] = __('Browse'); - $titles['Search'] = __('Search'); - $titles['NoBrowse'] = __('Browse'); - $titles['NoSearch'] = __('Search'); - $titles['Insert'] = __('Insert'); - $titles['NoInsert'] = __('Insert'); - $titles['Structure'] = __('Structure'); - $titles['Drop'] = __('Drop'); - $titles['NoDrop'] = __('Drop'); - $titles['Empty'] = __('Empty'); - $titles['NoEmpty'] = __('Empty'); -} +$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'), true); +$titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse'), true); +$titles['Search'] = PMA_getIcon('b_select.png', __('Search'), true); +$titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search'), true); +$titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert'), true); +$titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert'), true); +$titles['Structure'] = PMA_getIcon('b_props.png', __('Structure'), true); +$titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true); +$titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true); +$titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true); +$titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true); + ?> From e3e0b2ef99b1f4b2872fc1e51778803675f8b41d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Oct 2010 10:23:06 -0400 Subject: [PATCH 3/3] refresh navi frame after table creation in a non-empty db; also refresh after table drop via drop link --- js/db_structure.js | 6 +++++- js/functions.js | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 8e658fb8d..611dd9217 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -93,6 +93,10 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.message); //need to find a better solution here. The icon should be replaced $(curr_row).hide("medium").remove(); + + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); @@ -221,4 +225,4 @@ $(document).ready(function() { return false; }) //end Calculate Real End for InnoDB -}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); // end $(document).ready() diff --git a/js/functions.js b/js/functions.js index 57bbd882c..3a53acecf 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2041,7 +2041,6 @@ $(document).ready(function() { * * @uses PMA_ajaxShowMessage() * @uses $.PMA_sort_table() - * @uses window.parent.refreshNavigation() * */ // .live() must be called after a selector, see http://api.jquery.com/live @@ -2098,7 +2097,9 @@ $(document).ready(function() { $(tables_table).PMA_sort_table('th'); //Refresh navigation frame as a new table has been added - window.parent.refreshNavigation(); + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } } else { PMA_ajaxShowMessage(data.error); @@ -2200,7 +2201,9 @@ $(document).ready(function() { .end() .after(data.sql_query); window.parent.table = ''; - window.parent.refreshNavigation(); + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } } else { PMA_ajaxShowMessage(data.error);