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

[albertel]

albertel		Sun Apr 23 14:31:47 2006 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - BUG#4743
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.351 loncom/interface/loncommon.pm:1.352
--- loncom/interface/loncommon.pm:1.351	Sat Apr 22 16:58:32 2006
+++ loncom/interface/loncommon.pm	Sun Apr 23 14:31:44 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.351 2006/04/22 20:58:32 www Exp $
+# $Id: loncommon.pm,v 1.352 2006/04/23 18:31:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3048,31 +3048,50 @@
     return $endbodytag;
 }
 
+=pod
+
+=over 4
+
+=item * &standard_css()
+
+Returns a style sheet
+
+Inputs: (all optional)
+            domain         -> force to color decorate a page for a specific
+                               domain
+            function       -> force usage of a specific rolish color scheme
+            bgcolor        -> override the default page bgcolor
+
+=back
+
+=cut
+
 sub standard_css {
     my ($function,$domain,$bgcolor) = @_;
-    my $function = &get_users_function() if (!$function);
-    my $img =    &designparm($function.'.img',$domain);
-    my $tabbg =  &designparm($function.'.tabbg',$domain);
-    my $font =   &designparm($function.'.font',$domain);
+    $function  = &get_users_function() if (!$function);
+    my $img    = &designparm($function.'.img',   $domain);
+    my $tabbg  = &designparm($function.'.tabbg', $domain);
+    my $font   = &designparm($function.'.font',  $domain);
     my $sidebg = &designparm($function.'.sidebg',$domain);
-    my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
-
-    my $alink  = &designparm($function.'.alink',$domain);
-    my $vlink  = &designparm($function.'.vlink',$domain);
-    my $link   = &designparm($function.'.link',$domain);
-    my $sans   = 'Arial,Helvetica,sans-serif';
-    my $data_table_head = $tabbg;
-    my $data_table_light = '#EEEEEE';
-    my $data_table_dark = '#DDD';
+    my $pgbg   = $bgcolor ||
+	         &designparm($function.'.pgbg',  $domain);
+    my $alink  = &designparm($function.'.alink', $domain);
+    my $vlink  = &designparm($function.'.vlink', $domain);
+    my $link   = &designparm($function.'.link',  $domain);
+
+    my $sans                 = 'Arial,Helvetica,sans-serif';
+    my $data_table_head      = $tabbg;
+    my $data_table_light     = '#EEEEEE';
+    my $data_table_dark      = '#DDD';
     my $data_table_highlight = '#FFFF00';
-    my $mail_new = '#FFBB77';
-    my $mail_new_hover = '#DD9955';
-    my $mail_read = '#BBBB77';
-    my $mail_read_hover = '#999944';
-    my $mail_replied = '#AAAA88';
-    my $mail_replied_hover = '#888855';
-    my $mail_other = '#99BBBB';
-    my $mail_other_hover = '#669999';
+    my $mail_new             = '#FFBB77';
+    my $mail_new_hover       = '#DD9955';
+    my $mail_read            = '#BBBB77';
+    my $mail_read_hover      = '#999944';
+    my $mail_replied         = '#AAAA88';
+    my $mail_replied_hover   = '#888855';
+    my $mail_other           = '#99BBBB';
+    my $mail_other_hover     = '#669999';
 
     return <<END;
 <style type="text/css">
@@ -3217,11 +3236,16 @@
         $args - optional arguments
             force_register - if is true call registerurl so the remote is 
                              informed
-            redirect - array ref of seconds before redirect occurs
+            redirect       -> array ref of seconds before redirect occurs
                                     url to redirect to
                            (side effect of setting 
                                $env{'internal.head.redirect'} to the url 
                                redirected too)
+            domain         -> force to color decorate a page for a specific
+                               domain
+            function       -> force usage of a specific rolish color scheme
+            bgcolor        -> override the default page bgcolor
+
 =back
 
 =cut
@@ -3231,7 +3255,8 @@
     
     my $result =
 	'<head>'.
-	&standard_css().
+	&standard_css($args->{'function'},$args->{'domain'},
+		      $args->{'bgcolor'}).
 	&font_settings().
 	&Apache::lonhtmlcommon::htmlareaheaders();
 
@@ -3398,7 +3423,8 @@
     my ($title,$head_extra,$args) = @_;
     #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
     my %head_args;
-    foreach my $arg ('redirect','force_register') {
+    foreach my $arg ('redirect','force_register','domain','function',
+		     'bgcolor') {
 	if (defined($args->{$arg})) {
 	    $head_args{$arg} = $args->{$arg};
 	}