Diff for /loncom/interface/loncommon.pm between versions 1.56 and 1.61

version 1.56, 2002/08/22 13:39:42 version 1.61, 2002/08/27 16:49:20
Line 480  sub help_open_topic { Line 480  sub help_open_topic {
   
     # Add the graphic      # Add the graphic
     $template .= <<"ENDTEMPLATE";      $template .= <<"ENDTEMPLATE";
 <a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)"></a>  <a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE  ENDTEMPLATE
   
     return $template;      return $template;
Line 735  sub authform_nochange{ Line 735  sub authform_nochange{
     my $result='';      my $result='';
     $result.=<<"END";      $result.=<<"END";
 <input type="radio" name="login" value="nochange" checked="checked"  <input type="radio" name="login" value="nochange" checked="checked"
        onclick="javascript:changed_radio('nochange',$in{'formname'});">         onclick="javascript:changed_radio('nochange',$in{'formname'});" />
 Do not change login data  Do not change login data
 END  END
     return $result;      return $result;
Line 751  sub authform_kerberos{ Line 751  sub authform_kerberos{
     $result.=<<"END";      $result.=<<"END";
 <input type="radio" name="login" value="krb"   <input type="radio" name="login" value="krb" 
        onclick="javascript:changed_radio('krb',$in{'formname'});"         onclick="javascript:changed_radio('krb',$in{'formname'});"
        onchange="javascript:changed_radio('krb',$in{'formname'});">         onchange="javascript:changed_radio('krb',$in{'formname'});" />
 Kerberos authenticated with domain  Kerberos authenticated with domain
 <input type="text" size="10" name="krbarg" value=""  <input type="text" size="10" name="krbarg" value=""
        onchange="javascript:changed_text('krb',$in{'formname'});">         onchange="javascript:changed_text('krb',$in{'formname'});" />
   <input type="radio" name="krbver" value="4" checked="on" />Version 4
   <input type="radio" name="krbver" value="5" />Version 5
 END  END
     return $result;      return $result;
 }  }
Line 769  sub authform_internal{ Line 771  sub authform_internal{
     $result.=<<"END";      $result.=<<"END";
 <input type="radio" name="login" value="int"  <input type="radio" name="login" value="int"
        onchange="javascript:changed_radio('int',$args{'formname'});"         onchange="javascript:changed_radio('int',$args{'formname'});"
        onclick="javascript:changed_radio('int',$args{'formname'});">         onclick="javascript:changed_radio('int',$args{'formname'});" />
 Internally authenticated (with initial password   Internally authenticated (with initial password 
 <input type="text" size="10" name="intarg" value=""  <input type="text" size="10" name="intarg" value=""
        onchange="javascript:changed_text('int',$args{'formname'});">         onchange="javascript:changed_text('int',$args{'formname'});" />
 END  END
     return $result;      return $result;
 }  }
Line 787  sub authform_local{ Line 789  sub authform_local{
     $result.=<<"END";      $result.=<<"END";
 <input type="radio" name="login" value="loc"  <input type="radio" name="login" value="loc"
        onchange="javascript:changed_radio('loc',$in{'formname'});"         onchange="javascript:changed_radio('loc',$in{'formname'});"
        onclick="javascript:changed_radio('loc',$in{'formname'});">          onclick="javascript:changed_radio('loc',$in{'formname'});" />
 Local Authentication with argument  Local Authentication with argument
 <input type="text" size="10" name="locarg" value=""  <input type="text" size="10" name="locarg" value=""
        onchange="javascript:changed_text('loc',$in{'formname'});">         onchange="javascript:changed_text('loc',$in{'formname'});" />
 END  END
     return $result;      return $result;
 }  }
Line 805  sub authform_filesystem{ Line 807  sub authform_filesystem{
     $result.=<<"END";      $result.=<<"END";
 <input type="radio" name="login" value="fsys"   <input type="radio" name="login" value="fsys" 
        onchange="javascript:changed_radio('fsys',$in{'formname'});"         onchange="javascript:changed_radio('fsys',$in{'formname'});"
        onclick="javascript:changed_radio('fsys',$in{'formname'});">          onclick="javascript:changed_radio('fsys',$in{'formname'});" />
 Filesystem authenticated (with initial password   Filesystem authenticated (with initial password 
 <input type="text" size="10" name="fsysarg" value=""  <input type="text" size="10" name="fsysarg" value=""
        onchange="javascript:changed_text('fsys',$in{'formname'});">         onchange="javascript:changed_text('fsys',$in{'formname'});">
Line 930  sub get_related_words { Line 932  sub get_related_words {
 ##              End Thesaurus Functions                      ##  ##              End Thesaurus Functions                      ##
 ###############################################################  ###############################################################
   
   # -------------------------------------------------------------- Plaintext name
   
   sub plainname {
       my ($uname,$udom)=@_;
       my %names=&Apache::lonnet::get('environment',
                       ['firstname','middlename','lastname','generation'],
    $udom,$uname);
       return $names{'firstname'}.' '.$names{'middlename'}.' '.
    $names{'lastname'}.' '.$names{'generation'};
   }
   
   # ------------------------------------------------------------------ Screenname
   
   sub screenname {
       my ($uname,$udom)=@_;
       my %names=
    &Apache::lonnet::get('environment',['screenname'],$udom,$uname);
       return $names{'screenname'};
   }
   
 # ---------------------------------------------------------------- Language IDs  # ---------------------------------------------------------------- Language IDs
 sub languageids {  sub languageids {
     return sort(keys(%language));      return sort(keys(%language));
Line 1146  sub findallcourses { Line 1168  sub findallcourses {
 }  }
   
 ###############################################  ###############################################
   ###############################################
   
   =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) = @_;    
       if (! $domain) {
           # Determine domain if we have not been given one
           $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
           if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; }
           if ($ENV{'request.role.domain'}) { 
               $domain=$ENV{'request.role.domain'}; 
           }
       }
       # See if there is a logo
       if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
           return '<img src="/adm/lonDomLogos/'.$domain.'.gif" />';
       } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
           return $Apache::lonnet::domaindescription{$domain};
       } else {
           return '';
       }
   }
   
   ###############################################
   ###############################################
   
   =pod
   
   =item &bodytag()
   
   Returns a uniform header for LON-CAPA web pages.
   
   Inputs: 
   
    $title, A title to be displayed on the page.
    $function, the current role (can be undef).
    $addentries, extra parameters for the <body> tag.
    $bodyonly, if defined, only return the <body> tag.
    $domain, if defined, force a given domain.
   
   Returns: A uniform header for LON-CAPA web pages.  
   If $bodyonly is nonzero, a string containing a <body> tag will be returned.
   If $bodyonly is undef or zero, an html string containing a <body> tag and 
   other decorations will be returned.
   
   =cut
   
   ###############################################
   ###############################################
 sub bodytag {  sub bodytag {
     my ($title,$function,$addentries)=@_;      my ($title,$function,$addentries,$bodyonly,$domain)=@_;
     unless ($function) {      unless ($function) {
  $function='student';   $function='student';
         if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {          if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
Line 1208  sub bodytag { Line 1290  sub bodytag {
     }      }
     unless ($realm) { $realm='&nbsp;'; }      unless ($realm) { $realm='&nbsp;'; }
 # Set messages  # Set messages
     my $messages=localtime();      my $messages=&domainlogo($domain);
 # Output  # Output
     return(<<ENDBODY);      my $bodytag = <<END;
 <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"  <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
 $addentries>  $addentries>
   END
       if ($bodyonly) {
           return $bodytag;
       } else {
           return(<<ENDBODY);
   $bodytag
 <table width="100%" cellspacing="0" border="0" cellpadding="0">  <table width="100%" cellspacing="0" border="0" cellpadding="0">
 <tr><td bgcolor="$font">  <tr><td bgcolor="$font">
 <img src="/adm/lonInterFace/$img.jpg" /></td>  <img src="/adm/lonInterFace/$img.jpg" /></td>
Line 1237  $addentries> Line 1325  $addentries>
 <td bgcolor="$tabbg" align="right"><font size="2">$realm</font>&nbsp;</td></tr>  <td bgcolor="$tabbg" align="right"><font size="2">$realm</font>&nbsp;</td></tr>
 </table><br>  </table><br>
 ENDBODY  ENDBODY
       }
 }  }
 ###############################################  ###############################################
   
Line 1425  return HTML code to select file and spec Line 1514  return HTML code to select file and spec
   
 sub upfile_select_html {  sub upfile_select_html {
     return (<<'ENDUPFORM');      return (<<'ENDUPFORM');
 <input type="file" name="upfile" size="50">  <input type="file" name="upfile" size="50" />
 <br />Type: <select name="upfiletype">  <br />Type: <select name="upfiletype">
 <option value="csv">CSV (comma separated values, spreadsheet)</option>  <option value="csv">CSV (comma separated values, spreadsheet)</option>
 <option value="space">Space separated</option>  <option value="space">Space separated</option>

Removed from v.1.56  
changed lines
  Added in v.1.61


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