Merge remote branch 'origin/master'

js/functions.js

@@ -1556,7 +1556,7 @@ function PMA_ajaxShowMessage(message, timeout) {
 /**
  * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected
  */
-function toggle_enum_notice(selectElement) {
+function showNoticeForEnum(selectElement) {
     var enum_notice_id = selectElement.attr("id").split("_")[1];
     enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2]) + 1);
     var selectedType = selectElement.attr("value");
@@ -1743,6 +1743,7 @@ $(document).ready(function() {
         //User wants to submit the form
         $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) {
             if(data.success == true) {
+                $('#properties_message').html('');
                 PMA_ajaxShowMessage(data.message);
                 $("#create_table_dialog").dialog("close").remove();
 
@@ -1794,7 +1795,7 @@ $(document).ready(function() {
                 }
             }
             else {
-                PMA_ajaxShowMessage(data.error);
+                $('#properties_message').html(data.error);
             }
         }) // end $.post()
     }) // end create table form (save)
@@ -2040,13 +2041,13 @@ $(document).ready(function() {
     //
     // needs live() to work also in the Create Table dialog
     $("select[class='column_type']").live('change', function() {
-        toggle_enum_notice($(this));
+        showNoticeForEnum($(this));
     });
 });
 
 function PMA_verifyTypeOfAllColumns() {
     $("select[class='column_type']").each(function() {
-        toggle_enum_notice($(this));
+        showNoticeForEnum($(this));
     });
 }
 

libraries/tbl_properties.inc.php

@@ -786,7 +786,7 @@ if ($action == 'tbl_create.php') {
         />
 <?php } ?>
 </fieldset>
-
+<div id="properties_message"></div>
 </form>
 
 <div id="enum_editor">

tbl_create.php

@@ -350,12 +350,16 @@ if (isset($_REQUEST['do_save_data'])) {
         }
         exit;
     } else {
-        PMA_mysqlDie('', '', '', $err_url, false);
-        // An error happened while inserting/updating a table definition.
-        // to prevent total loss of that data, we embed the form once again.
-        // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php
-        $num_fields = $_REQUEST['orig_num_fields'];
-        $regenerate = true;
+        if ($GLOBALS['is_ajax_request'] == true) {
+            PMA_ajaxResponse(PMA_DBI_getError(), false);
+        } else {
+            PMA_mysqlDie('', '', '', $err_url, false);
+            // An error happened while inserting/updating a table definition.
+            // to prevent total loss of that data, we embed the form once again.
+            // The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php
+            $num_fields = $_REQUEST['orig_num_fields'];
+            $regenerate = true;
+        }
     }
 } // end do create table
 

themes/darkblue_orange/css/theme_right.css.php

@@ -15,7 +15,8 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (
+        isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '82%'));?>;
 }
 
 input, select, textarea {
@@ -1360,6 +1361,10 @@ code.sql, div.sqlvalidate {
     width: 98%;
 }
 
+textarea#partitiondefinition {
+    height:3em;
+}
+
 /* for elements that should be revealed only via js */
 .hide {
     display:            none;

themes/original/css/theme_right.css.php

@@ -1312,6 +1312,11 @@ code.sql, div.sqlvalidate {
     width: 98%;
 }
 
+textarea#partitiondefinition {
+    height:3em;
+}
+
+
 /* for elements that should be revealed only via js */
 .hide {
     display:            none;