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

Diff for /loncom/auth/lonlogin.pm between versions 1.114 and 1.118

version 1.114, 2009/03/10 18:18:31 version 1.118, 2009/04/08 10:13:13
Line 84  sub handler { Line 84  sub handler {
  $r->print(   $r->print(
                   $start_page                    $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'                   .'<h1>'.&mt('You are already logged in!').'</h1>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',                   .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                   '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'                    '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'                   .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page                   .$end_page
Line 270  my $shownewuserlink = Line 270  my $shownewuserlink =
 my $now=time;  my $now=time;
 my $js = (<<ENDSCRIPT);  my $js = (<<ENDSCRIPT);
   
 <script language="JavaScript">  <script type="text/javascript" language="JavaScript">
 function send()  function send()
 {  {
 this.document.server.elements.uname.value  this.document.server.elements.uname.value
Line 302  ENDSCRIPT Line 302  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 390  my $contactblock = &contactdisplay(\%lt, Line 387  my $contactblock = &contactdisplay(\%lt,
   
 my $loginform=(<<LFORM);  my $loginform=(<<LFORM);
 <form name="client" onsubmit="return(send())">  <form name="client" onsubmit="return(send())">
   <input type="hidden" name="lextkey" value="$lextkey">    <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey">    <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />    <b><label for="uname">$lt{'un'}</label>:</b><br />
   <input type="text" name="uname" size="15" value="$authusername" /><br />    <input type="text" name="uname" size="15" value="$authusername" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />    <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
Line 409  if ($fullgraph) { Line 406  if ($fullgraph) {
 <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">    <td align="left" valign="top" bgcolor="$pgbg">
       <img src="$img" border=0 alt="The Learning Online Network with CAPA" />        <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
   </td>    </td>
  </tr>   </tr>
 </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 441  HEADER Line 435  HEADER
         $coursecatalog<br /><br />          $coursecatalog<br /><br />
         <a href="/adm/about.html"><b>$lt{'about'}</b></a>          <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) {  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  align="left" valign="top">         <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
Removed from v.1.114  
changed lines
  Added in v.1.118

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