Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
 + [export] Show triggers in Open Document Text, Word and Texy! Text
 - Patch #3415061 [auth] Login screen appears under the page
 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false
++ rfe #3475567 [interface] New directive $cfg['HideStructureActions']
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

Documentation.html

@@ -1612,6 +1612,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         &quot;tbl_sql.php&quot;, &quot;tbl_select.php&quot;,
         &quot;tbl_change.php&quot; or &quot;sql.php&quot;.</dd>
 
+    <dt id="cfg_HideStructureActions">$cfg['HideStructureActions'] boolean</dt>
+    <dd>Defines whether the table structure actions are hidden under a 
+        &quot;More&quot; drop-down.</dd>
+
     <dt id="cfg_ShowStats">$cfg['ShowStats'] boolean</dt>
     <dd>Defines whether or not to display space usage and statistics about databases
         and tables.<br />

js/tbl_structure.js

@@ -653,7 +653,7 @@ function moreOptsMenuResize() {
             var cell_right_edge_offset = $this_dropdown.parent().position().left + $this_dropdown.parent().innerWidth();
             var left_offset = cell_right_edge_offset - $this_dropdown.innerWidth();
             var top_offset = $this_dropdown.parent().position().top + $this_dropdown.parent().innerHeight();
-            $this_dropdown.offset({ top: top_offset, left: left_offset });
+            $this_dropdown.css({ top: top_offset, left: left_offset });
         });
     }, 100);
 

libraries/config/messages.inc.php

@@ -55,6 +55,8 @@ $strConfigDefaultTabServer_desc = __('Tab that is displayed when entering a serv
 $strConfigDefaultTabServer_name = __('Default server tab');
 $strConfigDefaultTabTable_desc = __('Tab that is displayed when entering a table');
 $strConfigDefaultTabTable_name = __('Default table tab');
+$strConfigHideStructureActions_desc = __('Whether the table structure actions should be hidden');
+$strConfigHideStructureActions_name = __('Hide table structure actions');
 $strConfigDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default');
 $strConfigDisplayBinaryAsHex_name = __('Show binary contents as HEX');
 $strConfigDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
@@ -225,6 +227,8 @@ $strConfigForm_Startup = __('Startup');
 $strConfigForm_Startup_desc = __('Customize startup page');
 $strConfigForm_DbStructure = __('Database structure');
 $strConfigForm_DbStructure_desc = __('Choose which details to show in the database structure (list of tables)');
+$strConfigForm_TableStructure = __('Table structure');
+$strConfigForm_TableStructure_desc = __('Settings for the table structure (list of columns)');
 $strConfigForm_Tabs = __('Tabs');
 $strConfigForm_Tabs_desc = __('Choose how you want tabs to work');
 $strConfigForm_Text_fields = __('Text fields');

libraries/config/setup.forms.php

@@ -197,6 +197,8 @@ $forms['Main_frame']['DbStructure'] = array(
     'ShowDbStructureCreation',
     'ShowDbStructureLastUpdate',
     'ShowDbStructureLastCheck');
+$forms['Main_frame']['TableStructure'] = array(
+    'HideStructureActions');
 $forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'ShowAll',

libraries/config/user_preferences.forms.php

@@ -106,6 +106,8 @@ $forms['Main_frame']['DbStructure'] = array(
     'ShowDbStructureCreation',
     'ShowDbStructureLastUpdate',
     'ShowDbStructureLastCheck');
+$forms['Main_frame']['TableStructure'] = array(
+    'HideStructureActions');
 $forms['Main_frame']['Browse'] = array(
     'NavigationBarIconic',
     'PropertiesIconic',