[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm

tempelho lon-capa-cvs-allow@mail.lon-capa.org
Sat, 22 Nov 2008 19:07:02 -0000


This is a MIME encoded message

--tempelho1227380822
Content-Type: text/plain

tempelho		Sat Nov 22 19:07:02 2008 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm 
  Log:
  Removing the Accessibility Options. Redesigning the page.
  
  
--tempelho1227380822
Content-Type: text/plain
Content-Disposition: attachment; filename="tempelho-20081122190702.txt"

Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.106 loncom/auth/lonlogin.pm:1.107
--- loncom/auth/lonlogin.pm:1.106	Thu Oct  2 11:28:49 2008
+++ loncom/auth/lonlogin.pm	Sat Nov 22 19:07:02 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106 2008/10/02 11:28:49 bisitz Exp $
+# $Id: lonlogin.pm,v 1.107 2008/11/22 19:07:02 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,14 +102,14 @@
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-    my $textbrowsers=$r->dir_config('lonTextBrowsers');
+   # my $textbrowsers=$r->dir_config('lonTextBrowsers');
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
     
-    foreach (split(/\:/,$textbrowsers)) {
-	if ($httpbrowser=~/$_/i) {
-	    $env{'form.interface'}='textual';
-        }
-    }
+   # foreach (split(/\:/,$textbrowsers)) {
+#	if ($httpbrowser=~/$_/i) {
+#	    $env{'form.interface'}='textual';
+#        }
+#    }
 
     my $fullgraph=($env{'form.interface'} ne 'textual');
 
@@ -204,200 +204,174 @@
                 ' '.&mt('(preferred)').'</font>'.$/;
 	    $last=$hostname;
         }
-        $spares.= '<br />';
-	my %all_hostnames = &Apache::lonnet::all_hostnames();
-        foreach my $hostid (sort
-			    {
-				&Apache::lonnet::hostname($a) cmp
-				    &Apache::lonnet::hostname($b);
-			    }
-			    keys(%all_hostnames)) {
-            next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
-	    my $hostname = &Apache::lonnet::hostname($hostid);
-            next if ($last eq $hostname);
-            $spares.='<br /><a href="http://'.
-                $hostname.
-                '/adm/login?domain='.$authdomain.'">'.
-                $hostname.'</a>';
-	    $last=$hostname;
-        }
-	$r->print(
-           '<html>'
-          .'<head><title>'
-          .&mt('The LearningOnline Network with CAPA')
-          .'</title></head>'
-          .'<body bgcolor="#FFFFFF">'
-          .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
-          .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
-          .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
-          .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
-          .$spares
-          .'</body>'
-          .'</html>'
-        );
-        return OK;
-    }
+$spares.= '<br />';
+my %all_hostnames = &Apache::lonnet::all_hostnames();
+foreach my $hostid (sort
+		    {
+			&Apache::lonnet::hostname($a) cmp
+			    &Apache::lonnet::hostname($b);
+		    }
+		    keys(%all_hostnames)) {
+    next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+    my $hostname = &Apache::lonnet::hostname($hostid);
+    next if ($last eq $hostname);
+    $spares.='<br /><a href="http://'.
+	$hostname.
+	'/adm/login?domain='.$authdomain.'">'.
+	$hostname.'</a>';
+    $last=$hostname;
+}
+$r->print(
+   '<html>'
+  .'<head><title>'
+  .&mt('The LearningOnline Network with CAPA')
+  .'</title></head>'
+  .'<body bgcolor="#FFFFFF">'
+  .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
+  .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
+  .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
+  .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
+  .$spares
+  .'</body>'
+  .'</html>'
+);
+return OK;
+}
 
 # ----------------------------------------------- Apparently we are in business
-    $servadm=~s/\,/\<br \/\>/g;
+$servadm=~s/\,/\<br \/\>/g;
 
 # ----------------------------------------------------------- Front page design
