--- loncom/interface/lonfeedback.pm	2009/05/28 19:38:33	1.274
+++ 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.274 2009/05/28 19:38:33 kalberla Exp $
+# $Id: lonfeedback.pm,v 1.277 2009/10/12 18:46:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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 /><div class="LC_feedback_link">'.&send_message_link($ressymb).'</div>';
+            $blocktext.=&send_message_link($ressymb).'</div>';
+        }else{
+            $blocktext.="</div>";
         }
         return $blocktext; 
     }
@@ -774,11 +777,11 @@ sub send_message_link {
 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;
         }
@@ -796,8 +799,6 @@ sub action_links_bar {
         }
         $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;
     if ($newpostsflag) {
@@ -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'}) {
@@ -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);
@@ -2973,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);
@@ -3370,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'}) {