[LON-CAPA-cvs] cvs: loncom /interface lonchat.pm loncommon.pm lonfeedback.pm lonmsgdisplay.pm

[raeburn]

raeburn		Mon Jan 12 04:11:25 2009 EDT

  Modified files:              
    /loncom/interface	lonchat.pm lonfeedback.pm lonmsgdisplay.pm 
                     	loncommon.pm 
  Log:
  - "Output Tags" help button only is included in row of help items in authhoring context.
  - Third argument to loncommon::helpLatexCheatsheet():  not_author (if true) suppresses display of "Output Tags" item.
  
  
Index: loncom/interface/lonchat.pm
diff -u loncom/interface/lonchat.pm:1.16 loncom/interface/lonchat.pm:1.17
--- loncom/interface/lonchat.pm:1.16	Sat Jan 19 21:40:41 2008
+++ loncom/interface/lonchat.pm	Mon Jan 12 04:11:25 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat
 #
-# $Id: lonchat.pm,v 1.16 2008/01/19 21:40:41 raeburn Exp $
+# $Id: lonchat.pm,v 1.17 2009/01/12 04:11:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,7 @@
 	&Apache::lonnet::chatsend(&Apache::lonfeedback::clear_out_html($env{'form.newchat'}),$env{'form.anonymous'},$group);
     }
 # --------------------------------------------------- Print login screen header
-    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+    my $latexHelp = Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
     my %loaditems = (onload => 'this.document.chatentry.newchat.focus();');
     my $start_page = 
 	&Apache::loncommon::start_page('Chat',undef,
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.260 loncom/interface/lonfeedback.pm:1.261
--- loncom/interface/lonfeedback.pm:1.260	Fri Dec 19 19:38:07 2008
+++ loncom/interface/lonfeedback.pm	Mon Jan 12 04:11:25 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.260 2008/12/19 19:38:07 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.261 2009/01/12 04:11:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1618,7 +1618,7 @@
       $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;
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.108 loncom/interface/lonmsgdisplay.pm:1.109
--- loncom/interface/lonmsgdisplay.pm:1.108	Tue Jan  6 21:38:43 2009
+++ loncom/interface/lonmsgdisplay.pm	Mon Jan 12 04:11:25 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.108 2009/01/06 21:38:43 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.109 2009/01/12 04:11:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1520,7 +1520,7 @@
             $r->print(&recipient_input_row($defdom,%lt));
         }
     }
-    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet();
+    my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
     my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'<br />';
     my $subj_size;
     if ($multiforward) {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.731 loncom/interface/loncommon.pm:1.732
--- loncom/interface/loncommon.pm:1.731	Thu Jan  8 19:46:43 2009
+++ loncom/interface/loncommon.pm	Mon Jan 12 04:11:25 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.731 2009/01/08 19:46:43 raeburn Exp $
+# $Id: loncommon.pm,v 1.732 2009/01/12 04:11:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -943,24 +943,30 @@
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my $other = shift;
+    my ($topic,$text,$not_author) = @_;
+    my $out;
     my $addOther = '';
-    if ($other) {
-	$addOther = Apache::loncommon::help_open_topic($other, shift,
-						       undef, undef, 600) .
+    if ($topic) {
+	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
+						       undef, undef, 600).
 							   '</td><td>';
     }
-    return '<table><tr><td>'.
-	$addOther .
-	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-					    undef,undef,600)
-	.'</td><td>'.
-	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-					    undef,undef,600)
-	.'</td><td>'.
-	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-	                                    undef,undef,600)
-	.'</td></tr></table>';
+    $out = '<table><tr><td>'.
+	   $addOther .
+	   &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
+					       undef,undef,600).
+	   '</td><td>'.
+	   &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
+					       undef,undef,600).
+	   '</td>';
+    unless ($not_author) {
+        $out .= '<td>'.
+	        &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+	                                            undef,undef,600).
+	        '</td>';
+    }
+    $out .= '</tr></table>';
+    return $out;
 }
 
 sub general_help {