[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.107 and 1.108

version 1.107, 2008/11/22 19:07:02 version 1.108, 2008/11/23 11:01:01
Line 311  my %add_entries = (topmargin    => "0", Line 311  my %add_entries = (topmargin    => "0",
        leftmargin   => "0",         leftmargin   => "0",
        marginheight => "0",         marginheight => "0",
        marginwidth  => "0",         marginwidth  => "0",
        bgcolor      => "$pgbg",         bgcolor      => "$mainbg",
        text         => "$font",         text         => "$font",
        link         => "$link",         link         => "$link",
        vlink        => "$vlink",         vlink        => "$vlink",
Line 376  $r->print(<<ENDSERVERFORM); Line 376  $r->print(<<ENDSERVERFORM);
    <input type="hidden" name="localres" value="$env{'form.localres'}" />     <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>    </form>
 ENDSERVERFORM  ENDSERVERFORM
     my $coursecatalog;  my $coursecatalog;
     if (($showcoursecat eq '') || ($showcoursecat)) {  if (($showcoursecat eq '') || ($showcoursecat)) {
         $coursecatalog = &coursecatalog_link($lt{'catalog'});      $coursecatalog = &coursecatalog_link($lt{'catalog'});
     }  }
     my $newuserlink;  my $newuserlink;
     if ($shownewuserlink) {  if ($shownewuserlink) {
         $newuserlink = &newuser_link($lt{'newuser'});      $newuserlink = &newuser_link($lt{'newuser'});
     }  }
     my $logintitle;  my $logintitle;
     if ($loginheader eq 'text') {  if ($loginheader eq 'text') {
         $logintitle = $lt{'log'};      $logintitle = $lt{'log'};
     } else {  } else {
         $logintitle = '<img src="'.$login.'" alt="'.      $logintitle = '<img src="'.$login.'" alt="'.
                       &mt('User Authentication').'" />';                    &mt('User Authentication').'" />';
     }  }
       
      my $noscript_warning='<noscript>'  my $noscript_warning='<noscript><span class="LC_warning"><b>'
                         .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')                       .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
                         .'</noscript>';                      .'</b></span></noscript>';
       my $helpdeskscript;  my $helpdeskscript;
       my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,  my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
                                   $version,$authdomain,\$helpdeskscript);                              $version,$authdomain,\$helpdeskscript);
                    my $loncapaheader=(<<HEADER);
     if ($fullgraph) {   <!-- The LON-CAPA Header -->
     $r->print(<<ENDTOP);  
   <!-- The LON-CAPA Header -->  
 <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">  <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
 <tr>   <tr>
 <td align="left" valign="top" bgcolor="$pgbg"> <img src="$img" border=0 alt="The Learning Online Network with CAPA" /> </td>    <td align="left" valign="top" bgcolor="$pgbg">
 </tr>        <img src="$img" border=0 alt="The Learning Online Network with CAPA" /> 
     </td>
    </tr>
 </table>  </table>
   HEADER
   
  <div class="LC_loginpage_space">&nbsp;</div>  my $loginform=(<<LFORM);
   <form name="client" onsubmit="return(send())">
     <input type="hidden" name="lextkey" value="$lextkey">
     <input type="hidden" name="uextkey" value="$uextkey">
     <b><label for="uname">$lt{'un'}</label>:</b><br />
     <input type="text" name="uname" size="10" value="$authusername" /><br />
     <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
     <input type="password" name="upass$now" size="10" /><br />
     <b><label for="udom">$lt{'dom'}</label>:</b><br />
     <input type="text" name="udom" size="10" value="$authdomain" /><br />
     <input type="submit" value="$lt{'log'}" />
   </form>
   LFORM
   
   if ($fullgraph) { 
   $r->print(<<ENDTOP);
   $loncapaheader
   <div class="LC_loginpage_space">&nbsp;</div>
     <img src="$logo" alt="" />      <img src="$logo" alt="" />
  <div class="LC_loginpage_loginContainer"><fieldset class="LC_loginpage_fieldset">  
 <legend class="LC_loginpage_legend">$logintitle</legend>  
 <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">  
  <tr>  
  <td width="50%" align="center" valign="top">$domainlogo</td>  
  <td>  
 ENDTOP  
   
 $r->print('<form name="client" onsubmit="return(send())">');  
   
 $r->print(<<ENDTOPP)  <div class="LC_loginpage_loginContainer">
  <input type="hidden" name="lextkey" value="$lextkey">   <fieldset class="LC_loginpage_fieldset">
       <input type="hidden" name="uextkey" value="$uextkey">    <legend class="LC_loginpage_legend">$logintitle</legend>
       <b><label for="uname">$lt{'un'}</label>:</b><br />     <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
         <input type="text" name="uname" size="10" value="$authusername" /><br />        <tr>
         <b><label for="upass$now">$lt{'pw'}</label>:</b><br />        <td width="50%" align="center" valign="top">
       <input type="password" name="upass$now" size="10" /><br />   $domainlogo
       <b><label for="udom">$lt{'dom'}</label>:</b><br />     </td>
         <input type="text" name="udom" size="10" value="$authdomain" /><br />     <td>
         <input type="submit" value="$lt{'log'}" />   $loginform
         </form>             </td>
  </td>        </tr>
  </tr>     </table>  
 </table>       $noscript_warning
 $noscript_warning   </fieldset>
 </fieldset></div>  </div>
       
 <div class="LC_loginpage_loginInfo">  <div class="LC_loginpage_loginInfo">
         $loginhelp<br />          $loginhelp<br />
Line 445  $noscript_warning Line 454  $noscript_warning
         <a href="/adm/about.html"><b>$lt{'about'}</b></a><br />          <a href="/adm/about.html"><b>$lt{'about'}</b></a><br />
         $helpdeskscript          $helpdeskscript
 </div>  </div>
   
 <div class="LC_loginpage_space">&nbsp;</div>  <div class="LC_loginpage_space">&nbsp;</div>
 $announcements  $announcements
 ENDTOPP  ENDTOP
 }  }
 if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}  
   
   if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
   
    if ($fullgraph) {  if ($fullgraph) {
         $r->print(<<ENDDOCUMENT);
  $r->print(<<ENDDOCUMENT);  
      
   
      <table border=0 cellspacing=0 cellpadding=0>       <table border=0 cellspacing=0 cellpadding=0>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
Removed from v.1.107  
changed lines
  Added in v.1.108

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