--- loncom/interface/lonfeedback.pm	2009/04/24 13:02:09	1.270
+++ loncom/interface/lonfeedback.pm	2009/10/12 18:46:03	1.277
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.270 2009/04/24 13:02:09 www Exp $
+# $Id: lonfeedback.pm,v 1.277 2009/10/12 18:46:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,7 +91,7 @@ sub list_discussion {
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
             &Apache::lonenc::check_encrypt(\$ressymb); 
-            return '<br />'.&send_message_link($ressymb);
+            return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -103,9 +103,12 @@ sub list_discussion {
     my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('boards');
     if ($blocked) {
+        $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
         &Apache::lonenc::check_encrypt(\$ressymb);
         if ($mode ne 'board') {
-            $blocktext.='<br />'.&send_message_link($ressymb);
+            $blocktext.=&send_message_link($ressymb).'</div>';
+        }else{
+            $blocktext.="</div>";
         }
         return $blocktext; 
     }
@@ -755,9 +758,9 @@ sub send_feedback_link {
     my $output = '<span class="LC_feedback_link">'.
                  ' <a href="/adm/feedback?replydisc='.
                  &escape($ressymb).':::" '.$target.'>'.
-                 '<img alt="" src="'.
+                 '<img alt="" class="LC_noBorder" src="'.
                  &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
-                 '" border="0" />'.&mt('Post Discussion').'</a></span>';
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span></a></span>';
     return $output;
 }
 
@@ -765,20 +768,20 @@ sub send_message_link {
     my ($ressymb) = @_;
     my $output = '<span class="LC_message_link">'.
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
-                 &escape($ressymb).'"><img alt="" src="'.
+                 &escape($ressymb).'"><img alt="" class="LC_noBorder" src="'.
                  &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
-                 '" border="0" />'.&mt('Send Message').'</a></span>';
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
     return $output;
 }
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
     my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
-                     '<table width="100%" class="LC_disc_action_table"><tr>';
+                     '<table width="100%" class="LC_disc_action_table"><tr>'.
+                     '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
     if ($visible>2) {
-        $discussion .= '<td class="LC_disc_action_left">'.
-                       '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
+        $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
         }
@@ -790,16 +793,14 @@ 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;' x2);
-    } else {
-        $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;
     }
@@ -1167,7 +1168,7 @@ sub build_posting_display {
                     $$imsitems{$idx}{'attach'}=$attachtxt{$numoldver};
                     $$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'};
                     $$imsitems{$idx}{'sender'}=$plainname.' ('.
-                                         $contrib{$idx.':sendername'}.' at '.
+                                         $contrib{$idx.':sendername'}.':'.
                                          $contrib{$idx.':senderdomain'}.')';
                     $$imsitems{$idx}{'isanonymous'}='false';
                     if ($contrib{$idx.':anonymous'}) {
@@ -1248,7 +1249,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>';
@@ -1364,7 +1365,7 @@ sub get_post_contents {
                                  $$plainname,
                                  $$contrib{$idx.':sendername'},
                                  $$contrib{$idx.':senderdomain'}).' ('.
-                                 $$contrib{$idx.':sendername'}.' at '.
+                                 $$contrib{$idx.':sendername'}.':'.
                                  $$contrib{$idx.':senderdomain'}.')';
     my $attachmenturls = $$contrib{$idx.':attachmenturl'};
     my @postversions = ();
@@ -1661,10 +1662,15 @@ END
 </script>
 END
 
+  # Breadcrumbs
+  my $brcrum = [{'href' => '',
+                 'text' => 'Resource Feedback and Discussion'}];
+
   my %onload = ('onload' => 'window.focus();setposttype();');
   my $start_page=
       &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
-				     {'add_entries' => \%onload});
+                                     {'add_entries' => \%onload,
+                                      'bread_crumbs' => $brcrum,});
 
   if ($quote ne '') {
       &newline_to_br(\$quote);
@@ -1685,8 +1691,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);
@@ -1928,7 +1934,7 @@ END
 	&Apache::loncommon::end_page();
     $r->print(<<END);
 $start_page
-<form name="modifydisp" method="POST" action="/adm/feedback">
+<form name="modifydisp" method="post" action="/adm/feedback">
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
 <br />
 END
@@ -2116,7 +2122,7 @@ END
 
     $r->print(<<END);
 $start_page
-<form name="modifyshown" method="POST" action="/adm/feedback">
+<form name="modifyshown" method="post" action="/adm/feedback">
 <b>$lt{'diso'}</b><br/> $lt{'prca'}
 <br /><br />
 <table border="0">
@@ -2609,9 +2615,16 @@ sub screen_header {
             }
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'.&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;
 }
 
@@ -2966,8 +2979,12 @@ sub modify_attachments {
 </script> 
 END
 
+    # Breadcrumbs
+    my $brcrum = [{'href' => '',
+                   'text' => 'Discussion Post Attachments'}];
     my $start_page = 
-	&Apache::loncommon::start_page('Discussion Post Attachments',$js);
+	&Apache::loncommon::start_page('Discussion Post Attachments',$js,
+                                   {'bread_crumbs' => $brcrum,});
 
     my $orig_subject = &unescape($env{'form.subject'});
     my $subject=&clear_out_html($orig_subject,undef,1);
@@ -3108,8 +3125,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)) {
@@ -3363,7 +3380,13 @@ sub handler {
       &Apache::loncommon::no_cache($r);
       $r->send_http_header;
 
-      $r->print(&Apache::loncommon::start_page('Discussion Post Versions'));
+      # Breadcrumbs
+      my $brcrum = [{'href' => '',
+                     'text' => 'Discussion Post Versions'}];
+
+      $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,
+                                               {'bread_crumbs' => $brcrum,})
+      );
 
       my $crs='/'.$env{'request.course.id'};
       if ($env{'request.course.sec'}) {