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

Diff for /loncom/auth/lonlogin.pm between versions 1.136 and 1.137

version 1.136, 2010/03/31 23:11:48 version 1.137, 2010/05/06 16:15:59
Line 264  my $link=&Apache::loncommon::designparm( Line 264  my $link=&Apache::loncommon::designparm(
 my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);  my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);  my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);  my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
   my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
   my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$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='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
Line 367  $r->print(<$jsh>); Line 370  $r->print(<$jsh>);
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
   
 $r->print(  $r->print(
   '<div class="LC_loginpage_container">');      '<div class="LC_Box"'
      .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
   );
   
 #  #
 #  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?  #  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
Line 395  my $newuserlink; Line 400  my $newuserlink;
 if ($shownewuserlink) {  if ($shownewuserlink) {
     $newuserlink = &newuser_link($lt{'newuser'}).'<br />';      $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }  }
 my $logintitle;  my $logintitle =
       '<h2 class="LC_hcell"'
      .' style="background:'.$loginbox_header_bgcol.';'
      .' color:'.$loginbox_header_textcol.'">';
 if ($loginheader eq 'text') {  if ($loginheader eq 'text') {
     $logintitle ='<h2>'.$lt{'log'}.'</h2>';      $logintitle .= $lt{'log'};
 } else {  } else {
     $logintitle = '<img src="'.$login.'" alt="'.      $logintitle .= '<img src="'.$login.'"'.
                   &mt('User Authentication').'" />';                     ' alt="'.&mt('User Authentication').'" />';
 }  }
   $logintitle .= '</h2>';
   
 my $noscript_warning='<noscript><span class="LC_warning"><b>'  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.')
Line 433  LFORM Line 442  LFORM
 HEADER  HEADER
     }      }
     $r->print(<<ENDTOP);      $r->print(<<ENDTOP);
 <div class="LC_loginpage_space">&nbsp;</div>  <div style="float:left;">
 <div class="LC_loginpage_floatLeft">  <div class="LC_Box" style="background:$loginbox_bg;">
 <div class="LC_loginpage_loginContainer">  
   $logintitle    $logintitle
    <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">    $loginform
       <tr>    $noscript_warning
    <td>  
  $loginform  
            </td>  
       </tr>  
    </table>    
    $noscript_warning  
 </div>  </div>
       
 <div class="LC_loginpage_loginInfo">  <div class="LC_Box" style="padding-top: 10px;">
   $loginhelp    $loginhelp
   $forgotpw    $forgotpw
   $contactblock    $contactblock
Line 455  HEADER Line 457  HEADER
   $coursecatalog    $coursecatalog
 </div>  </div>
 </div>  </div>
   
   <div>
 ENDTOP  ENDTOP
     if ($showmainlogo) {      if ($showmainlogo) {
         $r->print(' <img src="'.$logo.'" alt="" />'."\n");          $r->print(' <img src="'.$logo.'" alt="" />'."\n");
Line 462  ENDTOP Line 466  ENDTOP
 $r->print(<<ENDTOP);  $r->print(<<ENDTOP);
 $announcements  $announcements
 $domainlogo  $domainlogo
 <div class="LC_loginpage_space">&nbsp;</div>  </div>
   <hr style="clear:both;" />
 ENDTOP  ENDTOP
   
 $r->print(<<ENDDOCUMENT);  $r->print(<<ENDDOCUMENT);
Line 642  sub loginhelpdisplay { Line 647  sub loginhelpdisplay {
 sub coursecatalog_link {  sub coursecatalog_link {
     my ($linkname) = @_;      my ($linkname) = @_;
     return <<"END";      return <<"END";
       <span class="LC_nobreak"><a href="/adm/coursecatalog">$linkname</a></span>        <a href="/adm/coursecatalog">$linkname</a>
 END  END
 }  }
   
Removed from v.1.136  
changed lines
  Added in v.1.137

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