? 486370-language-bug.patch
? 490846-user-enable.patch
? 490878-batch-order.patch
? batch-order.patch
? domain_views/485762-views.patch
Index: API.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/API.php,v
retrieving revision 1.47
diff -u -p -r1.47 API.php
--- API.php	31 May 2009 18:16:40 -0000	1.47
+++ API.php	13 Jun 2009 20:01:10 -0000
@@ -455,6 +455,7 @@ function hook_domainconf() {
  *
  * - '#group' [optional] Used to place elements into fieldsets for the main domain configuration page. If not set, any
  *    new element will be added to the 'Site configuration' fieldset.
+ * - '#module' [optional] Used to group like elements together on the batch action list.
  *
  * @ingroup domain_hooks
  */
@@ -477,6 +478,7 @@ function hook_domainbatch() {
     '#data_type' => 'string',
     '#weight' => 0,
     '#group' => t('My settings'),
+    '#module' => t('Domain Access'),
   );
   return $batch;
 }
Index: domain.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v
retrieving revision 1.28
diff -u -p -r1.28 domain.admin.inc
--- domain.admin.inc	7 Jun 2009 17:45:07 -0000	1.28
+++ domain.admin.inc	13 Jun 2009 20:01:11 -0000
@@ -694,8 +694,18 @@ function domain_batch($action = NULL) {
 function domain_batch_list($batch) {
   $header = array(t('Action'), t('Description'));
   $rows = array();
+  foreach ($batch as $key => $value) {
+    if (!isset($value['#module'])) {
+      $value['#module'] = t('Other');
+    }
+  }
   uasort($batch, 'domain_batch_sort');
+  $group = '';
   foreach ($batch as $key => $value) {
+    if ($group != $value['#module']) {
+      $rows[] = array(array('data' => '<strong>'. t('%module options', array('%module' => $value['#module'])) .'</strong>', 'colspan' => 2));
+      $group = $value['#module'];
+    }
     $rows[] = array(l($value['#form']['#title'], 'admin/build/domain/batch/'. $key), $value['#meta_description']);
   }
   $output = '<p>'. t('Batch updates allow you to edit values for multiple domains at one time.  These functions are helpful when moving your sites from staging to production, or any time you need to make mass changes quickly.  The following batch update actions may be performed.') .'</p>';
@@ -707,6 +717,9 @@ function domain_batch_list($batch) {
  * Sorting function for domain batch options.
  */
 function domain_batch_sort($a, $b) {
+  if ($a['#module'] != $b['#module']) {
+    return strcmp($a['#module'], $b['#module']);
+  }
   if ($a['#weight'] == $b['#weight']) {
     return strcmp($a['#form']['#title'], $b['#form']['#title']);
   }
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.109
diff -u -p -r1.109 domain.module
--- domain.module	8 Jun 2009 17:31:13 -0000	1.109
+++ domain.module	13 Jun 2009 20:01:14 -0000
@@ -1711,6 +1711,9 @@ function domain_domainbatch() {
     '#data_type' => 'integer',
     '#weight' => -10,
   );
+  foreach ($batch as $key => $value) {
+    $batch[$key]['#module'] = t('Domain Access');
+  }
   return $batch;
 }
 
Index: domain_conf/domain_conf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v
retrieving revision 1.44
diff -u -p -r1.44 domain_conf.module
--- domain_conf/domain_conf.module	7 Jun 2009 18:38:33 -0000	1.44
+++ domain_conf/domain_conf.module	13 Jun 2009 20:01:15 -0000
@@ -169,7 +169,7 @@ function domain_conf_domainbatch() {
     '#variable' => 'domain_conf',
     '#meta_description' => t('Delete custom settings for domains as supplied by Domain Configuration.'),
     '#table' => 'domain_conf',
-    '#weight' => 0,
+    '#weight' => -10,
   );
   // Change the email address.
   $batch['site_mail'] = array(
@@ -412,6 +412,10 @@ function domain_conf_domainbatch() {
     '#weight' => -2,
     '#group' => t('Site status'),
   );
+  foreach ($batch as $key => $value) {
+    $batch[$key]['#module'] = t('Domain Configuration');
+  }
+
   return $batch;
 }
 
Index: domain_theme/domain_theme.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_theme/domain_theme.module,v
retrieving revision 1.15
diff -u -p -r1.15 domain_theme.module
--- domain_theme/domain_theme.module	7 Jun 2009 17:27:44 -0000	1.15
+++ domain_theme/domain_theme.module	13 Jun 2009 20:01:15 -0000
@@ -196,7 +196,7 @@ function domain_theme_domainbatch() {
     '#system_default' => 0,
     '#meta_description' => t('Delete custom theme settings for domains as supplied by Domain Theme.'),
     '#table' => 'domain_theme',
-    '#weight' => -2,
+    '#weight' => -10,
   );
   // Change themes for sites.
   $themes = list_themes();
@@ -220,8 +220,12 @@ function domain_theme_domainbatch() {
     '#variable' => 'theme_default',
     '#meta_description' => t('Change the themes for all domains.'),
     '#data_type' => 'integer',
-    '#weight' => -6,
+    '#weight' => -9,
   );
+  foreach ($batch as $key => $value) {
+    $batch[$key]['#module'] = t('Domain Theme');
+  }
+
   return $batch;
 }