-    my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
-    my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
-    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 $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
-    my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$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 $img=&Apache::loncommon::designparm('login.img',$domain);
-    my $domainlogo=&Apache::loncommon::domainlogo($domain);
-    my $login=&Apache::loncommon::designparm('login.login',$domain);
-    if ($login eq '') {
-        $login = $iconpath.'/'.&mt('userauthentication.gif');
-    }
-    my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
-    my $showcoursecat =
-        &Apache::loncommon::designparm('login.coursecatalog',$domain);
-    my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
-    my $shownewuserlink = 
-        &Apache::loncommon::designparm('login.newuser',$domain);
-    my $now=time;
-    my $js = (<<ENDSCRIPT);
-
- <script language="JavaScript">
-    function send()
-    {
-        this.document.server.elements.uname.value
-       =this.document.client.elements.uname.value;
-
-        this.document.server.elements.udom.value
-       =this.document.client.elements.udom.value;
-
-        this.document.server.elements.imagesuppress.value
-       =this.document.client.elements.imagesuppress.checked;
-
-        this.document.server.elements.embedsuppress.value
-       =this.document.client.elements.embedsuppress.checked;
-
-        this.document.server.elements.appletsuppress.value
-       =this.document.client.elements.appletsuppress.checked;
-
-        this.document.server.elements.fontenhance.value
-       =this.document.client.elements.fontenhance.checked;
-
-        this.document.server.elements.blackwhite.value
-       =this.document.client.elements.blackwhite.checked;
-
-        this.document.server.elements.remember.value
-       =this.document.client.elements.remember.checked;
-
-        uextkey=this.document.client.elements.uextkey.value;
-        lextkey=this.document.client.elements.lextkey.value;
-        initkeys();
-
-        this.document.server.elements.upass0.value
-            =crypted(this.document.client.elements.upass$now.value.substr(0,15));
-        this.document.server.elements.upass1.value
-            =crypted(this.document.client.elements.upass$now.value.substr(15,15));
-        this.document.server.elements.upass2.value
-            =crypted(this.document.client.elements.upass$now.value.substr(30,15));
+my $pgbg=
+($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
+my $font=
+($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
+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 $mainbg=
+($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
+my $sidebg=
+($fullgraph?&Apache::loncommon::designparm('login.sidebg',$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 $img=&Apache::loncommon::designparm('login.img',$domain);
+my $domainlogo=&Apache::loncommon::domainlogo($domain);
+my $login=&Apache::loncommon::designparm('login.login',$domain);
+if ($login eq '') {
+$login = $iconpath.'/'.&mt('userauthentication.gif');
+}
+my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
+my $showcoursecat =
+&Apache::loncommon::designparm('login.coursecatalog',$domain);
+my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
+my $shownewuserlink = 
+&Apache::loncommon::designparm('login.newuser',$domain);
+my $now=time;
+my $js = (<<ENDSCRIPT);
+
+<script language="JavaScript">
+function send()
+{
+this.document.server.elements.uname.value
+=this.document.client.elements.uname.value;
+
+this.document.server.elements.udom.value
+=this.document.client.elements.udom.value;
+
+uextkey=this.document.client.elements.uextkey.value;
+lextkey=this.document.client.elements.lextkey.value;
+initkeys();
+
+this.document.server.elements.upass0.value
+    =crypted(this.document.client.elements.upass$now.value.substr(0,15));
+this.document.server.elements.upass1.value
+    =crypted(this.document.client.elements.upass$now.value.substr(15,15));
+this.document.server.elements.upass2.value
+    =crypted(this.document.client.elements.upass$now.value.substr(30,15));
 
-        this.document.client.elements.uname.value='';
-        this.document.client.elements.upass$now.value='';
+this.document.client.elements.uname.value='';
+this.document.client.elements.upass$now.value='';
 
-        this.document.server.submit();
-        return false;
-    }
- </script>
+this.document.server.submit();
+return false;
+}
+</script>
 
 ENDSCRIPT
 
 # --------------------------------------------------- Print login screen header
 
-    my %add_entries = (topmargin    => "0",
-                       leftmargin   => "0",
-                       marginheight => "0",
-                       marginwidth  => "0",
-                       bgcolor      => "$pgbg",
-                       text         => "$font",
-                       link         => "$link",
-                       vlink        => "$vlink",
-                       alink        => "$alink",);
-
-    $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
-                                       { 'redirect'       => [$expire,'/adm/roles'], 
-                                         'add_entries' => \%add_entries,
-                                         'only_body'   => 1,}));
+my %add_entries = (topmargin    => "0",
+	       leftmargin   => "0",
+	       marginheight => "0",
+	       marginwidth  => "0",
+	       bgcolor      => "$pgbg",
+	       text         => "$font",
+	       link         => "$link",
+	       vlink        => "$vlink",
+	       alink        => "$alink",);
+
+$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
+			       { 'redirect'       => [$expire,'/adm/roles'], 
+				 'add_entries' => \%add_entries,
+				 'only_body'   => 1,}));
 
 # ----------------------------------------------------------------------- Texts
 
 my %lt=&Apache::lonlocal::texthash(
-		  'un'  => 'Username',
-		  'pw'  => 'Password',
-		  'dom' => 'Domain',
-		  'perc' => 'percent',
-		  'load' => 'Server Load',
-                  'userload' => 'User Load',
-                  'about'  => 'About LON-CAPA',
-                  'access' => 'Accessibility Options',
-                  'catalog' => 'Course Catalog',
-		  'log' => 'Log in',
-		  'help' => 'Log-in Help',
-		  'serv' => 'Server',
-                  'servadm' => 'Server Administration',
-                  'helpdesk' => 'Contact Helpdesk',
-                  'forgotpw' => 'Forgot password?',
-                  'newuser'  => 'New User?',
-                  'options_headline' => 'Select Accessibility Options',
-                  'sprs_img' => 'Suppress rendering of images',
-                  'sprs_applet' => 'Suppress Java applets',
-                  'sprs_embed' => 'Suppress rendering of embedded multimedia',
-                  'sprs_font' => 'Increase font size',
-                  'sprs_blackwhite' => 'Switch to black and white mode',
-                  'remember' => 'Remember these settings for next login');
+	  'un'  => 'Username',
+	  'pw'  => 'Password',
+	  'dom' => 'Domain',
+	  'perc' => 'percent',
+	  'load' => 'Server Load',
+	  'userload' => 'User Load',
+	  'about'  => 'About LON-CAPA',
+	  'catalog' => 'Course Catalog',
+	  'log' => 'Log in',
+	  'help' => 'Log-in Help',
+	  'serv' => 'Server',
+	  'servadm' => 'Server Administration',
+	  'helpdesk' => 'Contact Helpdesk',
+	  'forgotpw' => 'Forgot password?',
+	  'newuser'  => 'New User?',
+	  'options_headline' => 'Select Accessibility Options',
+	  'sprs_img' => 'Suppress rendering of images',
+	  'sprs_applet' => 'Suppress Java applets',
+	  'sprs_embed' => 'Suppress rendering of embedded multimedia',
+	  'sprs_font' => 'Increase font size',
+	  'sprs_blackwhite' => 'Switch to black and white mode',
+	  'remember' => 'Remember these settings for next login');
 # -------------------------------------------------- Change password field name
