From 4cca81bedf3b69f44158af9119312e7052313009 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 3 Mar 2009 21:58:03 +0000 Subject: [PATCH] - manager: when filtering messages by project, show messages not tagged with a project (fixes #852) - web: show X-project stats links as icons svn path=/trunk/boinc/; revision=17456 --- checkin_notes | 18 ++++++++++++++++++ clientgui/ViewMessages.cpp | 2 +- doc/boinc_news.php | 6 ++++++ doc/projects.inc | 2 +- html/inc/host.inc | 15 +++++++-------- html/inc/stats_sites.inc | 12 ++++++++---- html/inc/team.inc | 2 +- html/ops/cancel_wu_action.php | 4 ++-- html/user/img/boincstats_icon.png | Bin 0 -> 2115 bytes html/user/img/freedc_icon.png | Bin 0 -> 2537 bytes html/user/white.css | 1 - 11 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 html/user/img/boincstats_icon.png create mode 100644 html/user/img/freedc_icon.png diff --git a/checkin_notes b/checkin_notes index 8eb8a9c580..264ff35561 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2563,3 +2563,21 @@ David 3 Mar 2009 client/ work_fetch.cpp + +David 3 Mar 2009 + - manager: when filtering messages by project, + show messages not tagged with a project (fixes #852) + - web: show X-project stats links as icons + + clientgui/ + ViewMessages.cpp + html/ + inc/ + host.inc + team.inc + stats_sites.inc + user/ + img/ + freedc_icon.png + boincstats_icon.png + white.css diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp index 168fc23e35..6f34b61f82 100644 --- a/clientgui/ViewMessages.cpp +++ b/clientgui/ViewMessages.cpp @@ -332,7 +332,7 @@ wxInt32 CViewMessages::GetDocCount() { if (m_bIsFiltered) { for (i = m_iPreviousTotalDocCount; i < m_iTotalDocCount; i++) { MESSAGE* message = wxGetApp().GetDocument()->message(i); - if (message->project == m_strFilteredProjectName) { + if (message->project.empty() || (message->project == m_strFilteredProjectName)) { m_iFilteredIndexes.Add(i); } } diff --git a/doc/boinc_news.php b/doc/boinc_news.php index 3aacc691c0..bae9a2a6f4 100644 --- a/doc/boinc_news.php +++ b/doc/boinc_news.php @@ -1,6 +1,12 @@ United BOINC now offers signature images diff --git a/doc/projects.inc b/doc/projects.inc index 6856e23203..99f06bb985 100644 --- a/doc/projects.inc +++ b/doc/projects.inc @@ -139,7 +139,7 @@ $astro_phys_chem = array( "http://lhcathome.cern.ch/lhcathome/", "CERN (European Organization for Nuclear Research)", "Physics", - "The Large Hadron Collider (LHC) is a particle accelerator which is being built at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory. When it switches on in 2007, it will be the most powerful instrument ever built to investigate on particles proprieties. LHC@home simulates particles traveling around the LHC to study the stability of their orbits.", + "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the European Organization for Nuclear Research, the world's largest particle physics laboratory. It is the most powerful instrument ever built to investigate on particles proprieties. LHC@home runs simulations to improve the design of LHC and its detectors.", "lhc.jpg" ), array( diff --git a/html/inc/host.inc b/html/inc/host.inc index a45bce9556..cc8bbbe62e 100644 --- a/html/inc/host.inc +++ b/html/inc/host.inc @@ -62,17 +62,14 @@ function location_form($host) { return $x; } -function cross_project_links($host, $indent) { +function cross_project_links($host) { 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"; + $img = $h[2]; + $x .= "host_cpid.">\"$name\"\n"; } return $x; } @@ -112,7 +109,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, false)); + row2("Cross project credit", cross_project_links($x)); } row2("CPU type", "$host->p_vendor
$host->p_model"); row2("Number of processors", $host->p_ncpus); @@ -203,6 +200,8 @@ function show_host($host, $user, $ipprivate) { // the following is used for list of top hosts // function top_host_table_start($sort_by) { + global $host_sites; + shuffle($host_sites); start_table(); echo ""; echo "Computer info\n"; @@ -276,7 +275,7 @@ function show_host_row($host, $i, $private, $show_owner) { "; if (!$anonymous) { echo " -
Cross-project credit:
".cross_project_links($host, true); +
Cross-project stats:
".cross_project_links($host); } echo " diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc index 9d8276c99c..2c577dd4b2 100644 --- a/html/inc/stats_sites.inc +++ b/html/inc/stats_sites.inc @@ -177,11 +177,15 @@ $team_name_sites = array( ); $host_sites = array( - array("http://boincstats.com/stats/boinc_host_graph.php?pr=bo&id=", - "BOINCstats.com" + array( + "http://boincstats.com/stats/boinc_host_graph.php?pr=bo&id=", + "BOINCstats.com", + "boincstats_icon.png" ), - array("http://stats.free-dc.org/stats.php?page=hostbycpid&cpid=", - "Free-DC" + array( + "http://stats.free-dc.org/stats.php?page=hostbycpid&cpid=", + "Free-DC", + "freedc_icon.png" ), ); diff --git a/html/inc/team.inc b/html/inc/team.inc index e479cb7953..a6e3feb6b5 100644 --- a/html/inc/team.inc +++ b/html/inc/team.inc @@ -109,7 +109,7 @@ function display_team_page($team, $user) { } $x .= "$site_name
\n"; } - row2(tra('Cross-project credit'), $x); + row2(tra('Cross-project stats'), $x); } row2(tra('Country'), $team->country); row2(tra('Type'), team_type_name($team->type)); diff --git a/html/ops/cancel_wu_action.php b/html/ops/cancel_wu_action.php index f8cbaccee2..b42e313341 100644 --- a/html/ops/cancel_wu_action.php +++ b/html/ops/cancel_wu_action.php @@ -22,8 +22,8 @@ // function test_mysql_query($msg) { - echo "mysql_query($msg)
"; - return 1; + echo "mysql_query($msg)
"; + return 1; } // for purposes of testing and seeing queries, diff --git a/html/user/img/boincstats_icon.png b/html/user/img/boincstats_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4f440836e3e4a1d4083c78d24fe9900e787b6f1c GIT binary patch literal 2115 zcmV-J2)y@+P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXGy z5*84$ec;pp00+ZKL_t(Y$8}a~jGa{#UHg3Jd*1K9=FW6xdS}|9)9Hh@w1|}QFvu$= zrqn(y3c*O>SnKNsO&1%XbfC)$kFf70%0CaAhCV;g@EFv7APVvfp=cGvV51KI3JHWUO zk_Dv{SM&AUW&jkl901N^c18V_hGN7{6h0YCG(zp2n_YNCt_N=-7-auq5 zK|&a53@w~iYNXFvA<@Q8lss7P#Fvrn%o-32hE|+11Iz%?Cp=$-h9bd=v?fjjw1!}S$zV+cK?DXEiPl_Gl^MM#xS{#OMn2As z0$57|l8D%Io!D}mH)6-WyWQyiqFIj~F`*kRm6mNw2JNn%6@oJDcIU1%)#aW-_NP)u zFMCQgm$0s;^9>rJm3kSJ}4t>sqt@%lTS!DG7pB8n$g6$guq#2z^Vf-oA68)|3E&!5WO4 zl^l2xfI0^pK?`PKF>&lV_G7MNO-E63U8~c**0HUno^4%{@ADqI>*{0j+Eqt(m?9d~ zTFm!mT94iL$CbyDG`%26RW=Oc9%&d5LTpV_HRyZJ1C}Y@4Wf8ks~v209qXoU5Z(r0 z!7z+R1gHi=pfvU?HMuygAi^1G!A?{4jcyQelBBkuamN9uxzqI<2TSs;%T`np%Sr}8 z0)|$lPcNUlq9?oJUzG*i;MlShgfRdnt#!r_B4*%uH{%@A;DL50*cwGiFEiU|s*ehT zo>4aDL?XCdTTu1!BfJ%c?>ODAUN2VoqS`g*;`)~y{ocx?Q{ zo7s%ZB=80U*4nYr;0vF>+IjSMPagwgPpMdV%lDk|`C9W%BCI=0L87$Yx#N3Zw=TZ; zN%LdaB3g6RJ=8y#%aOqaCNiKHvDP}0w!2}~$k#TF4S!nz!gZXvIF5^PlGu)AGBc2* z3LwDq+!-Px1hX1lUf#uw!BaEUi&Q!k{M6qP8C4&VRAR@hb#j+Rb z&GzbQtug#zWc{V$Zo-!zHz?x`gRu;pN|DA?wzwy&lkH#q+$Gzm7wXdTJ!tiTpxihK zTVZ6%oNt(x3DYvsZFkXXw6JC6$o!#GGeyI51T!OzV&1r{eCo|36J?q6$+WFA`K=D3 zAjDGJ?kpIT0qFg?)LLWEv|g5Qe3PMn0^-}j1kFITn~-6Nz+jHtd{)|xcDt`wh(SOx zpRMI`{_a+*b2>>?-?6F6m)eH#9j(JsCgV)Z%$3M8F*DzR<=XJIqJ0x5hRnWx%r)95 zrya~MBrviCG>B0EoH&em#Pb@KX=)*edrQTstnWP~5hn>;u@k^s01PIA7ER?P1rAdXfMeD9 z+%*@jUoLUrMTNE7{sE`G7qLS?j6}BhrYo-zqsz;yi#h-39hm3g5G;)!AVHFl`e=gv*Ef{<(G2>gQj5ec!hTu>{|{bu%=0^$WU2rF002ovPDHLkV1nv>18M*O literal 0 HcmV?d00001 diff --git a/html/user/img/freedc_icon.png b/html/user/img/freedc_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5b4efcadf3a6bf1a087ad34c6fea87b0d91ba8 GIT binary patch literal 2537 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 literal 0 HcmV?d00001 diff --git a/html/user/white.css b/html/user/white.css index 9ac0c93788..d93e89fd37 100644 --- a/html/user/white.css +++ b/html/user/white.css @@ -357,7 +357,6 @@ span.page_title { span.note { font-weight: normal; font-size: 0.9em; - font-style: italic; } span.news_date {