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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-08-26 20:40:07 +02:00
commit 5908a4aced
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/common.lib.php
View File

@ -1721,14 +1721,15 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
*
* @param array $tabs one element per tab
* @param string $url_params
* @param string $base_dir
* @param string $menu_id
*
* @return string html-code for tab-navigation
*/
function PMA_generate_html_tabs($tabs, $url_params, $base_dir='')
function PMA_generate_html_tabs($tabs, $url_params, $base_dir='', $menu_id='topmenu')
{
$tag_id = 'topmenu';
$tab_navigation = '<div id="' . htmlentities($tag_id) . 'container">' . "\n"
.'<ul id="' . htmlentities($tag_id) . '">' . "\n";
$tab_navigation = '<div id="' . htmlentities($menu_id) . 'container" class="menucontainer">'
.'<ul id="' . htmlentities($menu_id) . '">';
foreach ($tabs as $tab) {
$tab_navigation .= PMA_generate_html_tab($tab, $url_params, $base_dir);

2
tbl_select.php
View File

@ -78,7 +78,7 @@ $url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params);
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
?>

2
tbl_zoom_select.php
View File

@ -92,7 +92,7 @@ if (! isset($zoom_submit) && ! isset($inputs)) {
$url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params);
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
/**
* Set the field name,type,collation and whether null on select of a coulmn

2
themes/pmahomme/css/theme_right.css.php
View File

@ -966,7 +966,7 @@ ul#topmenu li, ul#topmenu2 li {
vertical-align:-3px;
}
#topmenucontainer{
.menucontainer{
background:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>tab_bg.png) repeat-x;
border-top:1px solid #aaa;
}