*** empty log message ***

svn path=/trunk/boinc/; revision=11614

checkin_notes

@@ -13093,3 +13093,13 @@ David  4 Dec 2006
     sched/
         main.C
         server_types.C
+
+David  4 Dec 2006
+    - scheduler: don't send anything special to browsers.
+        Send reply as XML.
+    - simple GUI: work is done by a user, not for a user
+
+    sched/
+        server_types.C
+    clientgui/
+        sg_StatImageLoader.cpp

clientgui/sg_StatImageLoader.cpp

@@ -100,7 +100,7 @@ void StatImageLoader::BuildUserStatToolTip() {
     PROJECT* project = pDoc->state.lookup_project(m_prjUrl);
 
     strBuffer.Printf(
-        _("%s. Work done for %s: %0.2f"),
+        _("%s. Work done by %s: %0.2f"),
         wxString(project->project_name.c_str(), wxConvUTF8).c_str(),
         wxString(project->user_name.c_str(), wxConvUTF8).c_str(),
         project->user_total_credit

doc/boinc_news.php

@@ -1,6 +1,12 @@
 <?
 
 $project_news = array(
+array("December 4, 2006",
+    "A recent article in the Bulletin of the Howard Hughes Medical Institute,
+    <a href=http://www.hhmi.org/bulletin/nov2006/pdf/Cast.pdf>A Cast of Thousands<a/>, discusses the
+    <a href=http://boinc.bakerlab.org/rosetta/>Rosetta@home</a> project
+    and its army of dedicated volunteers."
+),
 array("November 27, 2006",
     "Jean-Michel Penasse of L'Alliance Francophone
     has create a web site,

doc/help.php

@@ -3,7 +3,7 @@ require_once("docutil.php");
 require_once("spoken_languages.php");
 require_once("help_db.php");
 
-page_head("BOINC Online Help (Beta)");
+page_head("BOINC Online Help");
 
 echo "
 <h2>Need help?</h2>
@@ -33,13 +33,19 @@ to communicate with Help Volunteers.
 <p>
 Volunteers speaking several languages are available.
 Please select a language:
-<br>
+<p>
 ";
 
 $langs = get_languages();
+$first = true;
 foreach ($langs as $lang) {
     $lang_enc = urlencode($lang);
-    echo "<br><a href=help_lang.php?lang=$lang_enc>Get help in $lang</a>";
+    if ($first) {
+        $first = false;
+    } else {
+        echo " | ";
+    }
+    echo "<a href=help_lang.php?lang=$lang_enc><b>$lang</b></a>";
 }
 echo "
 <h2>Other sources of help</h2>

doc/index.php

@@ -74,7 +74,8 @@ function show_participate() {
         such as <a href=http://gridrepublic.org>GridRepublic</a>
         or <a href=http://bam.boincstats.com/>BAM!</a>.
         <center>
-        <a href=participate.php><b><nobr>Details</nobr></b></a> 
+        <a href=participate.php><b><nobr>More info</nobr></b></a> 
+        | <a href=help.php><b>Help</b></a>
         | <a href=download.php><b>Download</b></a>
         | <a href=links.php><b><nobr>Web sites</nobr></b></a>
         | <a href=addons.php><b>Add-ons</b></a>

doc/participate.php

@@ -2,12 +2,15 @@
 require_once("docutil.php");
 page_head("Participating in BOINC projects");
 echo "
-<h3>General information</h3>
+<h3>Beginning</h3>
+    You've
+    <a href=help.php>Talk or chat with a BOINC volunteer</a>
+        for information about BOINC or for help installing BOINC.
+<h3>Intermediate</h3>
 <ul>
 <li> <a href=intro_user.php>Getting started</a>
 <li> <a href=info.php>Usage rules and privacy policy</a>
 <li> <a href=account.php>Choosing and joining projects</a>
-<li> <a href=download.php>Download BOINC</a>
 <li> Installing BOINC
 <ul>
 <li> <a href=win_install.php>The Windows installer</a>
@@ -20,7 +23,6 @@ echo "
 <ul>
 <li> <a href=manager.php>The BOINC manager</a>
 <li> <a href=screensaver.php>The BOINC screensaver</a>
-<li> <a href=client_unix.php>Core client options and configuration</a>
 </ul>
 
 <li> <a href=prefs.php>Preferences</a>
@@ -29,14 +31,19 @@ echo "
 <li> <a href=host_id.php>Host identification and merging</a>
 <li> <a href=multiple_projects.php>Participating in multiple projects</a>
 <li> <a href=credit.php>Computation credit</a>
-<li> <a href=cpu_sched.php>CPU scheduling</a>
 <li> <a href=teams.php>Teams</a>
+<li> <a href=acct_mgrs.php>Account managers</a>
+</ul>
+<h3>Advanced</h3>
+<ul>
+<li> <a href=client_unix.php>Core client options and configuration</a>
 <li> <a href=anonymous_platform.php>Make your own client software</a>
     <br>Run BOINC on uncommon platforms,
         or inspect the source code before you run it.
-<li> <a href=acct_mgrs.php>Account managers</a>
 <li> <a href=http://www.cs.wisc.edu/condor/manual/v6.7/3_13Setting_Up.html#SECTION004138000000000000000>BOINC as a Condor backfill job</a>
 <li> <a href=proxy_server.php>Proxy servers</a> (why BOINC doesn't have them).
+<li> <a href=cpu_sched.php>CPU scheduling</a>
+<li> <a href=manager_skin.php>Creating a skin for the BOINC Manager</a>
 </ul>
 <p>
 <h3>Related projects</h3>

sched/server_types.C

@@ -415,24 +415,9 @@ int SCHEDULER_REPLY::write(FILE* fout) {
     unsigned int i, j;
     char buf[LARGE_BLOB_SIZE];
 
-    if (probable_user_browser) {
-        // User is probably trying to look at cgi output with a browser.
-        // Redirect them to the project home page.
-
-        fprintf(fout,
-            "Content-type: text/html\n\n"
-            "<HTML><BODY>\n\n"
-            "This is a BOINC project scheduler, and is not "
-            "intended for viewing in a web browser."
-            " Visit the project's <a href=\"%s\">main page</a> instead.\n\n"
-            "</BODY></HTML>\n",
-            config.master_url
-        );
-        return 0;
-    }
-
     fprintf(fout,
-        "Content-type: text/plain\n\n"
+        "Content-type: text/xml\n\n"
+        "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n"
         "<scheduler_reply>\n"
         "<scheduler_version>%d</scheduler_version>\n",
         BOINC_MAJOR_VERSION*100+BOINC_MINOR_VERSION