Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

ChangeLog

@@ -32,6 +32,8 @@ 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
+- bug #3354356 [interface] Timepicker does not work in AJAX dialogs
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes

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,

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

js/makegrid.js

@@ -215,6 +215,7 @@
                     $cb.css('left', $this.position().left + $this.outerWidth(true))
                        .show();
                 }
+                $(this.cRsz).css('height', $(this.t).height());
             },
             
             /**

libraries/RecentTable.class.php

@@ -142,7 +142,7 @@ class PMA_RecentTable
         $html = '<option value="">(' . __('Recent tables') . ') ...</option>';
         if (count($this->tables)) {
             foreach ($this->tables as $table) {
-                $html .= '<option value="' . $table . '">' . $table . '</option>';
+                $html .= '<option value="' . htmlspecialchars($table) . '">' . htmlspecialchars($table) . '</option>';
             }
         } else {
             $html .= '<option value="">' . __('There are no recent tables') . '</option>';
@@ -158,7 +158,7 @@ class PMA_RecentTable
     public function getHtmlSelect()
     {
         $html  = '<input type="hidden" name="goto" id="LeftDefaultTabTable" value="' .
-                         $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />';
+                         htmlspecialchars($GLOBALS['cfg']['LeftDefaultTabTable']) . '" />';
         $html .= '<select name="table" id="recentTable">';
         $html .= $this->getHtmlSelectOption();
         $html .= '</select>';

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'])); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;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" />

themes/original/jquery/jquery-ui-1.8.override.css

@@ -0,0 +1,8 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }
+#ui-timepicker-div { z-index: 1003; }

themes/pmahomme/jquery/jquery-ui-1.8.override.css

@@ -0,0 +1,8 @@
+/**
+ * Use this file to override styles set by jquery-ui-1.8.custom.css
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-size: 1em; }
+#ui-timepicker-div { z-index: 1003; }