? patches
Index: nodewords_admin/nodewords_admin.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_admin/Attic/nodewords_admin.admin.inc,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 nodewords_admin.admin.inc
--- nodewords_admin/nodewords_admin.admin.inc	1 Nov 2010 07:14:31 -0000	1.1.2.10
+++ nodewords_admin/nodewords_admin.admin.inc	29 Nov 2010 18:49:03 -0000
@@ -40,7 +40,7 @@ function nodewords_admin_settings_form()
 
   if (!empty($tags_info)) {
     foreach ($tags_info as $name => $info) {
-      $options[$name] = '';
+      $options[$name] = $info['label'];
 
       $bool = (
         (
@@ -59,35 +59,21 @@ function nodewords_admin_settings_form()
       }
     }
 
-    $form['enabled'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Enabled meta tags'),
-      '#description' => t('These settings change the meta tags that will be output, and shown in edit forms.'),
-      '#collapsible' => TRUE,
-      '#weight' => 0,
-      '#group' => 'nodewords',
-    );
-
-    $form['enabled']['output'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Meta tags to output'),
-      '#description' => t('These settings change the meta tags that will be output. Meta tags are used in search indexes only if there are modules implementing the necessary code.'),
-      '#collapsible' => TRUE,
-      '#theme' => 'nodewords_admin_output_fieldset',
-    );
-
-    $form['enabled']['output']['nodewords_head'] = array(
+    $form['nodewords_head'] = array(
       '#type' => 'checkboxes',
+      '#title' => t('Enabled meta tags'),
       '#options' => $options,
       '#default_value' => variable_get('nodewords_head', array()),
       '#checkall' => TRUE ? 'nodewords-head-output' : FALSE,
     );
 
-    $form['enabled']['output']['nodewords_search_index'] = array(
-      '#type' => 'checkboxes',
-      '#options' => $options,
-      '#default_value' => variable_get('nodewords_search_index', array()),
-      '#checkall' => TRUE ? 'nodewords-search-index-output' : FALSE,
+    $form['enabled'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Meta tag forms'),
+      '#description' => t('These settings change which meta tags are shown in edit forms.'),
+      '#collapsible' => TRUE,
+      '#weight' => 0,
+      '#group' => 'nodewords',
     );
 
     $form['enabled']['admin'] = array(
@@ -127,11 +113,6 @@ function nodewords_admin_settings_form()
       '#value' => variable_get('nodewords_head', array()),
     );
 
-    $form['nodewords_search_index'] = array(
-      '#type' => 'value',
-      '#value' => variable_get('nodewords_search_index', array()),
-    );
-
     $form['nodewords_admin_edit'] = array(
       '#type' => 'value',
       '#value' => variable_get('nodewords_admin_edit', array()),
@@ -371,33 +352,6 @@ function theme_nodewords_admin_enabled_m
   return theme('table', $header, $rows) . drupal_render($form);
 }
 
-/**
- * Render the output settings fieldset.
- */
-function theme_nodewords_admin_output_fieldset($form) {
-  foreach (nodewords_get_possible_tags() as $name => $info) {
-    $row = array();
-
-    $row[] = $info['label'];
-    $row[] = drupal_render($form['nodewords_head'][$name]);
-    $row[] = drupal_render($form['nodewords_search_index'][$name]);
-
-    $rows[] = $row;
-  }
-
-  $header[] = t('Meta tag');
-  $header[] = array(
-    'data' => t('In HTML tag HEAD'),
-    'class' => (TRUE && count($rows) > 1) ? 'nodewords-head-output' : '',
-  );
-  $header[] = array(
-    'data' => t('In search index'),
-    'class' => (TRUE && count($rows) > 1) ? 'nodewords-search-index-output' : '',
-  );
-
-  return theme('table', $header, $rows) . drupal_render($form);
-}
-
 function _nodewords_admin_mass_delete_batch_process($ids, $type, &$context) {
   if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
Index: nodewords_admin/nodewords_admin.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_admin/Attic/nodewords_admin.module,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 nodewords_admin.module
--- nodewords_admin/nodewords_admin.module	8 Nov 2010 04:56:40 -0000	1.1.2.13
+++ nodewords_admin/nodewords_admin.module	29 Nov 2010 18:49:03 -0000
@@ -129,10 +129,6 @@ function nodewords_admin_theme() {
       'arguments' => array('form' => array()),
       'file' => 'nodewords_admin.admin.inc',
     ),
-    'nodewords_admin_output_fieldset' => array(
-      'arguments' => array('form' => array()),
-      'file' => 'nodewords_admin.admin.inc',
-    ),
   );
 }