--- loncom/interface/lonfeedback.pm	2008/12/13 03:50:04	1.259
+++ loncom/interface/lonfeedback.pm	2009/01/23 13:29:15	1.263
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.259 2008/12/13 03:50:04 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.263 2009/01/23 13:29:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1618,7 +1618,7 @@ END
       $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
   my $js= <<END;
@@ -2152,7 +2152,7 @@ $start_page
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="rolefilter" multiple="true" size="5">
+   <select name="rolefilter" multiple="multiple" size="5">
     <option value="all">$role_types{'all'}</option>
     <option value="st">$role_types{'st'}</option>
     <option value="cc">$role_types{'cc'}</option>
@@ -2164,13 +2164,13 @@ $start_page
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="sectionpick" multiple="true" size="$numvisible">
+   <select name="sectionpick" multiple="multiple" size="$numvisible">
     $section_sel
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="grouppick" multiple="true" size="$numvisible">
+   <select name="grouppick" multiple="multiple" size="$numvisible">
     $group_sel
    </select>
   </td>
@@ -2889,9 +2889,18 @@ sub show_preview {
 					
     my $end_page = &Apache::loncommon::end_page();
 
-    $r->print($start_page.'<table border="2"><tr><td>'.
-	      '<b>'.&mt('Subject').':</b> '.$subject.'<br /><br />'.
-	      $message.'</td></tr></table>'.$end_page);
+    $r->print($start_page
+             .'<h1>'.&mt('Preview').'</h1>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+             .$subject
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title(&mt('Message'))
+             .$message
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .$end_page
+    );
 }
 
 
@@ -3247,12 +3256,18 @@ function setblogvalue() {
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources();
-    foreach my $resource (@allres) {
-        if ($resource->hasDiscussion()) {
-            my $ressymb = $resource->wrap_symb();
-            push(@{$resourcesref}, $ressymb);
+    if (defined($navmap)) {
+        my @allres=$navmap->retrieveResources();
+        foreach my $resource (@allres) {
+            if ($resource->hasDiscussion()) {
+                my $ressymb = $resource->wrap_symb();
+                if (ref($resourcesref) eq 'ARRAY') {
+                    push(@{$resourcesref}, $ressymb);
+                }
+            }
         }
+    } else {
+        &Apache::lonnet::logthis('Has discussion check failed - could not create navmap object.');
     }
     return;
 }
@@ -3654,7 +3669,7 @@ ENDREDIR
   } else {
 # ------------------------------------------------------------- Normal feedback
       my $feedurl=$env{'form.postdata'};
-      $feedurl=~s/^http\:\/\///;
+      $feedurl=~s/^https?\:\/\///;
       $feedurl=~s/^$ENV{'SERVER_NAME'}//;
       $feedurl=~s/^$ENV{'HTTP_HOST'}//;
       $feedurl=~s/\?.+$//;