Merge lp:~primes2h/ubuntu-qa-website/bugs_733364_733369 into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

Proposed by Sergio Zanchetta on 2011-03-12
Status: Merged
Merged at revision: 155
Proposed branch: lp:~primes2h/ubuntu-qa-website/bugs_733364_733369
Merge into: lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk
Diff against target: 49 lines (+6/-5)
1 file modified
code/modules/qatracker/qatracker.display.php (+6/-5)
To merge this branch: bzr merge lp:~primes2h/ubuntu-qa-website/bugs_733364_733369
Reviewer Review Type Date Requested Status
Ubuntu QA Website Developers 2011-03-12 Pending
Review via email: mp+53111@code.launchpad.net

Description of the change

Laptop tracker:
 * Made -Not tested- linkable to allow testing. (LP:#733364)
 * Linked testcase icon to testcase page. (LP:#733369)
 * Added two whitespaces before laptop name in summary table, adjusted comment formatting in balloons.

Database:
In qawebsite_user_setting table, site specific descriptions needs to be uniformed and commands highlighted.

Run sudo dmidecode -s system-manufacturer → Run "<b>sudo dmidecode -s system-manufacturer</b><br \>and capitalize first letter of the output only (e.g. TOSHIBA → Toshiba)"

Run sudo dmidecode -s system-product-name → Run "<b>sudo dmidecode -s system-product-name</b>"

Run `lspci -v` → Run "<b>lspci -v</b>"

Run `lsusb` → Run "<b>lsusb</b>" without any external device attached

`lshw -short` → Run "<b>lshw -short</b>"

P.S.:" " could also be ` `

To post a comment you must log in.
156. By Sergio Zanchetta on 2011-03-15

Added two whitespaces before laptop name in summary table, adjusted comment formatting in balloons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'code/modules/qatracker/qatracker.display.php'
2--- code/modules/qatracker/qatracker.display.php 2011-03-09 14:32:59 +0000
3+++ code/modules/qatracker/qatracker.display.php 2011-03-15 14:33:34 +0000
4@@ -923,7 +923,7 @@
5 WHERE siteid='".$site->id."' AND title LIKE '".$release."%' AND productid='".$productID."'
6 ORDER BY qatracker_milestone.id");
7
8- $testcases=db_query("SELECT id,title FROM qatracker_testcase WHERE productid='".$productID."'");
9+ $testcases=db_query("SELECT id,title,link FROM qatracker_testcase WHERE productid='".$productID."'");
10 $product = db_result(db_query("SELECT title from qatracker_product WHERE id='".$productID."'"));
11
12 $milestones=array();
13@@ -972,7 +972,7 @@
14 $content.="</tr>";
15 }
16 $content.=" <tr class=\"block".$productID."".$countv."\" style=\"display:none;\">
17- <td style=\"width=230px;\">&nbsp; <img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/test.png\" alt=\"spacer\" /> ".$title[1]."</td>";
18+ <td style=\"width=230px;\">&nbsp; <a rel=\"external\" href=\"".$testcase->link."\"><img style=\"margin-bottom:-3px;\" src=\"$base_url/modules/qatracker/images/test.png\" alt=\"spacer\" /></a> ".$title[1]."</td>";
19 foreach($milestones as $build => $milestone) {
20 $results=db_fetch_object(db_query("SELECT result,comment FROM qatracker_result WHERE reporterid='".$reporterID."' AND buildid='".$build."' AND testcaseid='".$testcase->id."'"));
21 if ($results->result != null) {
22@@ -980,7 +980,7 @@
23 if ($results->comment != null) {
24 $content.="<b style=\"margin-right:-32px;font-size:10px;\">?</b>
25 <div class=\"balloonleft\" style=\"margin-bottom:0px;\"><div>
26- <b>Comment: <br \></b>".$results->comment."</div>";
27+ <b>Comment: <br \></b>".nl2br($results->comment)."</div>";
28 }
29 switch($results->result) {
30 case "0":
31@@ -995,7 +995,8 @@
32 $content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, 0)."<br \></td>";
33 }
34 else
35- $content.="<td cellpadding=\"10\" style=\"text-align:center;font-size:10px;\">Not <br \> tested</td>";
36+ $content.="<td cellpadding=\"10\" style=\"text-align:center;font-size:10px;\">
37+ <a style=\"color:#000000\" rel=\"external\" href=\"$base_url/qatracker/result/".$build."/".$testcase->id."\">Not <br \> tested</a></td>";
38 }
39 $content.=" </tr>";
40 }
41@@ -1064,7 +1065,7 @@
42 $content.="<tr><td colspan=\"3\" style=\"background-color:#e6e6e6;\"><b>".$laptopmake."</b></td></tr>";
43 }
44 $content.=" <tr>
45- <td style=\"width:20%;\">&nbsp;".$laptopname."</td>
46+ <td style=\"width:20%;\">&nbsp;&nbsp;&nbsp;".$laptopname."</td>
47 <td style=\"width:30%;\">&nbsp;".$reporter."&nbsp;→&nbsp;<a rel=\"external\" href=\"https://launchpad.net/~".$lpusername[$reporter]."\">".$lpusername[$reporter]."</a></td>";
48
49 $content.=" <td><table>";

Subscribers

People subscribed via source and target branches

to status/vote changes: