[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.109

version 1.107, 2008/11/22 19:07:02 version 1.109, 2008/12/01 15:03:43
Line 266  my $login=&Apache::loncommon::designparm Line 266  my $login=&Apache::loncommon::designparm
 if ($login eq '') {  if ($login eq '') {
 $login = $iconpath.'/'.&mt('userauthentication.gif');  $login = $iconpath.'/'.&mt('userauthentication.gif');
 }  }
   my $showbanner = 1;
   my $showmainlogo = 1;
   if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
       $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
   }
   if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
       $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
   }
 my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);  my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
 my $showcoursecat =  my $showcoursecat =
 &Apache::loncommon::designparm('login.coursecatalog',$domain);  &Apache::loncommon::designparm('login.coursecatalog',$domain);
Line 311  my %add_entries = (topmargin    => "0", Line 319  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 384  $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;
   if ($loginheader eq 'text') {
       $logintitle = $lt{'log'};
   } else {
       $logintitle = '<img src="'.$login.'" alt="'.
                     &mt('User Authentication').'" />';
   }
   
   my $noscript_warning='<noscript><span class="LC_warning"><b>'
                        .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
                       .'</b></span></noscript>';
   my $helpdeskscript;
   my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
                               $version,$authdomain,\$helpdeskscript);
   
   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) {
       if ($showbanner) {
           $r->print(<<HEADER);
   <!-- The LON-CAPA Header -->
   <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
    <tr>
     <td align="left" valign="top" bgcolor="$pgbg">
         <img src="$img" border=0 alt="The Learning Online Network with CAPA" />
     </td>
    </tr>
   </table>
   HEADER
     }      }
     my $logintitle;      if ($showmainlogo) {
     if ($loginheader eq 'text') {          $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
         $logintitle = $lt{'log'};                    '    <img src="'.$logo.'" alt="" />'."\n");
     } else {  
         $logintitle = '<img src="'.$login.'" alt="'.  
                       &mt('User Authentication').'" />';  
     }      }
       
      my $noscript_warning='<noscript>'  
                         .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')  
                         .'</noscript>';  
       my $helpdeskscript;  
       my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,  
                                   $version,$authdomain,\$helpdeskscript);  
                    
     if ($fullgraph) {   
     $r->print(<<ENDTOP);      $r->print(<<ENDTOP);
   <!-- The LON-CAPA Header -->  <div class="LC_loginpage_loginContainer">
 <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">   <fieldset class="LC_loginpage_fieldset">
 <tr>    <legend class="LC_loginpage_legend">$logintitle</legend>
 <td align="left" valign="top" bgcolor="$pgbg"> <img src="$img" border=0 alt="The Learning Online Network with CAPA" /> </td>     <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
 </tr>        <tr>
 </table>        <td width="50%" align="center" valign="top">
    $domainlogo
  <div class="LC_loginpage_space">&nbsp;</div>     </td>
     <img src="$logo" alt="" />     <td>
  <div class="LC_loginpage_loginContainer"><fieldset class="LC_loginpage_fieldset">   $loginform
 <legend class="LC_loginpage_legend">$logintitle</legend>             </td>
 <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">        </tr>
  <tr>     </table>  
  <td width="50%" align="center" valign="top">$domainlogo</td>     $noscript_warning
  <td>   </fieldset>
 ENDTOP  </div>
   
 $r->print('<form name="client" onsubmit="return(send())">');  
   
 $r->print(<<ENDTOPP)  
  <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>  
  </td>  
  </tr>  
 </table>    
 $noscript_warning  
 </fieldset></div>  
       
 <div class="LC_loginpage_loginInfo">  <div class="LC_loginpage_loginInfo">
         $loginhelp<br />          $loginhelp<br />
Line 445  $noscript_warning Line 464  $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.109

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