diff --git a/ChangeLog b/ChangeLog index 4ebc4553fd..e36d50557e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.1.3.0 (not yet released) +- bug #3938 PDFDefaultPageSize doc and easy configurability 4.1.2.0 (2013-12-23) - bug #4178 Quick edit for BIT type does not work diff --git a/libraries/config.values.php b/libraries/config.values.php index b8767710b4..0c40c7995c 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -66,6 +66,13 @@ $cfg_db['TabsMode'] = array( 'text' => __('Text'), 'both' => __('Both') ); +$cfg_db['PDFDefaultPageSize'] = array( + 'A3' => 'A3', + 'A4' => 'A4', + 'A5' => 'A5', + 'letter' => 'letter', + 'legal' => 'legal' +); $cfg_db['ActionLinksMode'] = array( 'icons' => __('Icons'), 'text' => __('Text'), diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 56190e4cf2..fd281f3743 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -227,6 +227,10 @@ $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_DisplayRelationalSchema = __('Display relational schema'); +$strConfigForm_DisplayRelationalSchema_desc = ''; +$strConfigPDFDefaultPageSize_name = __('Paper size'); +$strConfigPDFDefaultPageSize_desc = ''; $strConfigForm_Text_fields = __('Text fields'); $strConfigForm_Text_fields_desc = __('Customize text input fields'); $strConfigForm_Texy = __('Texy! text'); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 341045044c..e97bd34df9 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -133,6 +133,9 @@ $forms['Main_panel']['Tabs'] = array( 'DefaultTabServer', 'DefaultTabDatabase', 'DefaultTabTable'); +$forms['Main_panel']['DisplayRelationalSchema'] = array( + 'PDFDefaultPageSize'); + $forms['Import']['Import_defaults'] = array( 'Import/format', 'Import/charset',