--- loncom/interface/lonfeedback.pm	2010/01/25 03:30:23	1.273.4.5
+++ loncom/interface/lonfeedback.pm	2009/11/21 22:36:23	1.279
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.273.4.5 2010/01/25 03:30:23 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.279 2009/11/21 22:36:23 www 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; 
     }
@@ -171,7 +174,6 @@ sub list_discussion {
     my $cnum = $env{'course.'.$cid.'.num'};
     my $crstype = &Apache::loncommon::course_type();
 
-
 # Get information about students and non-students in course for filtering display of posts
     my %roleshash = ();
     my %roleinfo = ();
@@ -567,7 +569,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                  <table border="0" cellpadding="0" cellspacing="4">
                   <tr>
                    <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</font></td>
+                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
                    <td>&nbsp;</td>
                    <td><font size="-1">
 END
@@ -589,7 +591,7 @@ END
                    </font></td>
                    <td>&nbsp;</td>
                    <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</b></font>
+                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
                    </td>
                   </tr>
                  </table>
@@ -757,9 +759,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;
 }
 
@@ -767,9 +769,9 @@ 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 Feedback').'</a></span>';
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
     return $output;
 }
 
@@ -813,7 +815,7 @@ sub action_links_bar {
                            &mt('Preferences on what is marked as NEW').
                            '</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
             $discussion .= &group_args($group);
-            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a></td>';
+            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
         } else {
             $discussion .= '<td>&nbsp;</td>';
         }
@@ -1014,7 +1016,6 @@ sub build_posting_display {
 					 $contrib{$idx.':senderdomain'}).' ('.
 					 $contrib{$idx.':sendername'}.':'.
 					 $contrib{$idx.':senderdomain'}.')';
-                            $sender = '<b>'.$sender.'</b>';
 			    if ($contrib{$idx.':anonymous'}) {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
 				    $screenname;
@@ -1022,7 +1023,6 @@ sub build_posting_display {
 			    if ($see_anonymous) {
 				$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
 			    }
-                            $sender = '<b>'.$sender.'</b>';
 # Set up for sorting by domain, then username
                             unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
                                 %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
@@ -1172,7 +1172,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'}) {
@@ -1255,7 +1255,7 @@ sub build_posting_display {
                             }
                             $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
-                                $sender.' '.$vgrlink.' ('.
+                                $sender.'</b> '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
                             if ($$dischash{$toggkey}) {
                                 $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
@@ -1369,7 +1369,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 = ();
@@ -1665,10 +1665,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);
@@ -2016,7 +2021,7 @@ sub print_sortfilter_options {
         $ccrole = 'co';
     }
     push(@courseroles,$ccrole);
-
+    
     if ($env{'request.course.sec'} !~ /^\s*$/) {  #Restrict section choice to current section 
         @sections = ('all',$env{'request.course.sec'});
         $numvisible = 2;
@@ -2131,17 +2136,17 @@ $start_page
 <br /><br />
 <table border="0">
  <tr>
-  <th>$lt{'soor'}</th>
-  <th>&nbsp;</th>
-  <th>$lt{'sprs'}</th>
-  <th>&nbsp;</th>
-  <th>$lt{'spur'}</th>
-  <th>&nbsp;</th>
-  <th>$lt{'spse'}</th>
-  <th>&nbsp;</th>
-  <th>$lt{'spgr'}</th>
-  <th>&nbsp;</th>
-  <th>$lt{'psub'}</th>
+  <td><b>$lt{'soor'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'sprs'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'spur'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'spse'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'spgr'}</b></td>
+  <td>&nbsp;</td>
+  <td><b>$lt{'psub'}</b></td>
  </tr>
  <tr>
   <td align="center" valign="top">
@@ -2625,11 +2630,10 @@ sub screen_header {
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-                $contribdisc.
-                '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-                $anoncontrib.
-                ' <i>('.$namevis.')</i></label> '.
-
+		$contribdisc.
+	        '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
+		$anoncontrib.
+		' <i>('.$namevis.')</i></label> '.
 		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
             my $blockblog = &Apache::loncommon::blocking_status('blogs');
             if (!$blockblog) {
@@ -2696,6 +2700,9 @@ sub assemble_email {
              'orig' => 'Original screen output (if applicable)',
              'corr' => 'Correct Answer(s) (if applicable)',
   );
+  if (&Apache::loncommon::course_type() eq 'Community') {
+      $lt{'prev'} = &mt('Previous attempts of member (if applicable)');
+  }
   my $email=<<"ENDEMAIL";
 $message
 ENDEMAIL
@@ -2942,19 +2949,6 @@ sub show_preview {
     );
 }
 
-sub contains_block_html {
-    my ($message)=@_;
-    return ($message =~ m{
-        <(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div)
-          \s*
-         (\w+\=['"]\w+['"])*
-          \s*
-        (
-          \s*/>|
-          >.*</\1\s*>
-        )}xs
-    );
-}
 
 sub newline_to_br {
     my ($message)=@_;
@@ -3014,8 +3008,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);
@@ -3043,7 +3041,7 @@ $toolarge
  <table class="LC_data_table">
   <tr>
    <td colspan="2">
-    <b>Subject:</b> <b>$subject</b><br /><br />
+    <b>Subject:</b> $subject</b><br /><br />
 END
     if ($idx) {
         if ($attachmenturls) {
@@ -3357,14 +3355,14 @@ sub sort_filter_names {
     }
     if (ref($status_types) eq 'HASH') {
         %{$status_types} = (
-                      all     => 'Roles of any status',
-                      Active  => 'Only active roles',
-                      Expired => 'Only past roles',
-                      Future  => 'Only future roles',
-                    );
+                     all     => 'Roles of any status',
+                     Active  => 'Only active roles',
+                     Expired => 'Only past roles',
+                     Future  => 'Only future roles',
+                   );
     }
 }
-
+  
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -3424,7 +3422,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'}) {