Diff for /loncom/auth/lonlogin.pm between versions 1.111 and 1.112

version 1.111, 2008/12/10 10:14:55 version 1.112, 2008/12/10 15:45:38
Line 102  sub handler { Line 102  sub handler {
 # ----------------------------------------------------------- Process Interface  # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;      $env{'form.interface'}=~s/\W//g;
   
    # my $textbrowsers=$r->dir_config('lonTextBrowsers');  
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};      my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
           
    # foreach (split(/\:/,$textbrowsers)) {  
 # if ($httpbrowser=~/$_/i) {  
 #    $env{'form.interface'}='textual';  
 #        }  
 #    }  
   
     my $fullgraph=($env{'form.interface'} ne 'textual');      my $fullgraph=($env{'form.interface'} ne 'textual');
   
     my $iconpath=       my $iconpath= 
Line 253  my $vlink= Line 246  my $vlink=
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);  my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=  my $mainbg=
 ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');  ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
 my $textcol =   
 ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');  
 my $bgcol =  
 ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$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 386  if ($shownewuserlink) { Line 375  if ($shownewuserlink) {
 }  }
 my $logintitle;  my $logintitle;
 if ($loginheader eq 'text') {  if ($loginheader eq 'text') {
     $logintitle = $lt{'log'};      $logintitle ='<h1>'.$lt{'log'}.'</h1>';
 } else {  } else {
     $logintitle = '<img src="'.$login.'" alt="'.      $logintitle = '<img src="'.$login.'" alt="'.
                   &mt('User Authentication').'" />';                    &mt('User Authentication').'" />';
Line 404  my $loginform=(<<LFORM); Line 393  my $loginform=(<<LFORM);
   <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="10" value="$authusername" /><br />    <input type="text" name="uname" size="20" value="$authusername" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />    <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
   <input type="password" name="upass$now" size="10" /><br />    <input type="password" name="upass$now" size="20" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />    <b><label for="udom">$lt{'dom'}</label>:</b><br />
   <input type="text" name="udom" size="10" value="$authdomain" /><br />    <input type="text" name="udom" size="20" value="$authdomain" /><br />
   <input type="submit" value="$lt{'log'}" />    <input type="submit" value="$lt{'log'}" />
 </form>  </form>
 LFORM  LFORM
Line 431  HEADER Line 420  HEADER
                   '    <img src="'.$logo.'" alt="" />'."\n");                    '    <img src="'.$logo.'" alt="" />'."\n");
     }      }
     $r->print(<<ENDTOP);      $r->print(<<ENDTOP);
   <div class="LC_loginpage_loginDomain">$domainlogo</div>
 <div class="LC_loginpage_loginContainer">  <div class="LC_loginpage_loginContainer">
  <fieldset class="LC_loginpage_fieldset">    $logintitle
   <legend class="LC_loginpage_legend">$logintitle</legend>     <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
    <table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">  
       <tr>        <tr>
       <td width="50%" align="center" valign="top">  
  $domainlogo  
    </td>  
    <td>     <td>
  $loginform   $loginform
            </td>             </td>
       </tr>        </tr>
    </table>       </table>  
    $noscript_warning     $noscript_warning
  </fieldset>  
 </div>  </div>
       
 <div class="LC_loginpage_loginInfo">  <div class="LC_loginpage_loginInfo">

Removed from v.1.111  
changed lines
  Added in v.1.112


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