From b575f7ef1b6477f5240da31053d30ef75eb5ab49 Mon Sep 17 00:00:00 2001
From: Piyush Agrawal <poush12@gmail.com>
Date: Tue, 31 Jan 2017 21:50:59 +0530
Subject: [PATCH] db_central_columns: new column collapsing issue

Signed-off-by: Piyush Agrawal <poush12@gmail.com>
---
 db_central_columns.php                      | 2 +-
 libraries/central_columns.lib.php           | 8 +++++---
 test/libraries/PMA_central_columns_test.php | 2 +-
 themes/original/css/common.css.php          | 3 +++
 themes/pmahomme/css/common.css.php          | 4 ++++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/db_central_columns.php b/db_central_columns.php
index c14d094c26..321b4e9b82 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -100,7 +100,7 @@ if (PMA_isValid($_REQUEST['pos'], 'integer')) {
 } else {
     $pos = 0;
 }
-$addNewColumn = PMA_getHTMLforAddNewColumn($db);
+$addNewColumn = PMA_getHTMLforAddNewColumn($db, $total_rows);
 $response->addHTML($addNewColumn);
 if ($total_rows <= 0) {
     $response->addHTML(
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 19b3d049f6..a4b84cffc0 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -1252,16 +1252,18 @@ function PMA_handleColumnExtra(&$columns_list)
 /**
  * build html for adding a new user defined column to central list
  *
- * @param string $db current database
+ * @param string  $db         current database
+ * @param integer $total_rows number of rows in central columns
  *
  * @return string html of the form to let user add a new user defined column to the
  *                list
  */
-function PMA_getHTMLforAddNewColumn($db)
+function PMA_getHTMLforAddNewColumn($db, $total_rows)
 {
     $addNewColumn = '<div id="add_col_div" class="topmargin"><a href="#">'
         . '<span>+</span> ' . __('Add new column') . '</a>'
-        . '<form id="add_new" style="min-width:100%;display:none" '
+        . '<form id="add_new" class="new_central_col '
+        . ($total_rows != 0 ? 'hide"' : '"')
         . 'method="post" action="db_central_columns.php">'
         . URL::getHiddenInputs(
             $db
diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php
index dc4e747285..25d7787993 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@@ -532,7 +532,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
      */
     public function testPMAGetHTMLforAddNewColumn()
     {
-        $result = PMA_getHTMLforAddNewColumn('phpmyadmin');
+        $result = PMA_getHTMLforAddNewColumn('phpmyadmin', 0);
         $this->assertContains(
             '<form',
             $result
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 21cc80c2e8..7875de63d9 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -495,6 +495,9 @@ fieldset.confirmation legend {
 }
 /* end messageboxes */
 
+.new_central_col{
+    width:              100%;
+}
 
 .tblcomment {
     font-size:          70%;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 6bde034311..d0c1a61240 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -786,6 +786,10 @@ fieldset.confirmation legend {
 
 /* end messageboxes */
 
+.new_central_col{
+    width: 100%;
+}
+
 .tblcomment {
     font-size: 70%;
     font-weight: normal;