--- loncom/interface/lonparmset.pm	2005/06/28 15:26:06	1.234
+++ loncom/interface/lonparmset.pm	2005/06/28 16:28:16	1.237
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.234 2005/06/28 15:26:06 albertel Exp $
+# $Id: lonparmset.pm,v 1.237 2005/06/28 16:28:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -904,12 +904,12 @@ ENDSCRIPT
     $r->print("\n<table><tr>");
     my $cnt=0;
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-	$r->print("\n<td><font size='-1'><input type='checkbox' name='pscat' ");
+	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
 	$r->print('value="'.$tempkey.'"');
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked');
 	}
-	$r->print('>'.$$allparms{$tempkey}.'</font></td>');
+	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -1067,6 +1067,18 @@ sub keysinorder {
     } (keys %{$name});
 }
 
+sub keysinorder_bytype {
+    my ($name,$keyorder)=@_;
+    return sort {
+	my $ta=(split('_',$a))[-1];
+	my $tb=(split('_',$b))[-1];
+	if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
+	    return ($a cmp $b);
+	}
+	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
+    } (keys %{$name});
+}
+
 sub keysindisplayorder {
     my ($name,$keyorder)=@_;
     return sort {
@@ -1076,16 +1088,17 @@ sub keysindisplayorder {
 
 sub sortmenu {
     my ($r,$sortorder)=@_;
-    $r->print('<br /><input type="radio" name="sortorder" value="realmstudent"');
+    $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
     if ($sortorder eq 'realmstudent') {
        $r->print(' checked="on"');
     }
     $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
-    $r->print('<br /><input type="radio" name="sortorder" value="studentrealm"');
+    $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
     if ($sortorder eq 'studentrealm') {
        $r->print(' checked="on"');
     }
-    $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
+    $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
+	      '</label>');
 }
 
 sub standardkeyorder {
@@ -1469,7 +1482,7 @@ ENDTABLEHEADFOUR
 
                         $r->print('</font></tt></td>');
 
-                        foreach (&keysinorder(\%name,\%keyorder)) {
+                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
@@ -2167,6 +2180,11 @@ sub listdata {
 	if ($sortorder eq 'realmstudent') {
 	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
 	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+	    if (!defined($astudent) && !defined($bstudent) &&
+		!defined($arealm) && !defined($brealm)) {
+		($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+		($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+	    }
             ($arealm cmp $brealm) || ($astudent cmp $bstudent);
 	} else {
 	    $a cmp $b;