--- loncom/interface/loncommon.pm	2006/07/17 19:47:20	1.429
+++ loncom/interface/loncommon.pm	2006/07/18 21:55:24	1.430
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.429 2006/07/17 19:47:20 www Exp $
+# $Id: loncommon.pm,v 1.430 2006/07/18 21:55:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -706,8 +706,68 @@ sub helpLatexCheatsheet {
 	.'</td></tr></table>';
 }
 
+sub general_help {
+    my $helptopic='Student_Intro';
+    if ($env{'request.role'}=~/^(ca|au)/) {
+	$helptopic='Authoring_Intro';
+    } elsif ($env{'request.role'}=~/^cc/) {
+	$helptopic='Course_Coordination_Intro';
+    }
+    return $helptopic;
+}
+
+sub update_help_link {
+    my ($topic,$component_help,$faq,$bug,$stayOnPage) = @_;
+    my $origurl = $ENV{'REQUEST_URI'};
+    $origurl=~s|^/~|/priv/|;
+    my $timestamp = time;
+    foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
+        $$datum = &escape($$datum);
+    }
+
+    my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
+    my $output .= <<"ENDOUTPUT";
+<script type="text/javascript">
+// <!-- BEGIN LON-CAPA Internal
+banner_link = '$banner_link';
+// END LON-CAPA Internal -->
+</script>
+ENDOUTPUT
+    return $output;
+}
+
+# now just updates the help link and generates a blue icon
 sub help_open_menu {
-    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
+    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
+	= @_;
+    
+    $stayOnPage = 0 if (not defined $stayOnPage);
+    if ($env{'browser.interface'} eq 'textual' ||
+	$env{'environment.remote'} eq 'off' ) {
+	$stayOnPage=1;
+    }
+    my $output;
+    if ($component_help) {
+	if (!$text) {
+	    $output=&help_open_topic($component_help,undef,$stayOnPage,
+				       $width,$height);
+	} else {
+	    my $help_text;
+	    $help_text=&unescape($topic);
+	    $output='<table><tr><td>'.
+		&help_open_topic($component_help,$help_text,$stayOnPage,
+				 $width,$height).'</td></tr></table>';
+	}
+    }
+    my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
+    return $output.$banner_link;
+}
+
+sub top_nav_help {
+    my ($text) = @_;
+
+    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height);
+   
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
     if ($env{'browser.interface'} eq 'textual' ||
@@ -718,25 +778,15 @@ sub help_open_menu {
     $height = 600 if (not defined $height);
     my $link='';
     my $title = &mt('Get help');
-    my $origurl = $ENV{'REQUEST_URI'};
-    $origurl=~s|^/~|/priv/|;
-    my $timestamp = time;
-    foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
-        $$datum = &escape($$datum);
-    }
-    if (!$stayOnPage) {
-         $link = "javascript:helpMenu('open')";
+    if ($stayOnPage) {
+	$link = "javascript:helpMenu('display')";
     } else {
-        $link = "javascript:helpMenu('display')";
+        $link = "javascript:helpMenu('open')";
     }
-    my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
-    my $details_link = "/adm/helpmenu?page=body&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp";
+    my $helptopic=&general_help();
+    my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
+    my $details_link = '/adm/help/'.$helptopic.'.hlp';
     my $template;
-    if ($text ne "") {
-	$template .= 
-  "<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
-    }
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
     my $start_page =
@@ -754,6 +804,7 @@ sub help_open_menu {
  <script type="text/javascript">
 // <!-- BEGIN LON-CAPA Internal
 // <![CDATA[
+var banner_link = '';
 function helpMenu(target) {
     var caller = this;
     if (target == 'open') {
@@ -773,29 +824,16 @@ function helpMenu(target) {
     return;
 }
 function writeHelp(caller) {
-    caller.document.writeln('$start_page<frame name="bannerframe"  src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')
+    caller.document.writeln('$start_page<frame name="bannerframe"  src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
     caller.document.close()
     caller.focus()
 }
 // ]]>
 // END LON-CAPA Internal -->
  </script>
- <a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>
+$banner_link
+ <a href="$link" title="$title">$text<img src="$helpicon" border="0" alt="(Help Menu)" /></a>
 ENDTEMPLATE
-    if ($component_help) {
-	if (!$text) {
-	    $template=&help_open_topic($component_help,undef,$stayOnPage,
-				       $width,$height).' '.$template;
-	} else {
-	    my $help_text;
-	    $help_text=&unescape($topic);
-	    $template='<table><tr><td>'.
-		&help_open_topic($component_help,$help_text,$stayOnPage,
-				 $width,$height).'</td><td>'.$template.
-				 '</td></tr></table>';
-	}
-    }
-    if ($text ne '') { $template.='</td></tr></table>' };
     return $template;
 }