loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.517 and 1.522

-version 1.517, 2007/04/03 18:47:23
+version 1.522, 2007/04/13 20:22:15
  Line 1272  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
- Line 1461  sub home_server_option_list {
+ Line 1467  sub home_server_option_list {
  =pod
- =back
  =cut
  ###############################################################
- Line 3173  sub determinedomain {
+ Line 3177  sub determinedomain {
  }
  ###############################################
+ 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()
- Line 3187  If the domain logo does not exist, a des
+ Line 3244  If the domain logo does not exist, a des
  ###############################################
  sub domainlogo {
      my $domain = &determinedomain(shift);
-     my %designhash = &Apache::lonnet::get_domainconf($domain);
+     my %designhash = &get_domainconf($domain);
      # See if there is a logo
      if ($designhash{$domain.'.login.domlogo'} ne '') {
-         return '<img src="'.$designhash{$domain.'.login.domlogo'}.
+         my $imgsrc = $designhash{$domain.'.login.domlogo'};
-                '" alt="'.$domain.'" />';
+         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 {
- Line 3229  sub designparm {
+ Line 3289  sub designparm {
  	return $env{'environment.color.'.$which};
      }
      $domain=&determinedomain($domain);
-     my %domdesign = &Apache::lonnet::get_domainconf($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;
  }
  ###############################################
- Line 3775  td.LC_table_cell_checkbox {
+ Line 3843  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_category {
+   color: $font;
+   font-family: $sans;
+   font-size: larger;
+   font-weight: bold;
+ }
  td.LC_menubuttons_text {
    color: $font;
    font-family: $sans;
- Line 4221  span.LC_prior_numerical {
+ Line 4300  span.LC_prior_numerical {
      white-space: pre;
  }
+ span.LC_nobreak {
+     white-space: nowrap;
+ }
  END
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.517
changed lines
	Added in v.1.522