--- loncom/interface/loncommon.pm	2006/06/23 05:56:35	1.396
+++ loncom/interface/loncommon.pm	2006/06/27 17:50:37	1.404
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.396 2006/06/23 05:56:35 albertel Exp $
+# $Id: loncommon.pm,v 1.404 2006/06/27 17:50:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -707,7 +707,7 @@ sub helpLatexCheatsheet {
 }
 
 sub help_open_menu {
-    my ($color,$topic,$component_help,$function,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
+    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
     if ($env{'browser.interface'} eq 'textual' ||
@@ -721,8 +721,7 @@ sub help_open_menu {
     my $origurl = $ENV{'REQUEST_URI'};
     $origurl=~s|^/~|/priv/|;
     my $timestamp = time;
-    foreach my $datum (\$color,\$function,\$topic,\$component_help,\$faq,
-		       \$bug,\$origurl) {
+    foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
         $$datum = &escape($$datum);
     }
     if (!$stayOnPage) {
@@ -730,8 +729,8 @@ sub help_open_menu {
     } else {
         $link = "javascript:helpMenu('display')";
     }
-    my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
-    my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
+    my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
+    my $details_link = "/adm/helpmenu?page=body&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
     my $template;
     if ($text ne "") {
 	$template .= 
@@ -2725,6 +2724,7 @@ Returns: value of designparamter $which
 
 =cut
 
+
 ##############################################
 sub designparm {
     my ($which,$domain)=@_;
@@ -2739,11 +2739,11 @@ sub designparm {
 	    return '#CCCCCC';
 	}
     }
-    if ($env{'environment.color.'.$which}) {
+    if (exists($env{'environment.color.'.$which})) {
 	return $env{'environment.color.'.$which};
     }
     $domain=&determinedomain($domain);
-    if ($designhash{$domain.'.'.$which}) {
+    if (exists($designhash{$domain.'.'.$which})) {
 	return $designhash{$domain.'.'.$which};
     } else {
         return $designhash{'default.'.$which};
@@ -2926,7 +2926,7 @@ ENDROLE
 		$lastitem = $thisdisfn;
 	    }
 	    $titleinfo = 
-		&Apache::loncommon::help_open_menu('','','','',3,'Authoring').
+		&Apache::loncommon::help_open_menu('','',3,'Authoring').
 		'<b>Construction Space</b>:&nbsp;'. 
 		'<form name="dirs" method="post" action="'.$formaction
 		.'" target="_top"><tt><b>'
@@ -3147,7 +3147,8 @@ table#LC_top_nav, table#LC_menubuttons {
   width: 100%;
   background: $pgbg;
   border: 2px;
-  border-collapse: seperate;
+  border-collapse: separate;
+  padding: 0px;
 }
 
 table#LC_title_bar, table#LC_breadcrumbs, table#LC_nav_location,
@@ -3160,6 +3161,7 @@ table#LC_title_bar.LC_with_remote {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
+  padding: 0px;
 }
 
 table#LC_title_bar td {
@@ -3249,7 +3251,7 @@ td.LC_menubuttons_img {
 
 table.LC_data_table, table.LC_mail_list {
   border: 1px solid #000000;
-  border-collapse: seperate;
+  border-collapse: separate;
 }
 table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
   font-weight: bold;
@@ -3413,7 +3415,39 @@ table.LC_parm_overview_restrictions th {
   border-style: solid;
   border-color: $pgbg;
 }
+table#LC_helpmenu {
+  border: 0px;
+  height: 55px;
+  border-spacing: 0px;
+}
+
+table#LC_helpmenu fieldset legend {
+  font-size: larger;
+  font-weight: bold;
+}
+table#LC_helpmenu_links {
+  width: 100%;
+  border: 1px solid black;
+  background: $pgbg;
+  padding: 0px;
+  border-spacing: 1px;
+}
+table#LC_helpmenu_links tr td {
+  padding: 1px;
+  background: $tabbg;
+  text-align: center;
+  font-weight: bold;
+}
 
+table#LC_helpmenu_links a:link, table#LC_helpmenu_links a:visited,
+table#LC_helpmenu_links a:active {
+  text-decoration: none;
+  color: $font;
+}
+table#LC_helpmenu_links a:hover {
+  text-decoration: underline;
+  color: $vlink;
+}
 
 END
 }
@@ -5141,8 +5175,8 @@ sub course_type {
     if (!defined($cid)) {
         $cid = $env{'request.course.id'};
     }
-    if (defined($env{'course.'.$cid.'type'})) {
-        return $env{'course.'.$cid.'type'};
+    if (defined($env{'course.'.$cid.'.type'})) {
+        return $env{'course.'.$cid.'.type'};
     } else {
         return 'Course';
     }