--- loncom/interface/lonfeedback.pm	2008/11/21 20:17:11	1.257
+++ loncom/interface/lonfeedback.pm	2009/05/07 11:12:47	1.272
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.257 2008/11/21 20:17:11 jms Exp $
+# $Id: lonfeedback.pm,v 1.272 2009/05/07 11:12:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,7 +110,7 @@ sub list_discussion {
         return $blocktext; 
     }
 
-    my @bgcols = ("#cccccc","#eeeeee");
+    my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($env{'request.course.id'}) { return ''; }
@@ -434,7 +434,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
    }
 </script>
             |;
-	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
+                         "\n".'<table class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
@@ -547,7 +548,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     }
                     $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
                 } else {
-                    $discussion.='<td  bgcolor="'.$bgcols[$newitem{$alldiscussion{$post}}].
+                    $discussion.='<td class="'.$bgcols[$newitem{$alldiscussion{$post}}].
                        '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
                        '</td></tr>';
                 }
@@ -557,8 +558,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             my $colspan=$maxdepth+1;
             $discussion .= <<END;
             <tr bgcolor="#FFFFFF">
-             <td colspan="$colspan" valign="top">
-              <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+             <td colspan="$colspan" class="LC_disc_action_links_bar">
+              <table class="LC_disc_action_table">
                <tr>
                 <td align="left">
                  <table border="0" cellpadding="0" cellspacing="4">
@@ -625,7 +626,7 @@ END
                             $filterchoice .= '&nbsp;'.$role_types{$role}.',';
                         }
                         $filterchoice =~ s/,$//;
-                        $filterchoice .= '<br />&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+                        $filterchoice .= '<br />'.('&nbsp;' x8);
                     }
                     if ($statusfilter) {
                         $filterchoice .= '<i>'.&mt('status').'</i>-&nbsp;'.$status_types{$statusfilter};
@@ -639,9 +640,9 @@ END
             if ($dischash{$toggkey}) {
                 my $storebutton = &mt('Save read/unread changes');
                 $discussion.='<td align="right">'.
-              '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+              '<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
-              ' onClick="this.form.submit();">'."\n".
+              ' onClick="this.form.submit();" />'."\n".
               '</td>';
             }
             $discussion .= (<<END);
@@ -765,18 +766,18 @@ sub send_message_link {
     my $output = '<span class="LC_message_link">'.
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
                  &escape($ressymb).'"><img alt="" src="'.
-                 &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
-                 '" border="0" />'.&mt('Send Message').'</a></span>';
+                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
+                 '" border="0" />'.&mt('Send Feedback').'</a></span>';
     return $output;
 }
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
-    my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
-                     '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+    my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
+                     '<table width="100%" class="LC_disc_action_table"><tr>';
     my $escsymb=&escape($ressymb);
     if ($visible>2) {
-        $discussion .= '<td align="left">'.
+        $discussion .= '<td class="LC_disc_action_left">'.
                        '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
@@ -789,16 +790,16 @@ sub action_links_bar {
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                       <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
+                       <a href="/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
         }
         $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
+        $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
     } else {
-        $discussion .= '<td align="left">';
+        $discussion .= '<td class="LC_disc_action_left>';
     }
-    $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+    $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
         $discussion .= '&previous='.$prevread;
     }
