[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10549-g7d0c11c

[Marc Delisle]

The branch, master has been updated
       via  7d0c11c2568998b8ff64c158b2485457c165179d (commit)
      from  452dce72a2d256b37af22c6b537579c8807b6fa0 (commit)


- Log -----------------------------------------------------------------
commit 7d0c11c2568998b8ff64c158b2485457c165179d
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 9 09:05:54 2010 -0400

    class nowrap was missing; div not allowed here

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

Summary of changes:
 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 8460169..e91eab1 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 .= '<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;
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index f828fa2..b2dafa0 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 c04bedb..9a8e6d1 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
  */


hooks/post-receive
-- 
phpMyAdmin