--- loncom/interface/lonfeedback.pm	2004/12/23 14:00:58	1.147
+++ loncom/interface/lonfeedback.pm	2005/02/17 04:11:20	1.151
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.147 2004/12/23 14:00:58 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.151 2005/02/17 04:11:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -749,7 +749,7 @@ ENDDISCUSS
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
 		    $ressymb.':::" '.$target.'>'.
-		    '<img src="/adm/lonMisc/chat.gif" border="0" />'.
+		    '<img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
 		    &mt('Post Discussion').'</a></td></tr></table>';
 	    }
 	}
@@ -974,9 +974,9 @@ sub build_posting_display {
                             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		        }
                         if ($$dischash{$readkey}=~/\.$idx\./) { 
-                            $ctlink = '<b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
                         } else {
-                            $ctlink = '<b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" />';
+                            $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
                         }
                     }
 #figure out at what position this needs to print
@@ -1753,18 +1753,18 @@ $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l
        <tr bgcolor="#dddddd">
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"
+       <td><label><input type="checkbox" name="discdisp" onClick="discdispChk('0')" />&nbsp;$lt{'chgt'} "$dispchangeA"</label>
            <br />
-           <input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"
+           <label><input type="checkbox" name="discdisp" onClick="discdispChk('1')" />&nbsp;$lt{'chgt'} "$dispchangeB"</label>
        </td>
       </tr><tr bgcolor="#eeeeee">
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
-       <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+       <td><label><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</label></td>
       </tr><tr bgcolor="#dddddd">
        <td>$lt{'dotm'}</td>
        <td>$lt{$disctogg}</td>
-       <td><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</td>
+       <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
       </tr>
      </table>
     </td>
@@ -1929,7 +1929,7 @@ $bodytag
    </select>
   </td>
   <td>&nbsp;</td>
-  <td><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</td>
+  <td><label><input type="checkbox" name="posterlist" value="$symb" />$lt{'shal'}</label></td>
  </tr>
 </table>
 <br />
@@ -2024,7 +2024,7 @@ END
                     next;
                 } else {
                     $count ++;
-                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</td><td>'.$postcounts{$_}.'</td></tr>');
+                    $r->print('<tr bgcolor="#ffffe6"><td align="right">'.$count.'</td><td align="center"><label><input name="stuinfo" type="checkbox" value="'.$_.'" /></td><td>'.$last.', '.$first.' ('.$uname.','.$udom.')</label></td><td>'.$postcounts{$_}.'</td></tr>');
                 }
             }
         }
@@ -2105,9 +2105,10 @@ sub get_post_attachments {
     return;
 }
 
-sub fail_redirect {;
+sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDFAILREDIR);
 <html>
 <head><title>Feedback not sent</title>
@@ -2115,7 +2116,7 @@ sub fail_redirect {;
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>Sorry, no recipients  ...</b>
 <br /><a href="$feedurl">Continue</a>
 </body>
@@ -2193,6 +2194,7 @@ sub redirect_back {
       }
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -2201,7 +2203,7 @@ sub redirect_back {
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
 <font color="red">$status</font>
@@ -2234,10 +2236,11 @@ ENDNOREDIR
 		&Apache::lonenc::check_encrypt($feedurl).'">');
   }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 <b>$nofeed</b>
 <br /><a href="$feedurl">$continue</a>
 </body>
@@ -2252,23 +2255,25 @@ sub screen_header {
     unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) {
 	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
 	    $msgoptions= 
-		'<p><input type="checkbox" name="author" /> '.
-		&mt('Feedback to resource author').'</p>';
+		'<p><label><input type="checkbox" name="author" /> '.
+		&mt('Feedback to resource author').'</label></p>';
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="question" /> '.
-		&mt('Question about resource content');
+		'<p><label><input type="checkbox" name="question" /> '.
+		&mt('Question about resource content').'</label></p>';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="course" /> '.
-		&mt('Question/Comment/Feedback about course content');
+		'<p><label><input type="checkbox" name="course" /> '.
+		&mt('Question/Comment/Feedback about course content').
+		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<br /><input type="checkbox" name="policy" /> '.
-		&mt('Question/Comment/Feedback about course policy');
+		'<p><label><input type="checkbox" name="policy" /> '.
+		&mt('Question/Comment/Feedback about course policy').
+		'</label></p>';
 	}
     }
     if ($ENV{'request.course.id'}) {
@@ -2276,17 +2281,17 @@ sub screen_header {
 	    &Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
-	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
+	    $discussoptions='<label><input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
 		($ENV{'form.replydisc'}?' checked="1"':'').' /> '.
 		&mt('Contribution to course discussion of resource');
-	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+	    $discussoptions.='</label><br /><label><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
 		&mt('Anonymous contribution to course discussion of resource').
-		' <i>('.&mt('name only visible to course faculty').')</i>';
+		' <i>('.&mt('name only visible to course faculty').')</i></label>';
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="/adm/lonMisc/feedback.gif" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="/adm/lonMisc/chat.gif" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
 }
 
@@ -2627,7 +2632,7 @@ END
                 foreach my $id (@currold) {
                     my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
                     $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'<br />'."\n");
+                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
                 }
                 $r->print("<br />");
             }
@@ -2637,7 +2642,7 @@ END
         $r->print("The following attachments have been uploaded for inclusion with this posting.<br />Check the checkboxes for any you wish to remove<br />\n");
         foreach (@{$currnewattach}) {
             $_ =~ m#/([^/]+)$#;
-            $r->print('<input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'<br />'."\n");
+            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$_.'" />&nbsp;'.$1.'</label><br />'."\n");
         }
         $r->print("<br />"); 
     }
@@ -3054,6 +3059,7 @@ END
       }
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
+      my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -3062,7 +3068,7 @@ END
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
-<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<img align="right" src="$logo" />
 $textline
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>