Index: coherent_access.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/coherent_access/coherent_access.module,v
retrieving revision 1.2.2.7
diff -u -p -r1.2.2.7 coherent_access.module
--- coherent_access.module   8 Apr 2010 09:56:11 -0000   1.2.2.7
+++ coherent_access.module   20 Aug 2010 17:19:17 -0000
@@ -456,8 +456,8 @@ function coherent_access_nodeapi(&$node,
         }
         break;
       case 'view':
-        $node->content['editors'] = theme('node_editors', $node);
-        $node->content['viewers'] = theme('node_viewers', $node);
+        $node->content['editors'] = array('#value' => theme('coherent_access_editors', $node), '#weight' => '-2');
+        $node->content['viewers'] = array('#value' => theme('coherent_access_viewers', $node), '#weight' => '-2');
         break;
       case 'update':
         $gids = coherent_access_get_gids($node->nid);
@@ -640,6 +640,8 @@ function theme_coherent_access_button($e
 }
 
 /**
+ * Implementation of hook_theme().
+ *
  * Ideally this will go away with the rework of coherent_access_shared_editing()
  */
 function coherent_access_theme() {
@@ -647,6 +649,12 @@ function coherent_access_theme() {
     'coherent_access_button' => array(
       'arguments' => array('element' => NULL),
     ),
+    'coherent_access_editors' => array(
+      'arguments' => array('node' => NULL),
+    ),
+    'coherent_access_viewers' => array(
+      'arguments' => array('node' => NULL),
+    ),
   );
 }
 
@@ -719,36 +727,30 @@ function coherent_access_mail($key, &$me
   $message['body'] = strtr($body, $replace);
 }
 
-function theme_node_editors($node) {
-  $content = array('#value' => '', '#weight' => '-2');
+function theme_coherent_access_editors($node) {
+  $content = '';
   if (!empty($node->coherent_access['editors'])) {
-    $content['#value'] = '<div class="coherent-access-editors">'. t('Editors: ');
+    $content .= '<div class="coherent-access-editors"><span class="label">'. t('Editors') . ':</span> ';
     $linked = array();
     foreach ($node->coherent_access['editors'] as $uid => $name) {
       $linked[] = l($name, 'user/'. $uid);
     } 
-    $content['#value'] .= implode(', ', $linked);
-    $content['#value'] .= '</div>';
-  }
-  else {
-    $content['#value'] =  '';
+    $content .= '<span class="items">' . implode(', ', $linked) . '</span>';
+    $content .= '</div>';
   }
   return $content;
 }
 
-function theme_node_viewers($node) {
-  $content = array('#value' => '', '#weight' => '-2');
+function theme_coherent_access_viewers($node) {
+  $content = '';
   if (!empty($node->coherent_access['viewers'])) {
-    $content['#value'] = '<div class="coherent-access-viewers">'. t('Viewers: ');
+    $content .= '<div class="coherent-access-viewers"><span class="label">'. t('Viewers') . ':</span> ';
     $linked = array();
     foreach ($node->coherent_access['viewers'] as $uid => $name) {
       $linked[] = l($name, 'user/'. $uid);
     }
-    $content['#value'] .= implode(', ', $linked);
-    $content['#value'] .= '</div>';
-  }
-  else {
-    $content['#value'] =  '';
+    $content .= '<span class="items">' . implode(', ', $linked) . '</span>';
+    $content .= '</div>';
   }
   return $content;
 }