From d86c0b280299cd546e9fffd04dda1a7fc0202578 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 24 Dec 2009 22:47:53 +0000
Subject: [PATCH] - web tweaks

svn path=/trunk/boinc/; revision=20037
---
 doc/white.css       |  6 ++++++
 html/inc/news.inc   |  6 ++++--
 html/inc/result.inc |  8 ++------
 html/user/white.css | 17 ++++++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/doc/white.css b/doc/white.css
index 57df6795e0..f3cb2659dd 100644
--- a/doc/white.css
+++ b/doc/white.css
@@ -71,6 +71,12 @@ span.note{
 span.news_date {
     color: rgb(100,100,100);
     font-size: 0.9em;
+    float: right;
+}
+
+hr.news_line {
+    border: 0;
+    border-bottom: 1px solid rgb(200, 200, 200);
 }
 
 pre {
diff --git a/html/inc/news.inc b/html/inc/news.inc
index 82f603833a..ead4a4d024 100644
--- a/html/inc/news.inc
+++ b/html/inc/news.inc
@@ -33,7 +33,7 @@ function news_item($date, $title, $post) {
     }
     echo "
         <span class=news_content>$text</span>
-        <br><span class=news_date>$d
+        <span class=news_date>$d
     ";
     if ($forum_link) {
         echo "
@@ -41,6 +41,8 @@ function news_item($date, $title, $post) {
         ";
     }
     echo "</span>
+        <br clear=all>
+        <hr size=0 class=news_line>
     ";
 }
 
@@ -89,7 +91,7 @@ function show_news($start, $count) {
     ";
     printf(tra("News is available as an %sRSS feed%s"),
         "<a href=rss_main.php>",
-        "</a> &nbsp; <img src=\"img/rss_icon.gif\" alt=\"RSS\"></p>"
+        " &nbsp; <img src=\"img/rss_icon.gif\" alt=\"RSS\"></a>"
     );
 }
 
diff --git a/html/inc/result.inc b/html/inc/result.inc
index 4d0566ab09..f189ef518d 100644
--- a/html/inc/result.inc
+++ b/html/inc/result.inc
@@ -123,18 +123,14 @@ function state_string($result) {
         case 2: return "Couldn't send";
         case 3:
             if ($result->exit_status == -221) {
-                return "Redundant result";
+                return "Cancelled by server";
             }
             switch($result->client_state) {
             case 1: return "Error while downloading";
             case 2: return "Error while computing";
             case 3: return "Error while computing";
             case 4: return "Error while uploading";
-            case 6:
-                if ($result->exit_status == -221) {
-                    return "Cancelled by server";
-                }
-                return "Aborted by user";
+            case 6: return "Aborted by user";
             }
             return "Error";
         case 4: return "Timed out - no response";
diff --git a/html/user/white.css b/html/user/white.css
index ebc5f1b126..a430baf7b2 100644
--- a/html/user/white.css
+++ b/html/user/white.css
@@ -1,5 +1,5 @@
 a, a:link, a:visited, a:active {
-	color: #0069A1; 
+	color: #0069A1;
 }
 
 body {
@@ -15,6 +15,11 @@ hr {
 	border-top: 2px solid #e8e8e8;
 }
 
+hr.news_line {
+    border: 0;
+    border-bottom: 1px solid rgb(200, 200, 200);
+}
+
 table.bordered {
 	border-color: #e8e8e8;
 }
@@ -87,7 +92,7 @@ a.button {
 
 input[type="button"]:hover,
 input[type="submit"]:hover,
-input.btn:hover, 
+input.btn:hover,
 .button:hover ,
 .forum_toplinks a:hover {
 	border: 1px solid #555;
@@ -116,11 +121,11 @@ td.category , tr.subtitle{
 	background-color: #ddd;
 }
 
-td.postheader { 
+td.postheader {
 	background-color: #eee;
 }
 
-td.postbody { 
+td.postbody {
 	background: transparent url('img/75pct_white.png');
 }
 
@@ -148,7 +153,9 @@ blockquote.postbody {
 }
 
 span.news_date {
-	color: #646464;
+    color: rgb(100,100,100);
+    font-size: 0.9em;
+    float: right;
 }
 
 span.highlight {