Index: modules/node/node.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.js,v
retrieving revision 1.6
diff -u -r1.6 node.js
--- modules/node/node.js	4 May 2010 16:03:34 -0000	1.6
+++ modules/node/node.js	28 Oct 2010 21:09:34 -0000
@@ -4,28 +4,28 @@
 
 Drupal.behaviors.nodeFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-revision-information', context).drupalSetSummary(function (context) {
-      return $('#edit-revision', context).is(':checked') ?
+    $('fieldset.node-form-revision-information', context).drupalSetSummary(function (context) {
+      return $('input[name="revision"]', context).is(':checked') ?
         Drupal.t('New revision') :
         Drupal.t('No revision');
     });
 
-    $('fieldset#edit-author', context).drupalSetSummary(function (context) {
-      var name = $('#edit-name').val() || Drupal.settings.anonymous,
-        date = $('#edit-date').val();
+    $('fieldset.node-form-author', context).drupalSetSummary(function (context) {
+      var name = $('input[name="name"]', context).val() || Drupal.settings.anonymous,
+        date = $('input[name="date"]', context).val();
       return date ?
         Drupal.t('By @name on @date', { '@name': name, '@date': date }) :
         Drupal.t('By @name', { '@name': name });
     });
 
-    $('fieldset#edit-options', context).drupalSetSummary(function (context) {
+    $('fieldset.node-form-options', context).drupalSetSummary(function (context) {
       var vals = [];
 
       $('input:checked', context).parent().each(function () {
         vals.push(Drupal.checkPlain($.trim($(this).text())));
       });
 
-      if (!$('#edit-status', context).is(':checked')) {
+      if (!$('input[name="status"]', context).is(':checked')) {
         vals.unshift(Drupal.t('Not published'));
       }
       return vals.join(', ');
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.133
diff -u -r1.133 node.pages.inc
--- modules/node/node.pages.inc	23 Oct 2010 16:30:48 -0000	1.133
+++ modules/node/node.pages.inc	28 Oct 2010 21:09:34 -0000
@@ -166,6 +166,9 @@
     // Collapsed by default when "Create new revision" is unchecked
     '#collapsed' => !$node->revision,
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('node-form-revision-information'),
+    ),
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'node') . '/node.js'),
     ),
@@ -204,6 +207,9 @@
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('node-form-author'),
+    ),
     '#attached' => array(
       'js' => array(
         drupal_get_path('module', 'node') . '/node.js',
@@ -240,6 +246,9 @@
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('node-form-options'),
+    ),
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'node') . '/node.js'),
     ),
Index: modules/comment/comment-node-form.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment-node-form.js,v
retrieving revision 1.5
diff -u -r1.5 comment-node-form.js
--- modules/comment/comment-node-form.js	16 Apr 2010 13:55:06 -0000	1.5
+++ modules/comment/comment-node-form.js	28 Oct 2010 21:09:33 -0000
@@ -4,11 +4,12 @@
 
 Drupal.behaviors.commentFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-comment-settings', context).drupalSetSummary(function (context) {
+    $('fieldset.comment-node-form-settings', context).drupalSetSummary(function (context) {
       return Drupal.checkPlain($('input:checked', context).next('label').text());
     });
+
     // Provide the summary for the node type form.
-    $('fieldset#edit-comment', context).drupalSetSummary(function(context) {
+    $('fieldset.comment-node-type-form-settings', context).drupalSetSummary(function(context) {
       var vals = [];
 
       // Default comment setting.
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.908
diff -u -r1.908 comment.module
--- modules/comment/comment.module	28 Oct 2010 02:27:08 -0000	1.908
+++ modules/comment/comment.module	28 Oct 2010 21:09:34 -0000
@@ -1093,6 +1093,9 @@
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#group' => 'additional_settings',
+      '#attributes' => array(
+        'class' => array('comment-node-type-form-settings'),
+      ),
       '#attached' => array(
         'js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'),
       ),
@@ -1164,6 +1167,9 @@
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('comment-node-form-settings'),
+    ),
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'),
      ),
@@ -1188,7 +1194,7 @@
       '#description' => t('Users with the "Post comments" permission can post comments.'),
       '#return_value' => COMMENT_NODE_OPEN,
       '#default_value' => $comment_settings,
-      '#id' => 'edit-comment-2',
+      //'#id' => 'edit-comment-2',
       '#parents' => array('comment'),
     ),
     COMMENT_NODE_CLOSED => array(
@@ -1197,7 +1203,7 @@
       '#description' => t('Users cannot post comments, but existing comments will be displayed.'),
       '#return_value' => COMMENT_NODE_CLOSED,
       '#default_value' => $comment_settings,
-      '#id' => 'edit-comment-1',
+      //'#id' => 'edit-comment-1',
       '#parents' => array('comment'),
     ),
     COMMENT_NODE_HIDDEN => array(
@@ -1206,7 +1212,7 @@
       '#description' => t('Comments are hidden from view.'),
       '#return_value' => COMMENT_NODE_HIDDEN,
       '#default_value' => $comment_settings,
-      '#id' => 'edit-comment-0',
+      //'#id' => 'edit-comment-0',
       '#parents' => array('comment'),
     ),
   );
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.554
diff -u -r1.554 book.module
--- modules/book/book.module	18 Oct 2010 05:53:34 -0000	1.554
+++ modules/book/book.module	28 Oct 2010 21:09:33 -0000
@@ -488,6 +488,9 @@
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('book-form'),
+    ),
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'book') . '/book.js'),
     ),
