[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6544-g70c70db

[Rouslan Placella]

The branch, master has been updated
       via  70c70db1392e703346434e65d59110a6ba321367 (commit)
      from  a88054dae9a969c0c9ec6477fce130b70a777749 (commit)


- Log -----------------------------------------------------------------
commit 70c70db1392e703346434e65d59110a6ba321367
Author: Rouslan Placella <rouslan at placella.com>
Date:   Tue Jul 5 13:00:21 2011 +0100

    Fix for bug #3353856 - AJAX dialogs use wrong font-size

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

Summary of changes:
 ChangeLog                                         |    1 +
 js/db_routines.js                                 |    4 ++--
 js/functions.js                                   |    2 +-
 libraries/header_meta_style.inc.php               |    7 +++++++
 themes/original/jquery/jquery-ui-1.8.override.css |    7 +++++++
 themes/pmahomme/jquery/jquery-ui-1.8.override.css |    7 +++++++
 6 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 themes/original/jquery/jquery-ui-1.8.override.css
 create mode 100644 themes/pmahomme/jquery/jquery-ui-1.8.override.css

diff --git a/ChangeLog b/ChangeLog
index ff4f0ae..4ae25e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 + Display direction (horizontal/vertical) no longer displayed by default
 + Shift/click support in database Structure
 + Show/hide column in table Browse
+- bug #3353856 [AJAX] AJAX dialogs use wrong font-size
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
diff --git a/js/db_routines.js b/js/db_routines.js
index 95254ca..ceb0962 100644
--- a/js/db_routines.js
+++ b/js/db_routines.js
@@ -308,7 +308,7 @@ $(document).ready(function() {
                 /**
                  * Display the dialog to the user
                  */
-                $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                 width: 700,  // TODO: make a better decision about the size
                                 height: 550, // of the dialog based on the size of the viewport
                                 buttons: button_options,
@@ -529,7 +529,7 @@ $(document).ready(function() {
                     /**
                      * Display the dialog to the user
                      */
-                    $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                    $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                     width: 650,  // TODO: make a better decision about the size
                                                  // of the dialog based on the size of the viewport
                                     buttons: button_options,
diff --git a/js/functions.js b/js/functions.js
index e25ec98..9cdb44e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2445,7 +2445,7 @@ $(document).ready(function() {
                 /**
                  * Display the dialog to the user
                  */
-                var $ajaxDialog = $('<div style="font-size: 0.9em;">'+data.message+'</div>').dialog({
+                var $ajaxDialog = $('<div>'+data.message+'</div>').dialog({
                                       width: 500,
                                       buttons: button_options,
                                       title: data.title
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 5e5c533..e78b653 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -48,4 +48,11 @@ if ($GLOBALS['text_dir'] == 'ltr') {
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
+<?php
+    if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) {
+?>
+    <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" />
+<?php
+    }
+?>
     <meta name="robots" content="noindex,nofollow" />
diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css
new file mode 100644
index 0000000..4aee6fb
--- /dev/null
+++ b/themes/original/jquery/jquery-ui-1.8.override.css
@@ -0,0 +1,7 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
new file mode 100644
index 0000000..4aee6fb
--- /dev/null
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
@@ -0,0 +1,7 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }


hooks/post-receive
-- 
phpMyAdmin