-    my $forgotpw = &forgotpwdisplay(%lt);
-    my $loginhelp = &loginhelpdisplay(%lt);
+my $forgotpw = &forgotpwdisplay(%lt);
+my $loginhelp = &loginhelpdisplay(%lt);
 
 # ---------------------------------------------------- Serve out DES JavaScript
-    {
-        my $jsh=Apache::File->new($include."/londes.js");
-        $r->print(<$jsh>);
-    }
+{
+my $jsh=Apache::File->new($include."/londes.js");
+$r->print(<$jsh>);
+}
 # ---------------------------------------------------------- Serve rest of page
 
-    if ($fullgraph) {
-	$r->print(
-		  '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
-    }
+if ($fullgraph) {
+$r->print(
+	  '<div class="LC_loginpage_container">');
+}
 
-    $r->print(<<ENDSERVERFORM);
-  <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
+$r->print(<<ENDSERVERFORM);
+<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
-   <input type="hidden" name="interface" value="$env{'form.interface'}" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass0" value="" />
    <input type="hidden" name="upass1" value="" />
    <input type="hidden" name="upass2" value="" />
    <input type="hidden" name="udom" value="" />
-   <input type="hidden" name="imagesuppress"  value="" />
-   <input type="hidden" name="appletsuppress"  value="" />
-   <input type="hidden" name="embedsuppress"  value="" />
-   <input type="hidden" name="fontenhance"  value="" />
-   <input type="hidden" name="blackwhite"  value="" />
-   <input type="hidden" name="remember"  value="" />
    <input type="hidden" name="localpath" value="$env{'form.localpath'}" />
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
@@ -410,167 +384,79 @@
     if ($shownewuserlink) {
         $newuserlink = &newuser_link($lt{'newuser'});
     }
-    if ($fullgraph) { $r->print(<<ENDTOP);
-  <!-- The LON-CAPA Header -->
-  <tr>
-
-   <!-- 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>
-  </tr>
-
-  <!-- The gray bar that starts the two table frames -->
-  <tr>
-
-   <!-- Row 2 Column 1 -->
-   <td width=182 height=27 bgcolor="$sidebg">&nbsp;</td>
-
-   <!-- Row 2 Column 2 -->
-   <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>
-
-   <!-- Row 2 Column 3 -->
-   <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>
-
-   <!-- Row 2 Column 4 -->
-   <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>
-  </tr>
-  <tr>
-   
-   <!-- A cell that will hold the 'access', 'about', and 'catalog' links -->
-   <!-- Row 3 Column 1 -->
-   <td valign="top" height="60" align="left" bgcolor="$sidebg">
-    <table cellpadding="0" cellspacing="2" border="0">
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
-     </tr>$coursecatalog
-     <tr>
-      <td colspan="2">&nbsp;</td>
-     </tr>
-    </table>
-   </td>
-   <!-- The shaded space between the two main columns -->
-   <!-- Row 3 Column 2 -->
-   <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
-
-   <!-- The right main column holding the large LON-CAPA logo-->
-   <!-- Rows 3-4 Column 3 -->
-   <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
-    <center>
-     <img src="$logo" alt="" />
-    </center>
-   </td>
-
-   <!-- Row 3 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- The entry form -->
-   <!-- Row 4 Column 1 -->
-   <td align="center" valign="middle" bgcolor="$sidebg">
-ENDTOP
-} else {
-    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
-             .'<h2>'.&mt('Text-based Interface Login').'</h2>'
-             .$announcements);
-}
-    $r->print('<form name="client" onsubmit="return(send())">');
-    unless ($fullgraph) {
-        $r->print(<<ENDACCESSOPTIONS);
-<h3>$lt{'options_headline'}</h3>
-<label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />
-<label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />
-<label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />
-<label><input type="checkbox" name="fontenhance" /> $lt{'sprs_font'}</label><br />
-<label><input type="checkbox" name="blackwhite" /> $lt{'sprs_blackwhite'}</label><br />
-<br />
-<input type="checkbox" name="remember" /> $lt{'remember'}<hr />
-ENDACCESSOPTIONS
-} else {
-    $r->print(<<ENDNOOPT);
-<input type="hidden" name="imagesuppress"  value="" />
-<input type="hidden" name="embedsuppress"  value="" />
-<input type="hidden" name="appletsuppress"  value="" />
-<input type="hidden" name="fontenhance"  value="" />
-<input type="hidden" name="blackwhite"  value="" />
-<input type="hidden" name="remember"  value="" />
-ENDNOOPT
-}
     my $logintitle;
     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 = $lt{'log'};
     } else {
-        $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.
-                      &mt('User Authentication').'" /></td>';
+        $logintitle = '<img src="'.$login.'" alt="'.
+                      &mt('User Authentication').'" />';
     }
