The branch, master has been updated
via b17a2e4a853e3ba51b9ba68aede8858ac8955d6a (commit)
from a42c7b331c2d2c34ad75f8800330800545472ab1 (commit)
- Log -----------------------------------------------------------------
commit b17a2e4a853e3ba51b9ba68aede8858ac8955d6a
Author: Crack <[email protected]>
Date: Sun Aug 29 12:35:02 2010 +0200
user preferences: improve styling of fieldset headers, change Export form
layout
-----------------------------------------------------------------------
Summary of changes:
libraries/config/setup.forms.php | 34 +++++++++++------------
libraries/config/user_preferences.forms.php | 32 ++++++++++------------
themes/darkblue_orange/css/theme_right.css.php | 5 ++-
themes/original/css/theme_right.css.php | 5 ++-
4 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 8979e27..ebaaf27 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -256,25 +256,23 @@ $forms['Import']['Open_Document'] = array('Import' =>
array(
'ods_recognize_percentages',
'ods_recognize_currency'));
$forms['Export']['Export_defaults'] = array('Export' => array(
- 'method' => ':group',
- ':group:' . __('Quick'),
- 'quick_export_onserver',
- 'quick_export_onserver_overwrite',
- ':group:end',
- ':group:' . __('Custom'),
- 'asfile' => ':group',
- 'onserver',
- 'onserver_overwrite',
- ':group:end',
- ':group:end',
+ 'method',
+ ':group:' . __('Quick'),
+ 'quick_export_onserver',
+ 'quick_export_onserver_overwrite',
':group:end',
- 'format',
- 'compression',
- 'charset',
- 'remember_file_template',
- 'file_template_table',
- 'file_template_database',
- 'file_template_server'));
+ ':group:' . __('Custom'),
+ 'format',
+ 'compression',
+ 'charset',
+ 'asfile' => ':group',
+ 'onserver',
+ 'onserver_overwrite',
+ ':group:end',
+ 'remember_file_template',
+ 'file_template_table',
+ 'file_template_database',
+ 'file_template_server'));
$forms['Export']['Sql'] = array('Export' => array(
'sql_include_comments' => ':group',
'sql_dates',
diff --git a/libraries/config/user_preferences.forms.php
b/libraries/config/user_preferences.forms.php
index bd3202f..3f4814f 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -159,24 +159,22 @@ $forms['Import']['Open_Document'] = array(
'Import/ods_recognize_percentages',
'Import/ods_recognize_currency');
$forms['Export']['Export_defaults'] = array(
- 'Export/method' => ':group',
- ':group:' . __('Quick'),
- 'Export/quick_export_onserver',
- 'Export/quick_export_onserver_overwrite',
- ':group:end',
- ':group:' . __('Custom'),
- 'Export/asfile' => ':group',
- 'Export/onserver',
- 'Export/onserver_overwrite',
- ':group:end',
- ':group:end',
+ 'Export/method',
+ ':group:' . __('Quick'),
+ 'Export/quick_export_onserver',
+ 'Export/quick_export_onserver_overwrite',
':group:end',
- 'Export/format',
- 'Export/compression',
- 'Export/charset',
- 'Export/file_template_table',
- 'Export/file_template_database',
- 'Export/file_template_server');
+ ':group:' . __('Custom'),
+ 'Export/format',
+ 'Export/compression',
+ 'Export/charset',
+ 'Export/asfile' => ':group',
+ 'Export/onserver',
+ 'Export/onserver_overwrite',
+ ':group:end',
+ 'Export/file_template_table',
+ 'Export/file_template_database',
+ 'Export/file_template_server');
$forms['Export']['Sql'] = array(
'Export/sql_include_comments' => ':group',
'Export/sql_dates',
diff --git a/themes/darkblue_orange/css/theme_right.css.php
b/themes/darkblue_orange/css/theme_right.css.php
index 488ac00..f828fa2 100755
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1653,8 +1653,9 @@ td.more_opts {
}
.config-form fieldset p {
- margin: 0;
- padding: 0.5em;
+ margin: 0;
+ padding: 0.5em;
+ background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
}
.config-form fieldset .errors { /* form error list */
diff --git a/themes/original/css/theme_right.css.php
b/themes/original/css/theme_right.css.php
index 1df6f9a..da283ea 100755
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1606,8 +1606,9 @@ iframe.IE_hack {
}
.config-form fieldset p {
- margin: 0;
- padding: 0.5em;
+ margin: 0;
+ padding: 0.5em;
+ background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
}
.config-form fieldset .errors { /* form error list */
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
