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

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 26 Jun 2006 22:12:31 -0000


albertel		Mon Jun 26 18:12:31 2006 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - elimante unneeded function and color apssing
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.399 loncom/interface/loncommon.pm:1.400
--- loncom/interface/loncommon.pm:1.399	Mon Jun 26 18:09:01 2006
+++ loncom/interface/loncommon.pm	Mon Jun 26 18:12:29 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.399 2006/06/26 22:09:01 albertel Exp $
+# $Id: loncommon.pm,v 1.400 2006/06/26 22:12:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -707,7 +707,7 @@
 }
 
 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 @@
     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 @@
     } else {
         $link = "javascript:helpMenu('display')";
     }
-    my $banner_link = "/adm/helpmenu?page=banner&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&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 .= 
@@ -2726,16 +2725,8 @@
 =cut
 
 
-sub designparm {
-    my ($which,$domain)=@_;
-    my $result = &designparm_real(@_);
-    &Apache::lonnet::logthis(" $which $domain reulted in $result");
-    return $result;
-}
-
-
 ##############################################
-sub designparm_real {
+sub designparm {
     my ($which,$domain)=@_;
     if ($env{'browser.blackwhite'} eq 'on') {
 	if ($which=~/\.(font|alink|vlink|link)$/) {