[LON-CAPA-cvs] cvs: loncom /interface lonannounce.pm loncreateuser.pm lonhelpmenu.pm lonnavmaps.pm

[albertel]

albertel		Sat Jul  3 16:45:24 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm lonhelpmenu.pm loncreateuser.pm 
                     	lonannounce.pm 
  Log:
  - updating help links
  - add ability to not have FAQ link
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.264 loncom/interface/lonnavmaps.pm:1.265
--- loncom/interface/lonnavmaps.pm:1.264	Tue Jun 29 18:32:11 2004
+++ loncom/interface/lonnavmaps.pm	Sat Jul  3 16:45:23 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.264 2004/06/29 22:32:11 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.265 2004/07/03 20:45:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,9 +138,8 @@
               &Apache::loncommon::bodytag('Navigate Course Contents','',
                                     $addentries,'','',$ENV{'form.register'}));
     $r->print('<script>window.focus();</script>'.
-        &Apache::loncommon::help_open_topic('Navigation_Screen').
-	&Apache::loncommon::help_open_bug('RAT'));
-
+	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+     
     $r->rflush();
 
     # Check that it's defined
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.6 loncom/interface/lonhelpmenu.pm:1.7
--- loncom/interface/lonhelpmenu.pm:1.6	Sat Jul  3 16:25:51 2004
+++ loncom/interface/lonhelpmenu.pm	Sat Jul  3 16:45:23 2004
@@ -131,11 +131,15 @@
         $r->print('
             <td align="center">&nbsp;<b><a href="/adm/support?origurl='.$origurl.'&function='.$function.'" target="bodyframe"><image src="/adm/lonMisc/feedback.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');
     }
-    if ($ENV{'user.adv'}) {
+    if ($faq && $ENV{'user.adv'}) {
         $r->print(<<END)
             <td align="center">
              &nbsp;<b><a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><image src="/adm/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a></b>&nbsp;
             </td>
+END
+    }
+    if ($ENV{'user.adv'}) {
+        $r->print(<<END)
             <td align="center">&nbsp;<b><a href="$bugurl" target="bodyframe"><image src="/adm/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></td>
 END
     }
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.83 loncom/interface/loncreateuser.pm:1.84
--- loncom/interface/loncreateuser.pm:1.83	Fri Jul  2 06:03:44 2004
+++ loncom/interface/loncreateuser.pm	Sat Jul  3 16:45:23 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.83 2004/07/02 10:03:44 albertel Exp $
+# $Id: loncreateuser.pm,v 1.84 2004/07/03 20:45:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,10 +123,7 @@
     my $defdom=$ENV{'request.role.domain'};
     my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
-    my $bodytag =&Apache::loncommon::bodytag(
-                                  'Create Users, Change User Privileges').
-		  &Apache::loncommon::help_open_faq(282).
-		  &Apache::loncommon::help_open_bug('Instructor Interface');
+    my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link
                                         ('crtuser','ccuname','ccdomain');
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.28 loncom/interface/lonannounce.pm:1.29
--- loncom/interface/lonannounce.pm:1.28	Fri Jun 11 21:04:10 2004
+++ loncom/interface/lonannounce.pm	Sat Jul  3 16:45:23 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.28 2004/06/12 01:04:10 www Exp $
+# $Id: lonannounce.pm,v 1.29 2004/07/03 20:45:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,9 +47,7 @@
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement').
-	&Apache::loncommon::help_open_faq(274).
-	&Apache::loncommon::help_open_bug('Communication Tools');
+    my $help=&Apache::loncommon::help_open_menu('','Calendar Add Announcement','Calendar_Add_Announcement','',274,'Communication Tools');
     $r->print(<<ENDFORM);
 $help
 <form name="anno" method="post">