--- loncom/interface/lonhelper.pm	2004/08/12 05:44:36	1.85
+++ loncom/interface/lonhelper.pm	2004/09/24 19:49:12	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.85 2004/08/12 05:44:36 albertel Exp $
+# $Id: lonhelper.pm,v 1.87 2004/09/24 19:49:12 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1174,6 +1174,13 @@ sub end_choice {
     return '';
 }
 
+{
+    # used to generate unique id attributes for <input> tags. 
+    # internal use only.
+    my $id = 0;
+    sub new_id { return $id++; }
+}
+
 sub render {
     my $self = shift;
     my $var = $self->{'variable'};
@@ -1256,6 +1263,7 @@ BUTTONS
     my $type = "radio";
     if ($self->{'multichoice'}) { $type = 'checkbox'; }
     foreach my $choice (@{$self->{CHOICES}}) {
+        my $id = &new_id();
         $result .= "<tr>\n<td width='20'>&nbsp;</td>\n";
         $result .= "<td valign='top'><input type='$type' name='$var.forminput'"
             . "' value='" . 
@@ -1264,6 +1272,7 @@ BUTTONS
         if ($checkedChoices{$choice->[1]}) {
             $result .= " checked ";
         }
+        $result .= qq{id="$id"};
         my $choiceLabel = $choice->[0];
         if ($choice->[4]) {  # if we need to evaluate this choice
             $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
@@ -1271,7 +1280,8 @@ BUTTONS
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-        $result .= "/></td><td> " . &mtn($choiceLabel) . "</td></tr>\n";
+        $result .= "/></td><td> ".qq{<label for="$id">}.
+            &mtn($choiceLabel). "</label></td></tr>\n";
     }
     $result .= "</table>\n\n\n";
     $result .= $buttons;
@@ -2375,6 +2385,13 @@ sub start_filefilter {
 
 sub end_filefilter { return ''; }
 
+{ 
+    # used to generate unique id attributes for <input> tags. 
+    # internal use only.
+    my $id=0;
+    sub new_id { return $id++;}
+}
+
 sub render {
     my $self = shift;
     my $result = '';
@@ -2513,14 +2530,16 @@ BUTTONS
             if ($status eq 'Published' && $helper->{VARS}->{'construction'}) {
                 $onclick = 'onclick="a=1" ';
             }
+            my $id = &new_id();
             $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
                 "<input $onclick type='$type' name='" . $var
-            . ".forminput' value='" . HTML::Entities::encode($fileName,'<>&"').
+            . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,'<>&"').
                 "'";
             if (!$self->{'multichoice'} && $choices == 0) {
                 $result .= ' checked';
             }
-            $result .= "/></td><td bgcolor='$color'>" . $file . "</td>" .
+            $result .= "/></td><td bgcolor='$color'>".
+                qq{<label for="$id">}. $file . "</label></td>" .
                 "<td bgcolor='$color'>$title</td>" .
                 "<td bgcolor='$color'>$status</td>" . "</tr>\n";
             $choices++;
@@ -2548,10 +2567,14 @@ sub fileState {
     my $constructionSpaceDir = shift;
     my $file = shift;
     
+    my ($uname,$udom)=($ENV{'user.name'},$ENV{'user.domain'});
+    if ($ENV{'request.role'}=~/^ca\./) {
+	(undef,$udom,$uname)=split(/\//,$ENV{'request.role'});
+    }
     my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $subdirpart = $constructionSpaceDir;
-    $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
-    my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+    $subdirpart =~ s/^\/home\/$uname\/public_html//;
+    my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
         $subdirpart;
 
     my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);