From d848e54518f486496a989bad31b0f09bef9b2aa1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 19 Feb 2009 05:03:02 +0000 Subject: [PATCH] - web tweaks svn path=/trunk/boinc/; revision=17306 --- checkin_notes | 11 +++++++++++ html/inc/host.inc | 17 ++++++++++------- html/inc/result.inc | 1 - html/user/result.php | 2 +- html/user/show_host_detail.php | 2 +- html/user/workunit.php | 4 ++-- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/checkin_notes b/checkin_notes index 0cc042d55e..b62fc89192 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1696,3 +1696,14 @@ David 18 Feb 2009 work_fetch.cpp lib/ error_numbers.h + +David 18 Feb 2009 + - web tweaks + + html/ + inc/ + host.inc + result.inc + user/ + workunit.php + result.php diff --git a/html/inc/host.inc b/html/inc/host.inc index 29e9dbd504..a4cd799aae 100644 --- a/html/inc/host.inc +++ b/html/inc/host.inc @@ -62,13 +62,16 @@ function location_form($host) { return $x; } -function cross_project_links($host) { +function cross_project_links($host, $indent) { global $host_sites; $x = ""; shuffle($host_sites); foreach ($host_sites as $h) { $url = $h[0]; $name = $h[1]; + if ($indent) { + $x .= "  "; + } $x .= "host_cpid.">$name
\n"; } return $x; @@ -109,7 +112,7 @@ function show_host($host, $user, $ipprivate) { row2("Total credit", format_credit_large($host->total_credit)); row2("Average credit", format_credit($host->expavg_credit)); if (!$anonymous) { - row2("Cross project credit", cross_project_links($x)); + row2("Cross project credit", cross_project_links($x, false)); } row2("CPU type", "$host->p_vendor
$host->p_model"); row2("Number of processors", $host->p_ncpus); @@ -202,7 +205,7 @@ function show_host($host, $user, $ipprivate) { function top_host_table_start($sort_by) { start_table(); echo ""; - echo "Computer ID\n"; + echo "Computer info\n"; echo "Rank"; echo "Owner\n"; if ($sort_by == 'total_credit') { @@ -262,13 +265,13 @@ function show_host_row($host, $i, $private, $show_owner) { } } } - echo " - • id>Details -
id>Tasks + echo "ID: $host->id +
id>Details | + id>Tasks "; if (!$anonymous) { echo " -
• Cross-project credit:
".cross_project_links($host); +
Cross-project credit:
".cross_project_links($host, true); } echo " diff --git a/html/inc/result.inc b/html/inc/result.inc index 324ce3e8d8..62fbf7d428 100644 --- a/html/inc/result.inc +++ b/html/inc/result.inc @@ -259,7 +259,6 @@ function exit_status_string($result) { function show_result($result) { start_table(); - row2("Task ID", $result->id); row2("Name", $result->name); row2("Workunit", "workunitid\">$result->workunitid"); row2("Created", time_str($result->create_time)); diff --git a/html/user/result.php b/html/user/result.php index 9ee924f7c0..16a29aab4f 100644 --- a/html/user/result.php +++ b/html/user/result.php @@ -27,7 +27,7 @@ $result = lookup_result($resultid); if (!$result) { error_page("No such task"); } -page_head("Task details"); +page_head("Task $resultid"); show_result($result); page_tail(); diff --git a/html/user/show_host_detail.php b/html/user/show_host_detail.php index 2ee306034b..ae80f7d786 100644 --- a/html/user/show_host_detail.php +++ b/html/user/show_host_detail.php @@ -34,7 +34,7 @@ if ($user->id != $host->userid) { $user = null; } -page_head("Computer summary"); +page_head("Computer $hostid"); show_host($host, $user, $ipprivate); page_tail(); diff --git a/html/user/workunit.php b/html/user/workunit.php index bf36f2da1d..230c4aef0a 100644 --- a/html/user/workunit.php +++ b/html/user/workunit.php @@ -28,13 +28,13 @@ if (!$wu) { error_page("can't find workunit"); } -page_head("Workunit details"); +page_head("Workunit $wuid"); $app = BoincApp::lookup_id($wu->appid); start_table(); +row2("name", $wu->name); row2("application", $app->user_friendly_name); row2("created", time_str($wu->create_time)); -row2("name", $wu->name); if ($wu->canonical_resultid) { row2("canonical result", "canonical_resultid>$wu->canonical_resultid"