Index: modules/update_status/update_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/update_status/update_status.module,v
retrieving revision 1.48
diff -u -p -r1.48 update_status.module
--- modules/update_status/update_status.module	19 Jun 2007 23:44:41 -0000	1.48
+++ modules/update_status/update_status.module	20 Jun 2007 00:37:36 -0000
@@ -605,16 +605,18 @@ function theme_update_status_report($dat
         $row .= t('Up to date');
         break;
       case UPDATE_STATUS_NOT_CURRENT:
-        $row .= t('Update available');
+        if (!empty($project['security updates'])) {
+          $row .= '<span class="security-warning">'. t('Security update required!') .'</span>';
+        }
+        else {
+          $row .= t('Update available');
+        }
         break;
       default:
         $row .= t('Ignored');
         $row .= ' ('. $project['reason'] .')';
         break;
     }
-    if ($project['status'] == UPDATE_STATUS_NOT_CURRENT && !empty($project['security updates'])) {
-      $row .= '<div class="security-warning">'. t('Security update required!') .'</div>';
-    }
     $row .= '<span class="icon">'. $icon .'</span>';
     $row .= "</div>\n";
 
@@ -627,8 +629,14 @@ function theme_update_status_report($dat
     $row .= "</div>\n";
 
     if ($project['existing_version'] != $project['recommended'] || $project['status'] != UPDATE_STATUS_CURRENT) {
-      $row .= theme('update_status_version', $project['releases'][$project['recommended']], t('Recommended version:'), 'version-recommended');
-
+      // Print the "Recommended" line if there are either 0 or more than 1
+      // security updates, or if there's exactly 1 security update and it has
+      // a different version than what we recommend. In other words, if
+      // there's only one security update and it's what we were going to
+      // recommended anyway, don't print it twice.
+      if (count($project['security updates']) != 1 || $project['security updates'][0]['version'] != $project['recommended']) {
+        $row .= theme('update_status_version', $project['releases'][$project['recommended']], t('Recommended version:'), 'version-recommended');
+      }
       if (!empty($project['security updates'])) {
         foreach ($project['security updates'] as $security_update) {
           $row .= theme('update_status_version', $security_update, t('Security update:'), 'version-security');
Index: modules/update_status/update_status.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/update_status/update_status.css,v
retrieving revision 1.11
diff -u -p -r1.11 update_status.css
--- modules/update_status/update_status.css	22 May 2007 00:07:45 -0000	1.11
+++ modules/update_status/update_status.css	20 Jun 2007 00:37:36 -0000
@@ -77,9 +77,11 @@
   padding-right: 1em;
 }
 
+.update-status table.version-security .version-title {
+  color: #970F00;
+}
+
 .update-status .security-warning {
   font-weight: bold;
   color: #970F00;
-  float: left;
-  padding-right: .5em;
 }