-    my $noscript_warning='<td colspan="2" bgcolor="'.$mainbg.'">'
-                        .'<noscript><div class="LC_warning"><font size="-1">'
+    
+     my $noscript_warning='<noscript>'
                         .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
-                        .'</font></div></noscript></td>';
-    $r->print(<<ENDLOGIN);
-     <input type="hidden" name="lextkey" value="$lextkey">
-     <input type="hidden" name="uextkey" value="$uextkey">
-
-     <!-- Start the sub-table for text and input alignment -->
-     <table border=0 cellspacing=0 cellpadding=0>
-      <tr>$logintitle</tr>
-      <tr>$noscript_warning</tr>
-      <tr>
-       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="upass$now">$lt{'pw'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="udom">$lt{'dom'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg">&nbsp;</td>
-       <td bgcolor="$mainbg" valign="bottom" align="center">
-        <br />
-        <input type="submit" value="$lt{'log'}" />
-       </td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
-        $loginhelp
-        $forgotpw
-        $newuserlink
-        <br />
-       </td>
-      </tr>
-     </table>
-     <!-- End sub-table -->
-    </form>
-ENDLOGIN
-    if ($fullgraph) {
-        my $helpdeskscript;
-        my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
+                        .'</noscript>';
+      my $helpdeskscript;
+      my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
                                   $version,$authdomain,\$helpdeskscript);
-	$r->print(<<ENDDOCUMENT);
-   </td>
+                 
+    if ($fullgraph) { 
+    $r->print(<<ENDTOP);
+  <!-- The LON-CAPA Header -->
+<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
+<tr>
+<td align="left" valign="top" bgcolor="$pgbg"> <img src="$img" border=0 alt="The Learning Online Network with CAPA" /> </td>
+</tr>
+</table>
+
+ <div class="LC_loginpage_space">&nbsp;</div>
+    <img src="$logo" alt="" />
+ <div class="LC_loginpage_loginContainer"><fieldset class="LC_loginpage_fieldset">
+<legend class="LC_loginpage_legend">$logintitle</legend>
+<table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
+	<tr>
+		<td width="50%" align="center" valign="top">$domainlogo</td>
+		<td>
+ENDTOP
+		
+$r->print('<form name="client" onsubmit="return(send())">');
 
-   <!-- Row 4 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
+$r->print(<<ENDTOPP)
+			<input type="hidden" name="lextkey" value="$lextkey">
+     			<input type="hidden" name="uextkey" value="$uextkey">
+     			<b><label for="uname">$lt{'un'}</label>:</b><br />
+       			<input type="text" name="uname" size="10" value="$authusername" /><br />
+       			<b><label for="upass$now">$lt{'pw'}</label>:</b><br />
+      			<input type="password" name="upass$now" size="10" /><br />
+      			<b><label for="udom">$lt{'dom'}</label>:</b><br />
+       			<input type="text" name="udom" size="10" value="$authdomain" /><br />
+       			<input type="submit" value="$lt{'log'}" />
+       			</form>	
+		</td>
+		</tr>
+</table>   	
+$noscript_warning
+</fieldset></div>
+  
+<div class="LC_loginpage_loginInfo">
+        $loginhelp<br />
+        $forgotpw<br /><br />
+        $newuserlink<br />
+        $coursecatalog<br /><br />
+        <a href="/adm/about.html"><b>$lt{'about'}</b></a><br />
+        $helpdeskscript
+</div>
+<div class="LC_loginpage_space">&nbsp;</div>
+$announcements
+ENDTOPP
+}
+if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
 
-   <!-- Row 4 Column 3 -->
-<td bgcolor="$mainbg">$announcements</td>
 
-   <!-- Row 4 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- Row 5 Column 1 -->
-   <td bgcolor="$sidebg" valign="middle" align="left">
-     <br />
+   if ($fullgraph) {
+      
+	$r->print(<<ENDDOCUMENT);
+   
+
      <table border=0 cellspacing=0 cellpadding=0>
       <tr>
        <td bgcolor="$sidebg" align="left" valign="top">
@@ -605,36 +491,10 @@
        </td>
       </tr>
      </table>
-     <br />
+     
     $contactblock
-   </td>
-
-   <!-- Row 5 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
 
-   <!-- Row 5 Column 3 -->
-   <td width="100%" valign="bottom" bgcolor="$mainbg">
-$domainlogo
-</td>
-
-   <!-- Row 5 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- Row 6 Column 1 -->
-   <td bgcolor="$sidebg">&nbsp;</td>
-
-   <!-- Row 6 Column 2 -->
-   <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>
-
-   <!-- Row 6 Column 3 -->
-   <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>
-
-   <!-- Row 6 Column 4 -->
-   <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>
-  </tr>
- </table>
+ </div>
 
 <script type="text/javascript">
 // the if prevents the script error if the browser can not handle this
@@ -688,7 +548,7 @@
     my (%lt) = @_;
     my $prompt_for_resetpw = 1; 
     if ($prompt_for_resetpw) {
-        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br />';
+        return '<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a>';
     }
     return;
 }
@@ -697,7 +557,7 @@
     my (%lt) = @_;
     my $login_help = 1;
     if ($login_help) {
-        return '&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a></b>';
+        return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
     }
     return;
 }
@@ -705,10 +565,7 @@
 sub coursecatalog_link {
     my ($linkname) = @_;
     return <<"END";
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/coursecatalog"><b>$linkname</b></a></td>
-     </tr>
+      <a href="/adm/coursecatalog">$linkname</a>
 END
 }
 

--tempelho1227380822--