loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

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

version 1.106.2.1, 2008/12/10 17:45:29	version 1.106.4.1, 2009/05/18 12:59:47
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 283 sub handler {	Line 283 sub handler {
my $now=time;	my $now=time;
my $js = (<<ENDSCRIPT);	my $js = (<<ENDSCRIPT);

<script language="JavaScript">	<script type="text/javascript">
function send()	function send()
{	{
this.document.server.elements.uname.value	this.document.server.elements.uname.value
Line 354 my %lt=&Apache::lonlocal::texthash(	Line 354 my %lt=&Apache::lonlocal::texthash(
'un' => 'Username',	'un' => 'Username',
'pw' => 'Password',	'pw' => 'Password',
'dom' => 'Domain',	'dom' => 'Domain',
'perc' => 'percent',
'load' => 'Server Load',	'load' => 'Server Load',
'userload' => 'User Load',	'userload' => 'User Load',
'about' => 'About LON-CAPA',	'about' => 'About LON-CAPA',
Line 387 my %lt=&Apache::lonlocal::texthash(	Line 386 my %lt=&Apache::lonlocal::texthash(

if ($fullgraph) {	if ($fullgraph) {
$r->print(	$r->print(
'<table width="100%" cellpadding=0 cellspacing=0 border=0>');	'<table width="100%" cellpadding="0" cellspacing="0" border="0">');
}	}

$r->print(<<ENDSERVERFORM);	$r->print(<<ENDSERVERFORM);
Line 427 ENDSERVERFORM	Line 426 ENDSERVERFORM
<td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg">	<td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg">
HEADER	HEADER
if ($showbanner) {	if ($showbanner) {
$r->print(<<ENDBANNER);	$r->print(<<ENDBANNER);
<img src="$img" border=0 alt="The Learning Online Network with CAPA" />	<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
ENDBANNER	ENDBANNER
}	}
$r->print(<<ENDSTART);	$r->print(<<ENDSTART);
Line 535 ENDNOOPT	Line 534 ENDNOOPT
.&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.')
.'</font></div></noscript></td>';	.'</font></div></noscript></td>';
$r->print(<<ENDLOGIN);	$r->print(<<ENDLOGIN);
<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" />

<!-- Start the sub-table for text and input alignment -->	<!-- Start the sub-table for text and input alignment -->
<table border=0 cellspacing=0 cellpadding=0>	<table border="0" cellspacing="0" cellpadding="0">
<tr>$logintitle</tr>	<tr>$logintitle</tr>
<tr>$noscript_warning</tr>	<tr>$noscript_warning</tr>
<tr>	<tr>
Line 594 ENDLOGIN	Line 593 ENDLOGIN
<!-- Row 5 Column 1 -->	<!-- Row 5 Column 1 -->
<td bgcolor="$sidebg" valign="middle" align="left">	<td bgcolor="$sidebg" valign="middle" align="left">
<br />	<br />
<table border=0 cellspacing=0 cellpadding=0>	<table border="0" cellspacing="0" cellpadding="0">
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   $lt{'dom'}: </b></small>	<small><b>   $lt{'dom'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="middle">
<small><tt> $domain</tt></small>	<small><tt> $domain</tt></small>
</td>	</td>
</tr>	</tr>
Line 607 ENDLOGIN	Line 606 ENDLOGIN
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   $lt{'serv'}: </b></small>	<small><b>   $lt{'serv'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="middle">
<small><tt> $lonhost ($role)</tt></small>	<small><tt> $lonhost ($role)</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
<small><b>   $lt{'load'}: </b></small>	<small><b>   $lt{'load'}: </b></small></span>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="middle">
<small><tt> $loadpercent $lt{'perc'}</tt></small>	<small><tt> $loadpercent%</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top"><span class="LC_nobreak">
<small><b>   $lt{'userload'}: </b></small>	<small><b>   $lt{'userload'}: </b></small></span>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="middle">
<small><tt> $userloadpercent $lt{'perc'}</tt></small>	<small><tt> $userloadpercent%</tt></small>
</td>	</td>
</tr>	</tr>
</table>	</table>

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

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