? 223941.patch
? exampletest.patch
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.267
diff -u -p -r1.267 form.inc
--- includes/form.inc 12 Feb 2008 13:52:32 -0000 1.267
+++ includes/form.inc 19 Feb 2008 21:01:32 -0000
@@ -2003,6 +2003,10 @@ function theme_textfield($element) {
$output .= ' '. $element['#field_suffix'] .'';
}
+ if (isset($element['#example'])) {
+ $output .= ' '. $element['#example'] .'';
+ }
+
return theme('form_element', $element, $output) . $extra;
}
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.48
diff -u -p -r1.48 system.css
--- modules/system/system.css 9 Jan 2008 09:56:39 -0000 1.48
+++ modules/system/system.css 19 Feb 2008 21:01:32 -0000
@@ -135,6 +135,10 @@ tr.merge-up, tr.merge-up td, tr.merge-up
.form-item .description {
font-size: 0.85em;
}
+.form-item .example {
+ font-size: 0.85em;
+ font-style: italic;
+}
.form-item label {
display: block;
font-weight: bold;
Index: modules/upload/upload.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.admin.inc,v
retrieving revision 1.7
diff -u -p -r1.7 upload.admin.inc
--- modules/upload/upload.admin.inc 10 Jan 2008 20:22:57 -0000 1.7
+++ modules/upload/upload.admin.inc 19 Feb 2008 21:01:32 -0000
@@ -70,8 +70,8 @@ function upload_admin_settings() {
'#default_value' => variable_get('upload_max_resolution', 0),
'#size' => 15,
'#maxlength' => 10,
- '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))),
- '#field_suffix' => ''. t('WIDTHxHEIGHT') .''
+ '#description' => t('The maximum allowed image size. Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))),
+ '#example' => '640x480',
);
$form['settings_general']['upload_list_default'] = array(
'#type' => 'select',