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

Diff for /loncom/auth/lonlogin.pm between versions 1.140 and 1.146

version 1.140, 2010/08/25 16:34:32 version 1.146, 2011/02/11 10:41:59
Line 69  sub handler { Line 69  sub handler {
  return OK;   return OK;
     }      }
   
       $env{'form.firsturl'} =~ s/(`)/'/g;
   
 # -------------------------------- Prevent users from attempting to login twice  # -------------------------------- Prevent users from attempting to login twice
     my $handle = &Apache::lonnet::check_for_valid_session($r);      my $handle = &Apache::lonnet::check_for_valid_session($r);
Line 130  sub handler { Line 131  sub handler {
     }      }
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');      my $loadlim = $r->dir_config('lonLoadLim');
       my $uloadlim= $r->dir_config('lonUserLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');      my $servadm = $r->dir_config('lonAdmEMail');
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
Line 150  sub handler { Line 152  sub handler {
     }      }
     $loadavg =~ s/\s.*//g;      $loadavg =~ s/\s.*//g;
     my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);      my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
       unless ($loadlim) { $loadpercent='---'; }
     my $userloadpercent=&Apache::lonnet::userload();      my $userloadpercent=&Apache::lonnet::userload();
       unless ($uloadlim) { $userloadpercent='---'; }
   
     my $firsturl=      my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});      ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
   
 # ----------------------------------------------------------- Get announcements  # ----------------------------------------------------------- Get announcements
     my $announcements=&Apache::lonnet::getannounce();      my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
Line 261  my $loginbox_header_bgcol=&Apache::lonco Line 266  my $loginbox_header_bgcol=&Apache::lonco
 my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);  my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);  my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);  my $img=&Apache::loncommon::designparm('login.img',$domain);
 my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';  my $domainlogo=&Apache::loncommon::domainlogo($domain);
 my $showbanner = 1;  my $showbanner = 1;
 my $showmainlogo = 1;  my $showmainlogo = 1;
 if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {  if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
Line 307  return false; Line 312  return false;
 }  }
   
 function enableInput() {  function enableInput() {
     this.document.client.elements.upass$now.removeAttribute("readonly");      this.document.client.elements.upass$now.removeAttribute("readOnly");
     this.document.client.elements.uname.removeAttribute("readonly");      this.document.client.elements.uname.removeAttribute("readOnly");
     this.document.client.elements.udom.removeAttribute("readonly");      this.document.client.elements.udom.removeAttribute("readOnly");
     return;      return;
 }  }
   
Line 433  LFORM Line 438  LFORM
 HEADER  HEADER
     }      }
     $r->print(<<ENDTOP);      $r->print(<<ENDTOP);
 <div style="float:left;">  <div style="float:left;margin-top:0;">
 <div class="LC_Box" style="background:$loginbox_bg;">  <div class="LC_Box" style="background:$loginbox_bg;">
   $logintitle    $logintitle
   $loginform    $loginform
Line 456  ENDTOP Line 461  ENDTOP
     }      }
 $r->print(<<ENDTOP);  $r->print(<<ENDTOP);
 $announcements  $announcements
 $domainlogo  
 </div>  </div>
 <hr style="clear:both;" />  <hr style="clear:both;" />
 ENDTOP  ENDTOP
   
 $r->print(<<ENDDOCUMENT);  $r->print(<<ENDDOCUMENT);
       <div style="float: left;">
      <table border="0" cellspacing="0" cellpadding="0">       <table border="0" cellspacing="0" cellpadding="0">
       <tr>        <tr>
        <td  align="left" valign="top">         <td  align="left" valign="top">
Line 501  $r->print(<<ENDDOCUMENT); Line 506  $r->print(<<ENDDOCUMENT);
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
       </div>
       <div style="float: right;">
       $domainlogo
       </div>
       <br style="clear:both;" />
  </div>   </div>
   
 <script type="text/javascript">  <script type="text/javascript">
Removed from v.1.140  
changed lines
  Added in v.1.146

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