--- loncom/interface/loncommon.pm 2002/08/28 14:11:27 1.62 +++ loncom/interface/loncommon.pm 2002/12/12 16:47:27 1.72 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.62 2002/08/28 14:11:27 www Exp $ +# $Id: loncommon.pm,v 1.72 2002/12/12 16:47:27 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -98,6 +98,10 @@ my %cprtag; my %fe; my %fd; my %category_extensions; +# ---------------------------------------------- Designs + +my %designhash; + # ---------------------------------------------- Thesaurus variables =pod @@ -166,6 +170,30 @@ BEGIN { } } } + +# -------------------------------------------------------------- domain designs + + my $filename; + my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors'; + opendir(DIR,$designdir); + while ($filename=readdir(DIR)) { + my ($domain)=($filename=~/^(\w+)\./); + { + my $fh=Apache::File->new($designdir.'/'.$filename); + if ($fh) { + while (<$fh>) { + next if /^\#/; + chomp; + my ($key,$val)=(split(/\=/,$_)); + if ($val) { $designhash{$domain.'.'.$key}=$val; } + } + } + } + + } + closedir(DIR); + + # ------------------------------------------------------------- file categories { my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. @@ -465,7 +493,7 @@ sub help_open_topic { if (!$stayOnPage) { - $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height'))"; + $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; } else { @@ -946,6 +974,26 @@ sub plainname { return $name; } +# -------------------------------------------------------------------- Nickname + + +sub nickname { + my ($uname,$udom)=@_; + my %names=&Apache::lonnet::get('environment', + ['nickname','firstname','middlename','lastname','generation'],$udom,$uname); + my $name=$names{'nickname'}; + if ($name) { + $name='"'.$name.'"'; + } else { + $name=$names{'firstname'}.' '.$names{'middlename'}.' '. + $names{'lastname'}.' '.$names{'generation'}; + $name=~s/\s+$//; + $name=~s/\s+/ /g; + } + return $name; +} + + # ------------------------------------------------------------------ Screenname sub screenname { @@ -965,8 +1013,8 @@ sub messagewrapper { # ------------------------------------------------------------- Aboutme Wrapper sub aboutmewrapper { - my ($link,$un,$do)=@_; - return "$link"; + my ($link,$username,$domain)=@_; + return "$link"; } # ------------------------------------------------------------ Syllabus Wrapper @@ -1106,7 +1154,7 @@ sub get_previous_attempt { } sub get_student_view { - my ($symb,$username,$domain,$courseid) = @_; + my ($symb,$username,$domain,$courseid,$target) = @_; my ($map,$id,$feedurl) = split(/___/,$symb); my (%old,%moreenv); my @elements=('symb','courseid','domain','username'); @@ -1114,6 +1162,7 @@ sub get_student_view { $old{$element}=$ENV{'form.grade_'.$element}; $moreenv{'form.grade_'.$element}=eval '$'.$element #' } + if ($target eq 'tex') {$moreenv{'form.grade_target'} = 'tex';} &Apache::lonnet::appenv(%moreenv); my $userview=&Apache::lonnet::ssi('/res/'.$feedurl); &Apache::lonnet::delenv('form.grade_'); @@ -1173,6 +1222,22 @@ sub maketime { } +######################################### +# +# Retro-fixing of un-backward-compatible time format + +sub unsqltime { + my $timestamp=shift; + if ($timestamp=~/^(\d+)\-(\d+)\-(\d+)\s+(\d+)\:(\d+)\:(\d+)$/) { + $timestamp=&maketime( + 'year'=>$1,'month'=>$2,'day'=>$3, + 'hours'=>$4,'minutes'=>$5,'seconds'=>$6); + } + return $timestamp; +} + +######################################### + sub findallcourses { my %courses=(); my $now=time; @@ -1197,20 +1262,18 @@ sub findallcourses { =pod -=item &domainlogo() +=item &determinedomain() Inputs: $domain (usually will be undef) -Returns: A link to a domain logo, if the domain logo exists. -If the domain logo does not exist, a description of the domain. +Returns: Determines which domain should be used for designs =cut ############################################### -############################################### -sub domainlogo { - my ($domain) = @_; - if (! $domain) { +sub determinedomain { + my $domain=shift; + if (! $domain) { # Determine domain if we have not been given one $domain = $Apache::lonnet::perlvar{'lonDefDomain'}; if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; } @@ -1218,15 +1281,53 @@ sub domainlogo { $domain=$ENV{'request.role.domain'}; } } - # See if there is a logo + return $domain; +} +############################################### +=pod + +=item &domainlogo() + +Inputs: $domain (usually will be undef) + +Returns: A link to a domain logo, if the domain logo exists. +If the domain logo does not exist, a description of the domain. + +=cut +############################################### +sub domainlogo { + my $domain = &determinedomain(shift); + # See if there is a logo if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') { - return ''; + return ''; } elsif(exists($Apache::lonnet::domaindescription{$domain})) { return $Apache::lonnet::domaindescription{$domain}; } else { return ''; } } +############################################## + +=pod + +=item &designparm() + +Inputs: $which parameter; $domain (usually will be undef) + +Returns: value of designparamter $which + +=cut +############################################## +sub designparm { + my ($which,$domain)=@_; + $domain=&determinedomain($domain); + if ($designhash{$domain.'.'.$which}) { + return $designhash{$domain.'.'.$which}; + } else { + return $designhash{'default.'.$which}; + } +} ############################################### ############################################### @@ -1253,6 +1354,8 @@ other decorations will be returned. =cut ############################################### + + ############################################### sub bodytag { my ($title,$function,$addentries,$bodyonly,$domain)=@_; @@ -1269,43 +1372,16 @@ sub bodytag { $function='author'; } } - my $img=''; - my $pgbg=''; - my $tabbg=''; - my $font=''; - my $link=''; - my $alink='#CC0000'; - my $vlink=''; - if ($function eq 'admin') { - $img='admin'; - $pgbg='#FFFFCC'; - $tabbg='#CCCC99'; - $font='#772200'; - $link='#663300'; - $vlink='#666600'; - } elsif ($function eq 'coordinator') { - $img='coordinator'; - $pgbg='#CCFFFF'; - $tabbg='#CCCCFF'; - $font='#000044'; - $link='#003333'; - $vlink='#006633'; - } elsif ($function eq 'author') { - $img='author'; - $pgbg='#CCFFFF'; - $tabbg='#CCFFCC'; - $font='#004400'; - $link='#003333'; - $vlink='#006666'; - } else { - $img='student'; - $pgbg='#FFFFAA'; - $tabbg='#FF9900'; - $font='#991100'; - $link='#993300'; - $vlink='#996600'; - } -# role and realm + my $img=&designparm($function.'.img',$domain); + my $pgbg=&designparm($function.'.pgbg',$domain); + my $tabbg=&designparm($function.'.tabbg',$domain); + my $font=&designparm($function.'.font',$domain); + my $link=&designparm($function.'.link',$domain); + my $alink=&designparm($function.'.alink',$domain); + my $vlink=&designparm($function.'.vlink',$domain); + my $sidebg=&designparm($function.'.sidebg',$domain); + + # role and realm my ($role,$realm) =&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]); # realm @@ -1328,8 +1404,8 @@ END $bodytag - + +
-$messages$messages
@@ -1742,7 +1818,7 @@ will result in $ENV{'form.uname'} and $E returns cache-controlling header code -=item nocache() +=item no_cache($r) specifies header code to not have cache