[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface lonhelpmenu.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 03 Jul 2004 19:44:54 -0000 

albertel		Sat Jul  3 15:44:54 2004 EDT

  Modified files:              
    /loncom/interface	lonhelpmenu.pm 
    /loncom/auth	lonroles.pm 
  Log:
  - change lonroles to use new integrated help link
  - fix stupid typo
  
  
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.4 loncom/interface/lonhelpmenu.pm:1.5
--- loncom/interface/lonhelpmenu.pm:1.4	Sat Jul  3 15:34:33 2004
+++ loncom/interface/lonhelpmenu.pm	Sat Jul  3 15:44:53 2004
@@ -69,7 +69,7 @@
 sub display_help_banner {
     my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
     my $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1);
-    $bodytag=~/[\n\r]/ /g;
+    $bodytag=~s/[\n\r]/ /g;
     my $fontcolor = &Apache::loncommon::designparm($function.'.font');
     my $alinkcolor = &Apache::loncommon::designparm($function.'.alink');
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.92 loncom/auth/lonroles.pm:1.93
--- loncom/auth/lonroles.pm:1.92	Fri May 21 15:16:35 2004
+++ loncom/auth/lonroles.pm	Sat Jul  3 15:44:53 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.92 2004/05/21 19:16:35 www Exp $
+# $Id: lonroles.pm,v 1.93 2004/07/03 19:44:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@
 # Note to style police: 
 # This must only replace the spaces, nothing else, or it bombs elsewhere.
     $url=~s/ /\%20/g;
-   $r->print (<<ENDREDIR);
+    $r->print(<<ENDREDIR);
 <head><title>$title</title>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$url">
 </head>
@@ -280,10 +280,7 @@
 
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $bodytag=&Apache::loncommon::bodytag('User Roles');
-    my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_topic
-     ("General_Intro",&mt("Click here for help")).'</td><td>'.
-      &Apache::loncommon::help_open_faq(1,&mt('Click here for FAQ')).'</td><td>'.
-      &Apache::loncommon::help_open_bug('',&mt('Click here to report bugs')).'</td></tr></table>';
+    my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,'').'</td></td></tr></table>';
     $r->print(<<ENDHEADER);
 <html>
 <head>