--- loncom/interface/lonfeedback.pm	2008/06/06 05:24:28	1.255
+++ loncom/interface/lonfeedback.pm	2009/03/04 17:11:22	1.268
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.255 2008/06/06 05:24:28 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.268 2009/03/04 17:11:22 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -625,7 +625,7 @@ END
                             $filterchoice .= ' '.$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};
@@ -765,7 +765,7 @@ 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').
+                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
                  '" border="0" />'.&mt('Send Message').'</a></span>';
     return $output;
 }
@@ -794,7 +794,7 @@ sub action_links_bar {
             $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">';
     }
@@ -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;
@@ -1695,6 +1695,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 +1797,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 +1962,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);
@@ -2152,7 +2154,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 +2166,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>
@@ -2605,7 +2607,7 @@ 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('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
 	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
     return $msgoptions.$discussoptions;
@@ -2889,9 +2891,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 +3258,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 +3316,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 +3446,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 +3592,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 +3671,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/\?.+$//;
@@ -3959,3 +3976,131 @@ sub get_resource_title {
 
 1;
 __END__
+
+
+=pod
+
+=head1 NAME
+
+Apache::lonfeedback.pm
+
+=head1 SYNOPSIS
+
+Handles feedback from students to instructors and system administrators.
+
+Provides a screenshot of the current resource, as well as previous attempts if the resource was a homework.
+
+Used by lonmsg.pm.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+None
+
+=head1 SUBROUTINES
+
+=over
+
+=item discussion_open()
+
+=item discussion_visible()
+
+=item list_discussion()
+
+=item send_feedback_link()
+
+=item send_message_link()
+
+=item action_links_bar()
+
+=item postingform_display()
+
+=item build_posting_display
+
+=item filter_regexp()
+
+=item get_post_contents()
+
+=item replicate_attachments()
+
+=item mail_screen()
+
+=item print_display_options()
+
+=item print_sortfilter_options()
+
+=item print_showposters()
+
+=item get_post_versions()
+
+=item get_post_attachments()
+
+=item fail_redirect()
+
+=item redirect_back()
+
+=item no_redirect_back()
+
+=item screen_header()
+
+=item resource_output()
+
+=item clear_out_html()
+
+=item assemble_email()
+
+=item feedback_available()
+
+=item send_msg()
+
+=item adddiscuss()
+
+=item get_discussion_info()
+
+=item show_preview()
+
+=item newline_to_br()
+
+=item generate_preview_button()
+
+=item modify_attachments()
+
+=item process_attachments()
+
+=item generate_attachments_button()
+
+=item extract_attachments()
+
+=item construct_attachmenturl()
+
+=item add_blog_checkbox()
+
+=item has_discussion()
+
+=item sort_filter_names()
+
+=item handler()
+
+=item blocked_reply_or_edit()
+
+=item wrap_symb()
+
+=item dewrapper()
+
+=item get_feedurl()
+
+=item get_feedurl_and_clean_symb()
+
+=item editing_allowed()
+
+=item check_group_priv()
+
+=item group_args()
+
+=item get_resource_title()
+
+=back
+
+=cut