From 1d2f085bfe683ce2b3c03f7b9a1b12edea342ceb Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 20 Jul 2015 07:48:56 +0530
Subject: [PATCH 1/2] Improve coding style

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/tbl_columns_definition_form.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 00fb6d8d31..f93d97a370 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -365,8 +365,10 @@ $html = PMA\Template::get('columns_definitions/column_definitions_form')->render
 unset($form_params);
 
 $response = PMA_Response::getInstance();
-$response->getHeader()->getScripts()->addFiles(array(
-    'jquery/jquery.uitablefilter.js',
-    'indexes.js'
-));
+$response->getHeader()->getScripts()->addFiles(
+    array(
+        'jquery/jquery.uitablefilter.js',
+        'indexes.js'
+    )
+);
 $response->addHTML($html);

From b4bf7f7bb7e300969577907b5710c21b20a7509c Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 20 Jul 2015 07:49:15 +0530
Subject: [PATCH 2/2] Use disabled edit icon for read only variables

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/server_variables.lib.php | 5 +----
 themes/original/css/common.css.php | 4 ----
 themes/pmahomme/css/common.css.php | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/libraries/server_variables.lib.php b/libraries/server_variables.lib.php
index 906b75be72..7cfa466dd1 100644
--- a/libraries/server_variables.lib.php
+++ b/libraries/server_variables.lib.php
@@ -241,10 +241,7 @@ function PMA_getHtmlForServerVariablesItems($variable_doc_links)
             $output .= '<span title="'
                 . __('This is a read-only variable and can not be edited')
                 . '" class="read_only_var" >'
-                . PMA_Util::getImage(
-                    's_error2.png',
-                    ''
-                )
+                . PMA_Util::getIcon('bd_edit.png', __('Edit'))
                 . '</span>';
         }
 
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 051c002e80..b1d33a7710 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -247,10 +247,6 @@ fieldset .formelement {
     white-space:        nowrap;
 }
 
-.read_only_var {
-    padding: 20%;
-}
-
 /* revert for Gecko */
 fieldset div[class=formelement] {
     white-space:        normal;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 26d15babf7..815ffbfb40 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -530,10 +530,6 @@ fieldset .formelement {
     white-space: nowrap;
 }
 
-.read_only_var {
-    padding: 20%;
-}
-
 /* revert for Gecko */
 fieldset div[class=formelement] {
     white-space: normal;