From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 5 Jun 2014 07:06:24 +0000 (+0000)
Subject: - drop pointless "do not edit" header, customize to look and behave
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=08ff1d685fb3bc79c1b26e54662229e579c43814;p=packages%2FphpMyAdmin.git

- drop pointless "do not edit" header, customize to look and behave
  more like old versions (habits die hard)
---

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 110be5a..7e8e4a6 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,7 +1,39 @@
-diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php
---- phpMyAdmin-3.1.0-all-languages/libraries/config.default.php	2008-11-28 14:21:00.000000000 +0100
-+++ phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php	2008-12-02 10:31:40.200149063 +0100
-@@ -180,7 +180,7 @@ $cfg['Servers'][$i]['auth_swekey_config'
+--- phpMyAdmin-4.2.2-all-languages/libraries/config.default.php.orig	2014-05-20 12:33:33.000000000 +0000
++++ phpMyAdmin-4.2.2-all-languages/libraries/config.default.php	2014-06-05 07:05:50.969396745 +0000
+@@ -1,18 +1,6 @@
+ <?php
+ /* vim: set expandtab sw=4 ts=4 sts=4: */
+ /**
+- * <code>
+- * N   N  OOO  !!   DDDD   OOO    N   N  OOO  TTTTT   EEEE DDDD  I TTTTT !!
+- * NN  N O   O !!   D   D O   O   NN  N O   O   T     E    D   D I   T   !!
+- * N N N O   O !!   D   D O   O   N N N O   O   T     EEEE D   D I   T   !!
+- * N  NN O   O      D   D O   O   N  NN O   O   T     E    D   D I   T
+- * N   N  OOO  !!   DDDD   OOO    N   N  OOO    T     EEEE DDDD  I   T   !!
+- * </code>
+- *
+- * DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!!
+- *
+- * phpMyAdmin default configuration, you can copy values from here to your
+- * config.inc.php
+  *
+  * All directives are explained in the documentation
+  *
+@@ -118,6 +106,13 @@
+ $i = 1;
+ 
+ /**
++ * Display name
++ *
++ * @global string $cfg['Servers'][$i]['display']
++ */
++$cfg['Servers'][$i]['display'] = 'localhost';
++
++/**
+  * MySQL hostname or IP address
+  *
+  * @global string $cfg['Servers'][$i]['host']
+@@ -257,7 +252,7 @@
   *
   * @global string $cfg['Servers'][$i]['user']
   */
@@ -10,3 +42,64 @@ diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdm
  
  /**
   * MySQL password (only needed with 'config' auth_type)
+@@ -859,14 +854,14 @@
+  *
+  * @global integer $cfg['MaxNavigationItems']
+  */
+-$cfg['MaxNavigationItems'] = 50;
++$cfg['MaxNavigationItems'] = 250;
+ 
+ /**
+  * turn the select-based light menu into a tree
+  *
+  * @global boolean $cfg['NavigationTreeEnableGrouping']
+  */
+-$cfg['NavigationTreeEnableGrouping'] = true;
++$cfg['NavigationTreeEnableGrouping'] = false;
+ 
+ /**
+  * the separator to sub-tree the select-based light menu tree
+@@ -918,14 +913,14 @@
+  *
+  * @global integer $cfg['NumRecentTables']
+  */
+-$cfg['NumRecentTables'] = 10;
++$cfg['NumRecentTables'] = 0;
+ 
+ /**
+  * number of favorite tables displayed in the navigation panel
+  *
+  * @global integer $cfg['NumFavoriteTables']
+  */
+-$cfg['NumFavoriteTables'] = 10;
++$cfg['NumFavoriteTables'] = 0;
+ 
+ /**
+  * display a JavaScript table filter in the navigation panel
+@@ -1115,7 +1110,7 @@
+  *
+  * @global string $cfg['GridEditing']
+  */
+-$cfg['GridEditing'] ='double-click';
++$cfg['GridEditing'] ='disable';
+ 
+ 
+ /*******************************************************************************
+@@ -1244,7 +1239,7 @@
+  *
+  * @global boolean $cfg['ActionLinksMode']
+  */
+-$cfg['ActionLinksMode'] = 'both';
++$cfg['ActionLinksMode'] = 'icons';
+ 
+ /**
+  * How many columns should be used for table display of a database?
+@@ -1294,7 +1289,7 @@
+  * Whether to display image or text or both image and text in table row
+  * action segment. Value can be either of ``image``, ``text`` or ``both``.
+  */
+-$cfg['RowActionType'] = 'both';
++$cfg['RowActionType'] = 'image';
+ 
+ /*******************************************************************************
+  * Export defaults