[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17322-ga06d689

[Marc Delisle]

The branch, master has been updated
       via  a06d689598baca6a29db3ea071d800cbf4182b6d (commit)
      from  4915f2be232bc59ccb803abaae41ae80df260b56 (commit)


- Log -----------------------------------------------------------------
commit a06d689598baca6a29db3ea071d800cbf4182b6d
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Aug 26 12:47:20 2011 -0400

    Avoid duplicate ids

-----------------------------------------------------------------------

Summary of changes:
 libraries/common.lib.php                |    9 +++++----
 tbl_select.php                          |    2 +-
 tbl_zoom_select.php                     |    2 +-
 themes/pmahomme/css/theme_right.css.php |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 11f9f32..dc7d152 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -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);
diff --git a/tbl_select.php b/tbl_select.php
index abda399..f2eb2d7 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -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');
 
 ?>
 
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index c5eebcd..2b603a5 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -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
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index b09ce1b..53cde00 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -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;
 }


hooks/post-receive
-- 
phpMyAdmin