Index: modules/book/book.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.js,v
retrieving revision 1.7
diff -u -r1.7 book.js
--- modules/book/book.js	16 Apr 2010 13:55:06 -0000	1.7
+++ modules/book/book.js	28 Oct 2010 21:09:32 -0000
@@ -4,8 +4,8 @@
 
 Drupal.behaviors.bookFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-book', context).drupalSetSummary(function (context) {
-      var val = $('#edit-book-bid').val();
+    $('fieldset.book-form', context).drupalSetSummary(function (context) {
+      var val = $('input[name="book[bid]"]').val();
 
       if (val === '0') {
         return Drupal.t('Not in book');
@@ -14,7 +14,7 @@
         return Drupal.t('New book');
       }
       else {
-        return Drupal.checkPlain($('#edit-book-bid :selected').text());
+        return Drupal.checkPlain($('input[name="book[bid]"] :selected').text());
       }
     });
   }
Index: modules/path/path.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.js,v
retrieving revision 1.4
diff -u -r1.4 path.js
--- modules/path/path.js	9 Apr 2010 12:24:53 -0000	1.4
+++ modules/path/path.js	28 Oct 2010 21:09:34 -0000
@@ -4,8 +4,8 @@
 
 Drupal.behaviors.pathFieldsetSummaries = {
   attach: function (context) {
-    $('fieldset#edit-path', context).drupalSetSummary(function (context) {
-      var path = $('#edit-path-alias').val();
+    $('fieldset.path-form', context).drupalSetSummary(function (context) {
+      var path = $('input[name="path[alias]"]').val();
 
       return path ?
         Drupal.t('Alias: @alias', { '@alias': path }) :
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.185
diff -u -r1.185 path.module
--- modules/path/path.module	24 Sep 2010 00:37:44 -0000	1.185
+++ modules/path/path.module	28 Oct 2010 21:09:34 -0000
@@ -119,6 +119,9 @@
     '#collapsible' => TRUE,
     '#collapsed' => empty($path['alias']),
     '#group' => 'additional_settings',
+    '#attributes' => array(
+      'class' => array('path-form'),
+    ),
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'path') . '/path.js'),
     ),
Index: modules/menu/menu.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.js,v
retrieving revision 1.6
diff -u -r1.6 menu.js
--- modules/menu/menu.js	9 Apr 2010 12:24:53 -0000	1.6
+++ modules/menu/menu.js	28 Oct 2010 21:09:34 -0000
@@ -5,8 +5,8 @@
 Drupal.behaviors.menuFieldsetSummaries = {
   attach: function (context) {
     $('fieldset.menu-link-form', context).drupalSetSummary(function (context) {
-      if ($('#edit-menu-enabled', context).attr('checked')) {
-        return Drupal.checkPlain($('#edit-menu-link-title', context).val());
+      if ($('input[name="menu[enabled]"]', context).attr('checked')) {
+        return Drupal.checkPlain($('input[name="menu[link_title]"]', context).val());
       }
       else {
         return Drupal.t('Not in menu');
@@ -22,7 +22,7 @@
   attach: function (context) {
     // Try to find menu settings widget elements as well as a 'title' field in
     // the form, but play nicely with user permissions and form alterations.
-    var $checkbox = $('fieldset.menu-link-form #edit-menu-enabled', context);
+    var $checkbox = $('fieldset.menu-link-form input[name="menu[enabled]"]', context);
     var $link_title = $('#edit-menu-link-title', context);
     var $title = $('#edit-title', context);
     // Bail out if we do not have all required fields.