--- loncom/interface/loncommon.pm	2007/04/05 21:36:15	1.519
+++ loncom/interface/loncommon.pm	2007/04/17 15:45:02	1.526
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.519 2007/04/05 21:36:15 raeburn Exp $
+# $Id: loncommon.pm,v 1.526 2007/04/17 15:45:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,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 {
@@ -3248,7 +3248,7 @@ sub domainlogo {
     # See if there is a logo
     if ($designhash{$domain.'.login.domlogo'} ne '') {
         my $imgsrc = $designhash{$domain.'.login.domlogo'};
-        if ($imgsrc =~ /^\/adm/) {
+        if ($imgsrc =~ /^\/(adm|res)/) {
             $imgsrc = &lonhttpdurl($imgsrc);
         } 
         return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
@@ -3290,11 +3290,19 @@ sub designparm {
     }
     $domain=&determinedomain($domain);
     my %domdesign = &get_domainconf($domain);
+    my $output;
     if ($domdesign{$domain.'.'.$which} ne '') {
-	return $domdesign{$domain.'.'.$which};
+	$output = $domdesign{$domain.'.'.$which};
     } else {
-        return $defaultdesign{$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;
 }
 
 ###############################################
@@ -3367,7 +3375,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),
@@ -3682,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
 }
@@ -3780,7 +3786,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;
@@ -3835,19 +3841,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;
@@ -3857,6 +3881,35 @@ 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;
+}
+
 table.LC_aboutme_port {
   border: 0px;
   border-collapse: collapse;
@@ -3882,7 +3935,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;
@@ -4260,25 +4314,59 @@ 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;
+  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 {
-    font-family: monospace;
-    white-space: pre;
+  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_option tr td {
+  border: 1px solid #000000;
 }
 
 span.LC_nobreak {
@@ -4327,7 +4415,7 @@ sub headtag {
     my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
     my $url = join(':',$env{'user.name'},$env{'user.domain'},
 		   $Apache::lonnet::perlvar{'lonVersion'},
-		   #time(),
+		   time(),
 		   $env{'environment.color.timestamp'},
 		   $function,$domain,$bgcolor);