@@ -806,7 +807,7 @@ sub action_links_bar {
     $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
     if ($newpostsflag) {
         if (!$markondisp) {
-            $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+            $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
             $discussion .= &group_args($group);
             $discussion .= '">'.
                            &mt('Preferences on what is marked as NEW').
@@ -1247,7 +1248,7 @@ sub build_posting_display {
                                  <p><table border="0" width="100%">
                                   <tr><td align="left">&nbsp;</td>';
                             }
-                            $$discussionitems[$idx] .= '<td align ="left">&nbsp;&nbsp;'.
+                            $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
                                 $sender.'</b> '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
@@ -1618,7 +1619,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;
@@ -1684,8 +1685,8 @@ END
 END
   } elsif ($env{'form.editdisc'}) {
      $r->print(<<END);
-<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
-<input type="hidden" name="parentmsg" value ="$parentmsg" />
+<input type="hidden" name="editdisc" value="$env{'form.editdisc'}" />
+<input type="hidden" name="parentmsg" value="$parentmsg" />
 END
   }
   $r->print(<<END);
@@ -1695,6 +1696,8 @@ $quote
 <p>$lt{'myqu'}</p>
 <p>
 $latexHelp
+</p>
+<p>
 $lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
 <p>
 <textarea name="comment" id="comment" cols="60" rows="10" wrap="hard">$comment
@@ -1795,7 +1798,7 @@ sub print_display_options {
         'actn' => 'Action',
         'deff' => 'Default for all discussions',
         'prca' => 'Preferences can be set for this discussion that determine ....',
-        'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+        'whpo' => 'Which posts are displayed when you display this discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identified as "NEW", and',
         'wipa' => 'Whether individual posts can be marked as read/unread',
         'allposts' => 'All posts',
@@ -1960,7 +1963,7 @@ END
        <td>$lt{$disctogg}</td>
        <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
 END
-    my $save = &mt('Save Changes');
+    my $save = &mt('Save');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
     $r->print(<<END);
@@ -1968,9 +1971,9 @@ END
 <br />
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchgA" value=""/>
-<input type="hidden" name="$dispchgB" value=""/>
-<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$dispchgA" value="" />
+<input type="hidden" name="$dispchgB" value="" />
+<input type="hidden" name="$markchg" value="" />
 <input type="hidden" name="$toggchg" value="" />
 <input type="button" name="sub" value="$save" onClick="javascript:setDisp()" />
 END
@@ -2152,7 +2155,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 +2167,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>
@@ -2475,7 +2478,8 @@ sub redirect_back {
   }
   my $grouptag;
   if ($group ne '') {
-      $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';      my $refarg;
+      $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';
+      my $refarg;
       if (exists($env{'form.ref'})) {
           $refarg = '&amp;ref='.$env{'form.ref'};
           $grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
@@ -2605,9 +2609,16 @@ sub screen_header {
             }
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) {
+        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+                   .' '.&mt('Send Feedback').'</h2>'
+                   .$msgoptions;
+    }
     if ($discussoptions) { 
-	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/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;
 }
 
@@ -2889,9 +2900,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
+    );
 }
 
 
@@ -2924,7 +2944,7 @@ sub generate_preview_button {
     return(<<ENDPREVIEW);
 <br />
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
-<input type="hidden" name="subject">
+<input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
 onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
@@ -3033,7 +3053,7 @@ END
         $r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
     }
     $r->print(<<END);
- <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()"/>
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()" />
 </form>
 $end_page
 END
@@ -3095,8 +3115,8 @@ this.form.submit();" />
 <input type="hidden" name="timestamp" value="$now" />
 <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
-<input type="hidden" name="blog" value = "0" />
-<input type="hidden" name="discuss" value = "0" />
+<input type="hidden" name="blog" value="0" />
+<input type="hidden" name="discuss" value="0" />
 <input type="hidden" name="numoldver" value="$numoldver" />
 ENDATTACH
     if (defined($deloldattach)) {
@@ -3247,12 +3267,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;
 }
@@ -3299,7 +3325,7 @@ sub handler {
          ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
   my $group = $env{'form.group'};
   my %attachmax = (
-                    text => '(128 KB max size)',
+                    text => &mt('(128 KB max size)'),
                     num  => 131072,
                   );
   if ($env{'form.editdisc'}) {
@@ -3429,7 +3455,7 @@ sub handler {
       my %lt = &Apache::lonlocal::texthash(
           'mnpa' => 'Marked "New" posts as read in a total of',
           'robb' => 'resources/bulletin boards.',
-          'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
+          'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
       );       
       foreach my $res (@resources) {
           my $ressymb=$res;
@@ -3575,7 +3601,7 @@ ENDREDIR
 	  &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
       } else {
  	  &Apache::lonnet::del('environment',['threadeddiscussion']);
-	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
+	  &Apache::lonnet::delenv('environment.threadeddiscussion');
       }
       &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
 		     '0','0','','',$env{'form.previous'},undef,undef,undef,
@@ -3654,7 +3680,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/\?.+$//;
@@ -4086,4 +4112,4 @@ None
 
 =back
 
-=cut
\ No newline at end of file
+=cut