[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-22328-g15b25f9

[Rouslan Placella]

The branch, master has been updated
       via  15b25f93e99539a34645244af9d020a68b30334e (commit)
      from  806a33348edddc027a1ab2a6bdcaec6234052314 (commit)


- Log -----------------------------------------------------------------
commit 15b25f93e99539a34645244af9d020a68b30334e
Author: Rouslan Placella <rouslan at placella.com>
Date:   Fri Nov 4 14:43:25 2011 +0000

    Fixed incorrect display of breadcrumbs in RTL mode

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

Summary of changes:
 libraries/header.inc.php                |    9 +++++----
 themes/original/css/theme_right.css.php |    1 +
 themes/pmahomme/css/theme_right.css.php |    1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 67319de..b57b276 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -115,7 +115,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
                                                                    : ':' . $GLOBALS['cfg']['Server']['port']
                                                                   )
                            );
-            $separator = "<span class='separator'>»</span>\n";
+            $separator = "<span class='separator item'> »</span>\n";
             $item = '<a href="%1$s?%2$s" class="item">';
 
                 if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
@@ -125,7 +125,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
 
                 echo '<div id="serverinfo">' . "\n";
                 if ($GLOBALS['cfg']['NavigationBarIconic']) {
-                    echo PMA_getImage('s_host.png') . "\n";
+                    echo PMA_getImage('s_host.png', '', array('class' => 'item')) . "\n";
                 }
                 printf($item,
                         $GLOBALS['cfg']['DefaultTabServer'],
@@ -137,7 +137,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
 
                     echo $separator;
                     if ($GLOBALS['cfg']['NavigationBarIconic']) {
-                        echo PMA_getImage('s_db.png') . "\n";
+                        echo PMA_getImage('s_db.png', '', array('class' => 'item')) . "\n";
                     }
                     printf($item,
                             $GLOBALS['cfg']['DefaultTabDatabase'],
@@ -152,7 +152,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
                         echo $separator;
                         if ($GLOBALS['cfg']['NavigationBarIconic']) {
                             $icon = isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views.png' : 's_tbl.png';
-                            echo PMA_getImage($icon) . "\n";
+                            echo PMA_getImage($icon, '', array('class' => 'item')) . "\n";
                         }
                         printf($item,
                             $GLOBALS['cfg']['DefaultTabTable'],
@@ -201,6 +201,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
                     }
                 }
             }
+            echo '<div class="clearfloat"></div>';
             echo '</div>';
         }
         /**
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 77ec46e..42806e6 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -864,6 +864,7 @@ div#tablestatistics table {
 
 #serverinfo .item {
     white-space:        nowrap;
+    float: <?php echo $left; ?>
 }
 
 #span_table_comment {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 30edd54..5aadf21 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1080,6 +1080,7 @@ div#tablestatistics table {
 #serverinfo .item {
     white-space:        nowrap;
     color:#fff;
+    float: <?php echo $left; ?>
 }
 
 #span_table_comment {


hooks/post-receive
-- 
phpMyAdmin