Merge lp:~ara/ubuntu-qa-website/bug_506450 into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

[Ara Pulido]

[Ara Pulido (ara)]

It fixes the links for both Ubuntu Netbook and Kubuntu Netbook.

=== modified file 'code/modules/qatracker/qatracker.display.php'
--- code/modules/qatracker/qatracker.display.php	2010-01-11 16:31:07 +0000
+++ code/modules/qatracker/qatracker.display.php	2010-01-14 09:48:15 +0000
@@ -1028,9 +1028,13 @@
 	elseif (ereg("Netboot",$info->product)) {
 		$url['path']="http://archive.ubuntu.com/ubuntu/dists/".$url['release']."/main/installer-".$url['arch']."/current/images/";
 	}
-	elseif (ereg("Netbook",$info->product)) {
-		$url['type']="/ubuntu-netbook-remix/daily-live/";
-		$url['file']=$url['release']."-netbook-remix-i386.iso";
+	elseif (ereg("Ubuntu Netbook",$info->product)) {
+		$url['type']="/ubuntu-netbook/daily-live/";
+		$url['file']=$url['release']."-netbook-i386.iso";
+	}
+	elseif (ereg("Kubuntu Netbook",$info->product)) {
+		$url['type']="/kubuntu-netbook/daily-live/";
+		$url['file']=$url['release']."-netbook-i386.iso";
 	}
 	elseif (ereg("Moblin",$info->product)) {
 		$url['type']="/ubuntu-moblin-remix/daily-live/";
@@ -1043,6 +1047,10 @@
 	if ($url['distro'] != "")
 		$url['distro']="/".$url['distro'];
 
+	#Kubuntu Netbook is not in the kubuntu folder
+	if (ereg("Kubuntu Netbook",$info->product)) 
+		$url['distro']= "";
+
 	if ($url['path'])
 		$url['path_iso']=$url['path'];
 	else {