diff --git a/checkin_notes b/checkin_notes index 9ec8bfbdda..98b6786465 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5851,3 +5851,11 @@ Rom 10 Aug 2010 clientgui/ WizardAttach.h + +David 10 Aug 2010 + - user web: add platform names and elapsed-time info + (represented as "average processing rate") + to host application details page. + + html/user/ + host_app_versions.php diff --git a/doc/help_funcs.php b/doc/help_funcs.php index 870020164e..f5be7c4d64 100644 --- a/doc/help_funcs.php +++ b/doc/help_funcs.php @@ -98,4 +98,22 @@ function star_select($name, $val) { return $x; } +function help_warning() { + echo " + + "; +} + ?> diff --git a/doc/help_lang.php b/doc/help_lang.php index 49427cf164..11c3943b0c 100644 --- a/doc/help_lang.php +++ b/doc/help_lang.php @@ -98,26 +98,18 @@ function show_vol($vol) { } function show_vols($vols) { - echo "

+ echo " You can send email to a volunteer even if they're offline. To do so, click their name.

- Volunteers can answer questions about the BOINC client software, - not about the server software. - If you're setting up a BOINC project, - this is not the place to get help. + "; + help_warning(); + echo " +

+ If you're setting up a BOINC project, this is not the place to get help. Instead, try the boinc_projects email list. -

- Note: BOINC helpers are unpaid volunteers. - Their advice is not endorsed by BOINC - or the University of California. -

- Note: Never give out - email address/username and password information to anybody, - for any online service. - "; list_start("border=0"); list_heading_array(array( diff --git a/doc/help_vol.php b/doc/help_vol.php index 295b7085f0..b6a10899fb 100644 --- a/doc/help_vol.php +++ b/doc/help_vol.php @@ -56,17 +56,9 @@ function live_contact($vol) { "; } - echo " -

- Note: BOINC helpers are unpaid volunteers. - Their advice is not endorsed by BOINC - or the University of California. -

- Note: Never give out - email address/username and password information to anybody, - for any online service. -


- "; + echo "

"; + help_warning(); + echo "


"; } function show_rating($vol, $rating) { diff --git a/doc/white.css b/doc/white.css index d607112443..561384c6c7 100644 --- a/doc/white.css +++ b/doc/white.css @@ -10,6 +10,13 @@ pre, code { font-size: medium; } +.emphasize { + font-weight: bold; +} +.emphasize2 { + color: red; +} + a.heading { font-size: 14px; } diff --git a/html/user/host_app_versions.php b/html/user/host_app_versions.php index 5f130e4c74..2c71679c21 100644 --- a/html/user/host_app_versions.php +++ b/html/user/host_app_versions.php @@ -25,9 +25,11 @@ function av_desc($gavid) { if (!$av) return "Missing app version"; $app = BoincApp::lookup_id($av->appid); if (!$app) return "Missing app"; + $platform = BoincPlatform::lookup_id($av->platformid); + if (!$platform) return "Missing platform"; $pc = (strlen($av->plan_class))?"($av->plan_class)":""; $v = number_format($av->version_num/100, 2); - return "$app->user_friendly_name $v $pc"; + return "$app->user_friendly_name $v $platform->name $pc"; } } @@ -38,6 +40,8 @@ function show_hav($hav) { row2("Number of tasks today", $hav->n_jobs_today); row2("Consecutive valid tasks", $hav->consecutive_valid); $x = number_format($hav->turnaround_avg/86400, 2); + $gflops = 1e-9/$hav->et_avg; + row2("Average processing rate", $gflops); row2("Average turnaround time", "$x days"); } @@ -45,7 +49,7 @@ $hostid = get_int('hostid'); $havs = BoincHostAppVersion::enum("host_id=$hostid"); -page_head("Application info for host $hostid"); +page_head(tra("Application details for host %1", $hostid)); start_table(); foreach ($havs as $hav) { //if (!$hav->pfc_n) continue; diff --git a/locale/templates/BOINC-Project-Generic.pot b/locale/templates/BOINC-Project-Generic.pot index bd7a7001f6..8d0b2b85b4 100644 --- a/locale/templates/BOINC-Project-Generic.pot +++ b/locale/templates/BOINC-Project-Generic.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: BOINC $Id$\n" "Report-Msgid-Bugs-To: BOINC translation team \n" -"POT-Creation-Date: 2010-07-14 12:19 PDT\n" +"POT-Creation-Date: 2010-08-10 12:43 PDT\n" "Last-Translator: Generated automatically from source files\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -211,8 +211,8 @@ msgstr "" msgid "Operating System" msgstr "" -#: ../inc/host.inc:122 -msgid "BOINC client version" +#: ../inc/host.inc:122 ../inc/host.inc:226 +msgid "BOINC version" msgstr "" #: ../inc/host.inc:126 @@ -297,7 +297,7 @@ msgid "Tasks" msgstr "" #: ../inc/host.inc:179 -msgid "Number of times client has contacted server" +msgid "Number of times BOINC has contacted server" msgstr "" #: ../inc/host.inc:180 @@ -306,7 +306,7 @@ msgstr "" #: ../inc/host.inc:181 #, php-format -msgid "% of time BOINC client is running" +msgid "% of time BOINC is running" msgstr "" #: ../inc/host.inc:183 @@ -365,10 +365,6 @@ msgstr "" msgid "Recent average credit" msgstr "" -#: ../inc/host.inc:226 -msgid "BOINC version" -msgstr "" - #: ../inc/host.inc:227 ../inc/host.inc:624 ../inc/result.inc:42 msgid "CPU" msgstr "" @@ -1041,7 +1037,7 @@ msgid "Validate error" msgstr "" #: ../inc/result.inc:149 ../inc/result.inc:178 -msgid "Client detached" +msgid "Abandoned" msgstr "" #: ../inc/result.inc:160 @@ -1053,7 +1049,7 @@ msgid "Success" msgstr "" #: ../inc/result.inc:172 -msgid "Client error" +msgid "Computation error" msgstr "" #: ../inc/result.inc:174 @@ -2417,6 +2413,10 @@ msgstr "" msgid "Your account" msgstr "" +#: ../user/host_app_versions.php:52 +msgid "Application details for host %1" +msgstr "" + #: ../user/hosts_user.php:51 msgid "Computers belonging to %1" msgstr "" @@ -2692,9 +2692,9 @@ msgstr "" #: ../user/prefs.php:36 msgid "" -"Your preferences have been updated. Client-related preferences\n" +"Your preferences have been updated, and\n" "\t will take effect when your computer communicates with %1\n" -"\t or you issue the %2Update%3 command from the BOINC client." +"\t or you issue the %2Update%3 command from the BOINC Manager." msgstr "" #: ../user/prefs_edit.php:72 ../user/prefs_edit.php:101 @@ -2837,7 +2837,7 @@ msgstr "" msgid "User of the day" msgstr "" -#: ../user/show_user.php:91 +#: ../user/show_user.php:88 msgid "Account data for %1" msgstr "" diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot index e7bf39491b..a38cded590 100644 --- a/locale/templates/BOINC-Web.pot +++ b/locale/templates/BOINC-Web.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: BOINC $Id$\n" "Report-Msgid-Bugs-To: BOINC translation team \n" -"POT-Creation-Date: 2010-05-03 10:16 PDT\n" +"POT-Creation-Date: 2010-08-10 12:43 PDT\n" "Last-Translator: Generated automatically from source files\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -150,6 +150,16 @@ msgid "" "If you're already a Help Volunteer: to edit your settings, %sclick here%s." msgstr "" +#: help_funcs.php:107 +msgid "" +"BOINC helpers are unpaid volunteers. Their advice is not endorsed by BOINC " +"or the University of California." +msgstr "" + +#: help_funcs.php:110 +msgid "%1Never%2 give email address or password information to BOINC helpers." +msgstr "" + #: index.php:23 msgid "Computing power" msgstr ""