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

Diff for /loncom/auth/lonlogin.pm between versions 1.117 and 1.120

version 1.117, 2009/04/01 14:43:19 version 1.120, 2009/05/14 10:21:10
Line 103  sub handler { Line 103  sub handler {
     $env{'form.interface'}=~s/\W//g;      $env{'form.interface'}=~s/\W//g;
   
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};      my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
       
     my $fullgraph=($env{'form.interface'} ne 'textual');  
   
     my $iconpath=       my $iconpath= 
  &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));   &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
Line 235  return OK; Line 233  return OK;
 $servadm=~s/\,/\<br \/\>/g;  $servadm=~s/\,/\<br \/\>/g;
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
 my $pgbg=  my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
 ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');  my $font=&Apache::loncommon::designparm('login.font',$domain);
 my $font=  my $link=&Apache::loncommon::designparm('login.link',$domain);
 ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');  my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $link=  
 ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');  
 my $vlink=  
 ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');  
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);  my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=  my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
 ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');  
 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=&Apache::loncommon::domainlogo($domain);  my $domainlogo=&Apache::loncommon::domainlogo($domain);
Line 302  ENDSCRIPT Line 295  ENDSCRIPT
   
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
   
 my %add_entries = (topmargin    => "0",  my %add_entries = (
        leftmargin   => "0",  
        marginheight => "0",  
        marginwidth  => "0",  
        bgcolor      => "$mainbg",         bgcolor      => "$mainbg",
        text         => "$font",         text         => "$font",
        link         => "$link",         link         => "$link",
Line 326  my %lt=&Apache::lonlocal::texthash( Line 316  my %lt=&Apache::lonlocal::texthash(
   'perc' => 'percent',    'perc' => 'percent',
   'load' => 'Server Load',    'load' => 'Server Load',
   'userload' => 'User Load',    'userload' => 'User Load',
   'about'  => 'About LON-CAPA',  
   'catalog' => 'Course Catalog',    'catalog' => 'Course Catalog',
   'log' => 'Log in',    'log' => 'Log in',
   'help' => 'Log-in Help',    'help' => 'Log-in Help',
Line 347  $r->print(<$jsh>); Line 336  $r->print(<$jsh>);
 }  }
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
   
 if ($fullgraph) {  
 $r->print(  $r->print(
   '<div class="LC_loginpage_container">');    '<div class="LC_loginpage_container">');
   
   #
   #  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
   #  then just us a relative link to authenticate:
   #
   
   if ($otherserver eq "http://") {
       $otherserver="";
 }  }
   
 $r->print(<<ENDSERVERFORM);  $r->print(<<ENDSERVERFORM);
Line 402  my $loginform=(<<LFORM); Line 398  my $loginform=(<<LFORM);
 </form>  </form>
 LFORM  LFORM
   
 if ($fullgraph) {  
     if ($showbanner) {      if ($showbanner) {
         $r->print(<<HEADER);          $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->  <!-- The LON-CAPA Header -->
Line 415  if ($fullgraph) { Line 410  if ($fullgraph) {
 </table>  </table>
 HEADER  HEADER
     }      }
     if ($showmainlogo) {  
         $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".  
                   '    <img src="'.$logo.'" alt="" />'."\n");  
     }  
     $r->print(<<ENDTOP);      $r->print(<<ENDTOP);
 <div class="LC_loginpage_loginDomain">$domainlogo</div>  <div class="LC_loginpage_space">&nbsp;</div>
   <div class="LC_loginpage_floatLeft">
 <div class="LC_loginpage_loginContainer">  <div class="LC_loginpage_loginContainer">
   $logintitle    $logintitle
    <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">     <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
Line 438  HEADER Line 430  HEADER
         $forgotpw<br />          $forgotpw<br />
  $contactblock<br />   $contactblock<br />
         $newuserlink          $newuserlink
         $coursecatalog<br /><br />          $coursecatalog
         <a href="/adm/about.html"><b>$lt{'about'}</b></a>  
 </div>  </div>
   </div>
 <div class="LC_loginpage_space">&nbsp;</div>  ENDTOP
       if ($showmainlogo) {
           $r->print(' <img src="'.$logo.'" alt="" />'."\n");
       }
   $r->print(<<ENDTOP);
 $announcements  $announcements
   $domainlogo
   <div class="LC_loginpage_space">&nbsp;</div>
 ENDTOP  ENDTOP
 }  
   
 if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}  
   
 if ($fullgraph) {  
 $r->print(<<ENDDOCUMENT);  $r->print(<<ENDDOCUMENT);
      <table border="0" cellspacing="0" cellpadding="0">       <table border="0" cellspacing="0" cellpadding="0">
       <tr>        <tr>
Line 494  if ( document.client.uname ) { document. Line 487  if ( document.client.uname ) { document.
 $helpdeskscript  $helpdeskscript
   
 ENDDOCUMENT  ENDDOCUMENT
 }  
     my %endargs = ( 'noredirectlink' => 1, );      my %endargs = ( 'noredirectlink' => 1, );
     $r->print(&Apache::loncommon::end_page(\%endargs));      $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;      return OK;
Removed from v.1.117  
changed lines
  Added in v.1.120

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