From 0a6753ad0f96fa835662291060c7fb46e0ee227a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 2 Jan 2008 17:52:21 +0000
Subject: [PATCH] - web: add "Find friends" link to private friends list - web:
 in user search form, give input focus to name field

svn path=/trunk/boinc/; revision=14459
---
 checkin_notes             |  9 +++++++++
 doc/links.php             |  1 -
 doc/rss_main.php          | 10 +++++++---
 html/inc/user.inc         |  9 +++++----
 html/user/user_search.php |  6 +++++-
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 2e0bad24cd..edbc59ff2e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -42,3 +42,12 @@ Charlie Jan 2 2008
     mac_build/
         Make_BOINC_Service.sh
         
+David  Jan 1 2008
+    - web: add "Find friends" link to private friends list
+    - web: in user search form, give input focus to name field
+
+    html/
+        inc/
+            user.inc
+        user/
+            user_search.php
diff --git a/doc/links.php b/doc/links.php
index 06631c0abb..3c96f86363 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -231,7 +231,6 @@ language("French", array(
     site("http://wwww.boinc-2tf.org", "2TF Asso"),
     site("http://boincfrance.org", "BOINCFRANCE.ORG"),
     site("http://www.boinc-af.org", "L'Alliance Francophone"),
-    site("http://boinc-quebec.org", "boinc-quebec.org")
 ));
 language("German", array(
     site("http://www.boinc-gemeinschaft.de/", "BOINC Gemeinschaft"),
diff --git a/doc/rss_main.php b/doc/rss_main.php
index 1d930ee749..2e2e2c5266 100644
--- a/doc/rss_main.php
+++ b/doc/rss_main.php
@@ -30,7 +30,7 @@ require_once("boinc_news.php");
 // Create channel header and open XML content
 //
 $description = "BOINC project ".PROJECT.": Main page News";
-$channel_image = "http://boinc.berkeley.edu/boinc.gif";
+$channel_image = "http://boinc.berkeley.edu/www_logo.gif";
 $create_date  = gmdate('D, d M Y H:i:s') . ' GMT'; 
 $language = "en-us";
 echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
@@ -38,7 +38,11 @@ echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
     <channel>
         <title>BOINC</title>
         <link>http://boinc.berkeley.edu</link>
-        <description>Berkeley Open Infrastructure for Network Computing</description>
+        <description>
+            News and announcements related to
+            BOINC (Berkeley Open Infrastructure for Network Computing),
+            an open-source platform for volunteer and grid commputing.
+        </description>
         <copyright>U.C. Berkeley</copyright>
         <lastBuildDate>$create_date</lastBuildDate>
         <language>$language</language>
@@ -60,7 +64,7 @@ for( $item=0; $item < $news; $item++ ) {
         $news_date=gmdate('D, d M Y H:i:s',$d) . ' GMT';
         $unique_url="http://boinc.berkeley.edu/all_news.php#$j";
         echo "<item>
-            <title>Project News ".strip_tags($project_news[$item][0])."</title>
+            <title>BOINC news ".strip_tags($project_news[$item][0])."</title>
             <link>http://boinc.berkeley.edu/all_news.php#$j</link>
             <guid isPermaLink=\"true\">$unique_url</guid>
             <description><![CDATA[".strip_tags($project_news[$item][1])."]]></description>
diff --git a/html/inc/user.inc b/html/inc/user.inc
index 81b283c260..51d97ec43b 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -256,15 +256,14 @@ function show_community_private($user) {
     }
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
+    $x = "<a href=user_search.php>Find friends</a><br>\n";
     if (count($friends)) {
-        $x = null;
         foreach($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             $x .= friend_links($fuser);
         }
-        row2("Friends", $x);
     }
-
+    row2("Friends", $x);
 }
 
 // show summary of dynamic and static info (public)
@@ -312,6 +311,8 @@ function community_links($user) {
             row2("This person is a friend", 
                 "<a href=friend.php?action=cancel_confirm&userid=$user->id>Cancel friendship</a>"
             );
+        } else if ($friend) {
+            row2("Friends", "<a href=friend.php?action=add&userid=$user->id>Request pending</a>");
         } else {
             row2("Friends", "<a href=friend.php?action=add&userid=$user->id>Add as friend</a>");
         }
@@ -323,7 +324,7 @@ function community_links($user) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             $x .= friend_links($fuser);
         }
-        row2("Friends", $x);
+        row2("", $x);
     }
 
 }
diff --git a/html/user/user_search.php b/html/user/user_search.php
index cc9c903cad..5c250b2913 100644
--- a/html/user/user_search.php
+++ b/html/user/user_search.php
@@ -91,7 +91,7 @@ function do_search($order, $filter) {
 
 function search_form() {
     page_head("User search");
-    echo "<form method=get action=user_search.php>";
+    echo "<form name=f method=get action=user_search.php>";
     start_table();
     row1("Search type", 2, "heading");
     row2("User name starts with <input name=search_string>", "<input type=radio name=search_type value=\"name_prefix\" checked >");
@@ -114,6 +114,10 @@ function search_form() {
     ");
     row2("", "<input type=submit name=action value=Search>");
     end_table();
+    echo "
+        <script>document.f.search_string.focus()</script>
+    ";
+            
     page_tail();
 }