? 439660_notices.patch
? ui_review.patch
Index: openid_cp_field.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openid_cp_field/openid_cp_field.module,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 openid_cp_field.module
--- openid_cp_field.module	20 Apr 2009 12:22:20 -0000	1.1.2.4
+++ openid_cp_field.module	20 Apr 2009 22:54:17 -0000
@@ -122,7 +122,7 @@ function openid_cp_field_map($form_state
     $rows[] = array('node' => $node_label, 'openid' => $sreg_fields[$openid] . ' (SReg)', 'link' => l(t('Delete'), "openid_cp_field/delete/{$type['type']}/". base64_encode($openid) .'/sreg'));
   }
   if (count($rows) > 0) {
-    $current_map = theme('table', array('node' => t('Node field'), 'openid' => t('OpenID'), 'link' => t('Operation')), $rows);
+    $current_map = theme('table', array('node' => t('Node field'), 'openid' => t('OpenID field'), 'link' => t('Operation')), $rows);
   }
   if ($source == OPENID_CP_FIELD_NORMAL) {
     $source_msg = t('defined via the user interface.');
@@ -135,9 +135,8 @@ function openid_cp_field_map($form_state
   }
   $form['current_map'] = array(
     '#type' => 'fieldset',
-    '#title' => t('The currently defined relationships'),
-    '#collapsible' => TRUE,
-    '#collapsed' => count($rows) > 0 ? FALSE : TRUE,
+    '#title' => t('Mappings'),
+    '#collapsible' => FALSE,
     '#description' => t('The source of the current mapping is: !source', array('!source' => $source_msg)),
   );
   $form['current_map']['map'] = array(
@@ -151,10 +150,10 @@ function openid_cp_field_map($form_state
   }
   $form['map'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Define a relationship between OpenID attributes and CCK fields'),
+    '#title' => t('Map node fields to OpenID attributes'),
   );
   if (count($options_node) == 0 || count($openid_attrs) == 0) {
-    $form['map']['info'] = array('#value' => t('No more fields to map, please delete a relationship if you want to modify the current mapping.'));
+    $form['map']['info'] = array('#value' => t('No more fields to map. Please delete a relationship to modify current mapping.'));
   }
   else {
     drupal_add_css(drupal_get_path('module', 'openid_cp_field') ."/openid_cp_field.css", "module");
@@ -175,10 +174,10 @@ function openid_cp_field_map($form_state
   }
   $form['map_sreg'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Define a relationship between OpenID Simple Registration fields and CCK fields'),
+    '#title' => t('Map node fields to OpenID Simple Registration (SReg) fields'),
   );
   if (count($options_node) == 0 || count($openid_sreg_fields) == 0) {
-    $form['map_sreg']['info'] = array('#value' => t('No more fields to map, please delete a relationship if you want to modify the current mapping.'));
+    $form['map_sreg']['info'] = array('#value' => t('No more fields to map. Please delete a relationship to modify current mapping.'));
   }
   else {
     $form['map_sreg']['sreg_map_a'] = array(
@@ -188,7 +187,7 @@ function openid_cp_field_map($form_state
     );
     $form['map_sreg']['sreg_map_b'] = array(
       '#type' => 'select',
-      '#title' => t('SReg Field'),
+      '#title' => t('Simple Registration field'),
       '#options' => $openid_sreg_fields,
     );
     $form['map_sreg']['submit'] = array(