← Back to branch summary

~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

« back to all changes in this revision

Viewing changes to code/modules/qatracker/qatracker.display.php

  • Committer: Stéphane Graber
  • Date: 2010-01-14 17:15:16 UTC
  • mfrom: (137.2.1 bug_506450)
  • Revision ID: stgraber@ubuntu.com-20100114171516-o8um06coyztd2lnp
Merge change for Netbook edition (and Kubuntu Netbook)

Show diffs side-by-side

added added

removed removed

Lines of Context:
code/modules/qatracker/qatracker.display.php
1028
1028
        elseif (ereg("Netboot",$info->product)) {
1029
1029
                $url['path']="http://archive.ubuntu.com/ubuntu/dists/".$url['release']."/main/installer-".$url['arch']."/current/images/";
1030
1030
        }
1031
 
        elseif (ereg("Netbook",$info->product)) {
1032
 
                $url['type']="/ubuntu-netbook-remix/daily-live/";
1033
 
                $url['file']=$url['release']."-netbook-remix-i386.iso";
 
1031
        elseif (ereg("Ubuntu Netbook",$info->product)) {
 
1032
                $url['type']="/ubuntu-netbook/daily-live/";
 
1033
                $url['file']=$url['release']."-netbook-i386.iso";
 
1034
        }
 
1035
        elseif (ereg("Kubuntu Netbook",$info->product)) {
 
1036
                $url['type']="/kubuntu-netbook/daily-live/";
 
1037
                $url['file']=$url['release']."-netbook-i386.iso";
1034
1038
        }
1035
1039
        elseif (ereg("Moblin",$info->product)) {
1036
1040
                $url['type']="/ubuntu-moblin-remix/daily-live/";
1043
1047
        if ($url['distro'] != "")
1044
1048
                $url['distro']="/".$url['distro'];
1045
1049
 
 
1050
        #Kubuntu Netbook is not in the kubuntu folder
 
1051
        if (ereg("Kubuntu Netbook",$info->product)) 
 
1052
                $url['distro']= "";
 
1053
 
1046
1054
        if ($url['path'])
1047
1055
                $url['path_iso']=$url['path'];
1048
1056
        else {