cvs diff: Diffing .
cvs diff: Diffing includes
cvs diff: Diffing misc
cvs diff: Diffing modules
cvs diff: Diffing modules/aggregator
cvs diff: Diffing modules/block
cvs diff: Diffing modules/blog
cvs diff: Diffing modules/blogapi
cvs diff: Diffing modules/book
cvs diff: Diffing modules/comment
cvs diff: Diffing modules/contact
cvs diff: Diffing modules/drupal
cvs diff: Diffing modules/filter
cvs diff: Diffing modules/forum
cvs diff: Diffing modules/help
cvs diff: Diffing modules/legacy
cvs diff: Diffing modules/locale
cvs diff: Diffing modules/menu
cvs diff: Diffing modules/node
cvs diff: Diffing modules/path
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.91
diff -u -F^f -r1.91 path.module
--- modules/path/path.module    22 Aug 2006 11:13:04 -0000      1.91
+++ modules/path/path.module    26 Aug 2006 13:59:27 -0000
@@ -186,8 +186,23 @@ function path_set_alias($path = NULL, $a
 function path_form($edit = '') {
   $form['#base'] = 'path_form';
 
-  $form['src'] = array('#type' => 'textfield', '#title' => t('Existing system path'), '#default_value' => $edit['src'], '#maxlength' => 64, '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'));
-  $form['dst'] = array('#type' => 'textfield', '#default_value' => $edit['dst'], '#maxlength' => 64, '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'));
+  $form['src'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Existing system path'),
+    '#default_value' => $edit['src'],
+    '#maxlength' => 64,
+    '#size' => 45,
+    '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
+  $form['dst'] = array(
+    '#type' => 'textfield',
+    '#default_value' => $edit['dst'],
+    '#maxlength' => 64,
+    '#size' => 45,
+    '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
 
   if ($edit['pid']) {
     $form['pid'] = array('#type' => 'hidden', '#value' => $edit['pid']);
cvs diff: Diffing modules/ping
cvs diff: Diffing modules/poll
cvs diff: Diffing modules/profile
cvs diff: Diffing modules/search
cvs diff: Diffing modules/statistics
cvs diff: Diffing modules/system
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.350
diff -u -F^f -r1.350 system.module
--- modules/system/system.module        25 Aug 2006 15:17:47 -0000      1.350
+++ modules/system/system.module        26 Aug 2006 13:59:46 -0000
@@ -519,7 +519,9 @@ function system_site_information_setting
     '#type' => 'textfield',
     '#title' => t('Default front page'),
     '#default_value' => variable_get('site_frontpage', 'node'),
-    '#description' => t('The home page displays content from this relative URL. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify "node".')
+    '#size' => 40,
+    '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   return system_settings_form($form);
@@ -555,14 +557,18 @@ function system_error_reporting_settings
     '#type' => 'textfield',
     '#title' => t('Default 403 (access denied) page'),
     '#default_value' => variable_get('site_403', ''),
-    '#description' => t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify nothing.')
+    '#size' => 40,
+    '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   $form['site_404'] = array(
     '#type' => 'textfield',
     '#title' => t('Default 404 (not found) page'),
     '#default_value' =>  variable_get('site_404', ''),
-    '#description' => t('This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify nothing.')
+    '#size' => 40,
+    '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   $form['error_level'] = array(
cvs diff: Diffing modules/taxonomy
cvs diff: Diffing modules/throttle
cvs diff: Diffing modules/tracker
cvs diff: Diffing modules/upload
cvs diff: Diffing modules/user
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.661
diff -u -F^f -r1.661 user.module
--- modules/user/user.module    25 Aug 2006 09:01:12 -0000      1.661
+++ modules/user/user.module    26 Aug 2006 14:00:12 -0000
@@ -2218,13 +2218,56 @@ function user_admin_settings() {
     file_check_directory($picture_path, 1, 'user_picture_path');
   }
 
-  $form['pictures'] = array('#type' => 'fieldset', '#title' => t('Pictures'));
-  $form['pictures']['user_pictures'] = array('#type' => 'radios', '#title' => t('Picture support'), '#default_value' => variable_get('user_pictures', 0), '#options' => array(t('Disabled'), t('Enabled')), '#description' => t('Enable picture support.'));
-  $form['pictures']['user_picture_path'] = array('#type' => 'textfield', '#title' => t('Picture image path'), '#default_value' => variable_get('user_picture_path', 'pictures'), '#size' => 30, '#maxlength' => 255, '#description' => t('Subdirectory in the directory %dir where pictures will be stored.', array('%dir' => file_directory_path() .'/')));
-  $form['pictures']['user_picture_default'] = array('#type' => 'textfield', '#title' => t('Default picture'), '#default_value' => variable_get('user_picture_default', ''), '#size' => 30, '#maxlength' => 255, '#description' => t('URL of picture to display for users with no custom picture selected. Leave blank for none.'));
-  $form['pictures']['user_picture_dimensions'] = array('#type' => 'textfield', '#title' => t('Picture maximum dimensions'), '#default_value' => variable_get('user_picture_dimensions', '85x85'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum dimensions for pictures.'));
-  $form['pictures']['user_picture_file_size'] = array('#type' => 'textfield', '#title' => t('Picture maximum file size'), '#default_value' => variable_get('user_picture_file_size', '30'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum file size for pictures, in kB.'));
-  $form['pictures']['user_picture_guidelines'] = array('#type' => 'textarea', '#title' => t('Picture guidelines'), '#default_value' => variable_get('user_picture_guidelines', ''), '#description' => t('This text is displayed at the picture upload form in addition to the default guidelines. It\'s useful for helping or instructing your users.'));
+  $form['pictures'] = array(
+       '#type' => 'fieldset',
+       '#title' => t('Pictures')
+       );
+  $form['pictures']['user_pictures'] = array(
+    '#type' => 'radios',
+    '#title' => t('Picture support'),
+    '#default_value' => variable_get('user_pictures', 0),
+    '#options' => array(t('Disabled'), t('Enabled')),
+    '#description' => t('Enable picture support.'));
+  $form['pictures']['user_picture_path'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Picture image path'),
+    '#default_value' => variable_get('user_picture_path', 'pictures'),
+    '#size' => 30,
+    '#maxlength' => 255,
+    '#description' => t('Subdirectory in the directory %dir where pictures will be stored.', array('%dir' => file_directory_path() .'/'))
+  );
+  $form['pictures']['user_picture_default'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Default picture'),
+    '#default_value' => variable_get('user_picture_default', ''),
+    '#size' => 30,
+    '#maxlength' => 255,
+    '#description' => t('URL of picture to display for users with no custom picture selected. Leave blank for none.')
+  );
+  $form['pictures']['user_picture_dimensions'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Picture maximum dimensions'),
+    '#default_value' => variable_get('user_picture_dimensions', '85x85'),
+    '#size' => 15,
+    '#maxlength' => 10,
+    '#description' => t('Maximum dimensions for pictures (e.g. 85x85).'),
+    '#field_suffix' => t('<kbd>WIDTHxHEIGHT</kbd>')
+  );
+  $form['pictures']['user_picture_file_size'] = array(
+    '#type' => 'textfield', 
+    '#title' => t('Picture maximum file size'), 
+    '#default_value' => variable_get('user_picture_file_size', '30'), 
+    '#size' => 5, 
+    '#maxlength' => 5, 
+    '#description' => t('Maximum file size for pictures.'),
+    '#field_suffix' => t('KB')
+  );
+  $form['pictures']['user_picture_guidelines'] = array(
+    '#type' => 'textarea', 
+    '#title' => t('Picture guidelines'), 
+    '#default_value' => variable_get('user_picture_guidelines', ''), 
+    '#description' => t('This text is displayed at the picture upload form in addition to the default guidelines. It\'s useful for helping or instructing your users.')
+  );
 
   return system_settings_form($form);
 }
cvs diff: Diffing modules/watchdog
cvs diff: Diffing profiles
cvs diff: Diffing profiles/default
cvs diff: Diffing scripts
cvs diff: Diffing sites