--- loncom/interface/loncommon.pm	2007/03/20 15:36:14	1.516
+++ loncom/interface/loncommon.pm	2007/05/13 06:34:42	1.534
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.516 2007/03/20 15:36:14 albertel Exp $
+# $Id: loncommon.pm,v 1.534 2007/05/13 06:34:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,8 +68,12 @@ use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use LONCAPA qw(:DEFAULT :match);
 
+# ---------------------------------------------- Designs
+use vars qw(%defaultdesign);
+
 my $readit;
 
+
 ##
 ## Global Variables
 ##
@@ -82,10 +86,6 @@ my %scprtag;
 my %fe; my %fd; my %fm;
 my %category_extensions;
 
-# ---------------------------------------------- Designs
-
-my %designhash;
-
 # ---------------------------------------------- Thesaurus variables
 #
 # %Keywords:
@@ -151,30 +151,18 @@ BEGIN {
         }
     }
 
-# -------------------------------------------------------------- domain designs
-
-    my $filename;
+# -------------------------------------------------------------- default domain designs
     my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
-    opendir(DIR,$designdir);
-    while ($filename=readdir(DIR)) {
-	if ($filename!~/\.tab$/) { next; }
-	my ($domain)=($filename=~/^($match_domain)\./);
-	{
-	    my $designfile = $designdir.'/'.$filename;
-	    if ( open (my $fh,"<$designfile") ) {
-		while (my $line = <$fh>) {
-		    next if ($line =~ /^\#/);
-		    chomp($line);
-		    my ($key,$val)=(split(/\=/,$line));
-		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
-		}
-		close($fh);
-	    }
-	}
-
+    my $designfile = $designdir.'/default.tab';
+    if ( open (my $fh,"<$designfile") ) {
+        while (my $line = <$fh>) {
+            next if ($line =~ /^\#/);
+            chomp($line);
+            my ($key,$val)=(split(/\=/,$line));
+            if ($val) { $defaultdesign{$key}=$val; }
+        }
+        close($fh);
     }
-    closedir(DIR);
-
 
 # ------------------------------------------------------------- file categories
     {
@@ -252,7 +240,7 @@ Inputs: formname, elementname
 
 formname and elementname specify the name of the html form and the name
 of the element the selection from the search results will be placed in.
-
+=back
 =cut
 
 sub browser_and_searcher_javascript {
@@ -1284,6 +1272,12 @@ sub domain_select {
 
 =pod
 
+=head1 Routines for form select boxes
+
+=over 4
+
+=cut
+
 =item * multiple_select_form($name,$value,$size,$hash,$order)
 
 Returns a string containing a <select> element int multiple mode
@@ -1473,7 +1467,7 @@ sub home_server_option_list {
 
 =pod
 
-=back
+=back 
 
 =cut
 
@@ -2920,7 +2914,7 @@ sub blockcheck {
         }
         my $no_ownblock = 0;
         my $no_userblock = 0;
-        if ($otheruser) {
+        if ($otheruser && $activity ne 'com') {
             # Check if current user has 'evb' priv for this
             if (defined($own_courses{$course})) {
                 foreach my $sec (keys(%{$own_courses{$course}})) {
@@ -3173,7 +3167,7 @@ Returns: Determines which domain should
 ###############################################
 sub determinedomain {
     my $domain=shift;
-   if (! $domain) {
+    if (! $domain) {
         # Determine domain if we have not been given one
         $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
         if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
@@ -3184,6 +3178,60 @@ sub determinedomain {
     return $domain;
 }
 ###############################################
+
+sub devalidate_domconfig_cache {
+    my ($udom)=@_;
+    &Apache::lonnet::devalidate_cache_new('domainconfig',$udom);
+}
+
+# ---------------------- Get domain configuration for a domain
+sub get_domainconf {
+    my ($udom) = @_;
+    my $cachetime=1800;
+    my ($result,$cached)=&Apache::lonnet::is_cached_new('domainconfig',$udom);
+    if (defined($cached)) { return %{$result}; }
+
+    my %domconfig = &Apache::lonnet::get_dom('configuration',
+					     ['login','rolecolors'],$udom);
+    my %designhash;
+    if (keys(%domconfig) > 0) {
+        if (ref($domconfig{'login'}) eq 'HASH') {
+            foreach my $key (keys(%{$domconfig{'login'}})) {
+                $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+            }
+        }
+        if (ref($domconfig{'rolecolors'}) eq 'HASH') {
+            foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+                if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                    foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                        $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                    }
+                }
+            }
+        }
+    } else {
+        my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+        my $designfile =  $designdir.'/'.$udom.'.tab';
+        if (-e $designfile) {
+            if ( open (my $fh,"<$designfile") ) {
+                while (my $line = <$fh>) {
+                    next if ($line =~ /^\#/);
+                    chomp($line);
+                    my ($key,$val)=(split(/\=/,$line));
+                    if ($val) { $designhash{$udom.'.'.$key}=$val; }
+                }
+                close($fh);
+            }
+        }
+        if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+            $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+        }
+    }
+    &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
+				  $cachetime);
+    return %designhash;
+}
+
 =pod
 
 =item * &domainlogo()
@@ -3197,11 +3245,15 @@ If the domain logo does not exist, a des
 
 ###############################################
 sub domainlogo {
-    my $domain = &determinedomain(shift);    
-     # See if there is a logo
-    if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
-	my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");
-        return '<img src="'.$logo.'" alt="'.$domain.'" />';
+    my $domain = &determinedomain(shift);
+    my %designhash = &get_domainconf($domain);    
+    # See if there is a logo
+    if ($designhash{$domain.'.login.domlogo'} ne '') {
+        my $imgsrc = $designhash{$domain.'.login.domlogo'};
+        if ($imgsrc =~ /^\/(adm|res)/) {
+            $imgsrc = &lonhttpdurl($imgsrc);
+        } 
+        return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
     } elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
         return &Apache::lonnet::domain($domain,'description');
     } else {
@@ -3239,11 +3291,20 @@ sub designparm {
 	return $env{'environment.color.'.$which};
     }
     $domain=&determinedomain($domain);
-    if (exists($designhash{$domain.'.'.$which})) {
-	return $designhash{$domain.'.'.$which};
+    my %domdesign = &get_domainconf($domain);
+    my $output;
+    if ($domdesign{$domain.'.'.$which} ne '') {
+	$output = $domdesign{$domain.'.'.$which};
     } else {
-        return $designhash{'default.'.$which};
+        $output = $defaultdesign{$which};
+    }
+    if (($which =~ /^(student|coordinator|author|admin)\.img$/) ||
+        ($which =~ /login\.(img|logo|domlogo)/)) {
+        if ($output =~ /^\/(adm|res)\//) {
+            $output = &lonhttpdurl($output);
+        }
     }
+    return $output;
 }
 
 ###############################################
@@ -3316,7 +3377,7 @@ sub bodytag {
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
     my %design = ( 'style'   => 'margin-top: 0px',
-		   'bgcolor' => $pgbg,
+		   'bgcolor' => '#ffffff',
 		   'text'    => $font,
                    'alink'   => &designparm($function.'.alink',$domain),
 		   'vlink'   => &designparm($function.'.vlink',$domain),
@@ -3352,9 +3413,7 @@ sub bodytag {
     my $bodytag = "<body $extra_body_attr>".
 	&Apache::lontexconvert::init_math_support();
 
-    if ($bodyonly 
-	|| ($env{'request.state'} eq 'construct' 
-	    && $env{'environment.remote'} ne 'off' )) {
+    if ($bodyonly) {
         return $bodytag;
     } elsif ($env{'browser.interface'} eq 'textual') {
 # Accessibility
@@ -3462,8 +3521,11 @@ ENDROLE
 # Top frame rendering, Remote is up
 #
 
-    my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-        $lonhttpdPort.$img.'" alt="'.$function.'" />';
+    my $imgsrc = $img;
+    if ($img =~ /^\/adm/) {
+        $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+    }
+    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
 
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
@@ -3628,20 +3690,18 @@ sub standard_css {
     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
 	                                              : '0px 3px 0px 4px';
 
+
     return <<END;
 h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow } 
 table.thinborder,
-table.LC_optres_prior {
-  border-collapse: collapse;
-}
+
 table.thinborder tr th {
   border-style: solid;
   border-width: 1px;
   background: $tabbg;
 }
-table.thinborder tr td, 
-table.LC_optres_prior tr td {
+table.thinborder tr td {
   border-style: solid;
   border-width: 1px
 }
@@ -3657,6 +3717,8 @@ form, .inline { display: inline; }
 .LC_diff_removed {
   color: red;
 }
+
+.LC_info,
 .LC_success,
 .LC_diff_added {
   color: green;
@@ -3665,6 +3727,10 @@ form, .inline { display: inline; }
   border: 0px;
 }
 
+.LC_internal_info {
+  color: #999;
+}
+
 table.LC_pastsubmission {
   border: 1px solid black;
   margin: 2px;
@@ -3726,7 +3792,7 @@ table#LC_title_bar td.LC_title_bar_role_
 }
 
 table#LC_menubuttons_mainmenu {
-  background: $pgbg;
+  width: 100%;
   border: 0px;
   border-spacing: 1px;
   padding: 0px 1px;
@@ -3781,19 +3847,37 @@ td.LC_table_cell_checkbox {
   text-align: center;
 }
 
+table#LC_mainmenu td.LC_mainmenu_column {
+    vertical-align: top;
+}
+
 .LC_menubuttons_inline_text {
   color: $font;
   font-family: $sans;
   font-size: smaller;
 }
 
+.LC_menubuttons_link {
+  text-decoration: none;
+}
+
+.LC_menubuttons_category {
+  color: $font;
+  background: $pgbg;
+  font-family: $sans;
+  font-size: larger;
+  font-weight: bold;
+}
+
 td.LC_menubuttons_text {
+  width: 90%;
   color: $font;
   font-family: $sans;
 }
+
 td.LC_menubuttons_img {
-  background: $tabbg;
 }
+
 .LC_current_location {
   font-family: $sans;
   background: $tabbg;
@@ -3803,6 +3887,45 @@ td.LC_menubuttons_img {
   font-weight: bold;
 }
 
+.LC_rolesmenu_is {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_selected {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_future {
+  font-family: $sans;
+}
+
+
+.LC_rolesmenu_will {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_will_not {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_expired {
+  font-family: $sans;
+}
+
+.LC_rolesinfo {
+  font-family: $sans;
+}
+
+.LC_dropadd_labeltext {
+  font-family: $sans;
+  text-align: right;
+}
+
+.LC_preferences_labeltext {
+  font-family: $sans;
+  text-align: right;
+}
+
 table.LC_aboutme_port {
   border: 0px;
   border-collapse: collapse;
@@ -3828,7 +3951,8 @@ table.LC_nested {
   border-spacing: 0px;
   width: 100%;
 }
-table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
+table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
+table.LC_prior_tries tr th {
   font-weight: bold;
   background-color: $data_table_head;
   font-size: smaller;
@@ -4206,25 +4330,72 @@ span.LC_feedback_link {
 }
 
 table.LC_prior_tries {
-    border-width: 1px;
-    border-style: solid;
-    border-color: gray;
-    border-collapse: collapse;
+  border: 1px solid #000000;
+  border-collapse: separate;
+  border-spacing: 1px;
 }
-table.LC_prior_tries th,
+
 table.LC_prior_tries td {
-    border-width: 1px;
-    border-style: solid;
-    border-color: gray;
-    padding: 3px;
-}
-table.LC_prior_tries tr.LC_correct {
-    font-weight: bold;
-    background: #aaffaa;
-}
-span.LC_prior_numerical {
-    font-family: monospace;
-    white-space: pre;
+  padding: 2px;
+}
+
+.LC_answer_correct {
+  background: #AAFFAA;
+  color: black;
+}
+.LC_answer_charged_try {
+  background: #FFAAAA ! important;
+  color: black;
+}
+.LC_answer_not_charged_try, 
+.LC_answer_no_grade,
+.LC_answer_late {
+  background: #FFFFAA;
+  color: black;
+}
+.LC_answer_previous {
+  background: #AAAAFF;
+  color: black;
+}
+.LC_answer_no_message {
+  background: #FFFFFF;
+  color: black;
+}
+.LC_answer_unknown {
+  background: orange;
+  color: black;
+}
+
+
+span.LC_prior_numerical,
+span.LC_prior_string,
+span.LC_prior_custom,
+span.LC_prior_reaction,
+span.LC_prior_math {
+  font-family: monospace;
+  white-space: pre;
+}
+
+span.LC_prior_string {
+  font-family: monospace;
+  white-space: pre;
+}
+
+table.LC_prior_option {
+  width: 100%;
+  border-collapse: collapse;
+}
+table.LC_prior_rank, table.LC_prior_match {
+  border-collapse: collapse;
+}
+table.LC_prior_option tr td,
+table.LC_prior_rank tr td,
+table.LC_prior_match tr td {
+  border: 1px solid #000000;
+}
+
+span.LC_nobreak {
+    white-space: nowrap;
 }
 
 END