Diff for /loncom/auth/lonlogin.pm between versions 1.106 and 1.106.2.1

version 1.106, 2008/10/02 11:28:49 version 1.106.2.1, 2008/12/10 17:45:29
Line 266  sub handler { Line 266  sub handler {
     if ($login eq '') {      if ($login eq '') {
         $login = $iconpath.'/'.&mt('userauthentication.gif');          $login = $iconpath.'/'.&mt('userauthentication.gif');
     }      }
       my $showbanner = 1;
       my $showmainlogo = 1;
       if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
           $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
       }
       if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
           $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
       }
     my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);      my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
     my $showcoursecat =      my $showcoursecat =
         &Apache::loncommon::designparm('login.coursecatalog',$domain);          &Apache::loncommon::designparm('login.coursecatalog',$domain);
Line 410  ENDSERVERFORM Line 418  ENDSERVERFORM
     if ($shownewuserlink) {      if ($shownewuserlink) {
         $newuserlink = &newuser_link($lt{'newuser'});          $newuserlink = &newuser_link($lt{'newuser'});
     }      }
     if ($fullgraph) { $r->print(<<ENDTOP);      if ($fullgraph) {
           $r->print(<<HEADER);
   <!-- The LON-CAPA Header -->    <!-- The LON-CAPA Header -->
   <tr>    <tr>
   
    <!-- Row 1 Columns 2-4 -->     <!-- Row 1 Columns 2-4 -->
    <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>     <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg">
   HEADER
           if ($showbanner) {
               $r->print(<<ENDBANNER); 
   <img src="$img" border=0 alt="The Learning Online Network with CAPA" />
   ENDBANNER
           }
           $r->print(<<ENDSTART);
      </td>
   </tr>    </tr>
   
   <!-- The gray bar that starts the two table frames -->    <!-- The gray bar that starts the two table frames -->
Line 459  ENDSERVERFORM Line 476  ENDSERVERFORM
    <!-- The right main column holding the large LON-CAPA logo-->     <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->     <!-- Rows 3-4 Column 3 -->
    <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">     <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
   ENDSTART
           if ($showmainlogo) {
               $r->print(<<ENDLOGO);
     <center>      <center>
      <img src="$logo" alt="" />       <img src="$logo" alt="" />
     </center>      </center>
   ENDLOGO
           }
           $r->print(<<ENDTOP);
    </td>     </td>
   
    <!-- Row 3 Column 4 -->     <!-- Row 3 Column 4 -->
Line 473  ENDSERVERFORM Line 496  ENDSERVERFORM
    <!-- Row 4 Column 1 -->     <!-- Row 4 Column 1 -->
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
 } else {      } else {
     $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'          $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
              .'<h2>'.&mt('Text-based Interface Login').'</h2>'                   .'<h2>'.&mt('Text-based Interface Login').'</h2>'
              .$announcements);                   .$announcements);
 }      }
     $r->print('<form name="client" onsubmit="return(send())">');      $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {      unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);          $r->print(<<ENDACCESSOPTIONS);
Line 490  ENDTOP Line 513  ENDTOP
 <br />  <br />
 <input type="checkbox" name="remember" /> $lt{'remember'}<hr />  <input type="checkbox" name="remember" /> $lt{'remember'}<hr />
 ENDACCESSOPTIONS  ENDACCESSOPTIONS
 } else {      } else {
     $r->print(<<ENDNOOPT);          $r->print(<<ENDNOOPT);
 <input type="hidden" name="imagesuppress"  value="" />  <input type="hidden" name="imagesuppress"  value="" />
 <input type="hidden" name="embedsuppress"  value="" />  <input type="hidden" name="embedsuppress"  value="" />
 <input type="hidden" name="appletsuppress"  value="" />  <input type="hidden" name="appletsuppress"  value="" />
Line 499  ENDACCESSOPTIONS Line 522  ENDACCESSOPTIONS
 <input type="hidden" name="blackwhite"  value="" />  <input type="hidden" name="blackwhite"  value="" />
 <input type="hidden" name="remember"  value="" />  <input type="hidden" name="remember"  value="" />
 ENDNOOPT  ENDNOOPT
 }      }
     my $logintitle;      my $logintitle;
     if ($loginheader eq 'text') {      if ($loginheader eq 'text') {
         $logintitle = '<td bgcolor="'.$bgcol.'" colspan="2">&nbsp;&nbsp;&nbsp;<b><font size="+1" color="'.$textcol.'">'.$lt{'log'}.'</font></b></td>';          $logintitle = '<td bgcolor="'.$bgcol.'" colspan="2">&nbsp;&nbsp;&nbsp;<b><font size="+1" color="'.$textcol.'">'.$lt{'log'}.'</font></b></td>';

Removed from v.1.106  
changed lines
  Added in v.1.106.2.1


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