Merge remote branch 'origin/master'

This commit is contained in:
Pootle server
2010-10-09 16:40:10 +02:00
6 changed files with 33 additions and 44 deletions

View File

@@ -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()
}, 'top.frame_content'); // end $(document).ready()

View File

@@ -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);

View File

@@ -9,43 +9,17 @@ if (! defined('PHPMYADMIN')) {
}
$titles = array();
if (true == $cfg['PropertiesIconic']) {
$titles['Browse'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_browse.png" alt="' . __('Browse') . '" title="' . __('Browse') . '" />';
$titles['NoBrowse'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_browse.png" alt="' . __('Browse') . '" title="' . __('Browse') . '" />';
$titles['Search'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_select.png" alt="' . __('Search') . '" title="' . __('Search') . '" />';
$titles['NoSearch'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_select.png" alt="' . __('Search') . '" title="' . __('Search') . '" />';
$titles['Insert'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_insrow.png" alt="' . __('Insert') . '" title="' . __('Insert') . '" />';
$titles['NoInsert'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_insrow.png" alt="' . __('Insert') . '" title="' . __('Insert') . '" />';
$titles['Structure'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_props.png" alt="' . __('Structure') . '" title="' . __('Structure') . '" />';
$titles['Drop'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_drop.png" alt="' . __('Drop') . '" title="' . __('Drop') . '" />';
$titles['NoDrop'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_drop.png" alt="' . __('Drop') . '" title="' . __('Drop') . '" />';
$titles['Empty'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_empty.png" alt="' . __('Empty') . '" title="' . __('Empty') . '" />';
$titles['NoEmpty'] = '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_empty.png" alt="' . __('Empty') . '" title="' . __('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);
?>

View File

@@ -102,7 +102,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
}
if ($include_box) {
$button .= '<div class="nowrap">';
$button .= '<span class="nowrap">';
}
if ($include_icon) {
@@ -120,7 +120,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
}
if ($include_box) {
$button .= '</div>';
$button .= '</span>';
}
return $button;

View File

@@ -610,6 +610,10 @@ td.disabled {
background-color: #cccccc;
}
.nowrap {
white-space: nowrap;
}
/**
* login form
*/

View File

@@ -585,6 +585,10 @@ td.disabled {
background-color: #cccccc;
}
.nowrap {
white-space: nowrap;
}
/**
* login form
*/