modules/relate/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / modules / relate

Diff for /modules/relate/lonlogin.pm between versions 1.1 and 1.2

version 1.1, 2012/02/07 14:49:47	version 1.2, 2012/02/10 16:34:07
Line 295 sub handler {	Line 295 sub handler {
'helpdesk' => 'Contact Helpdesk',	'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot your password?',	'forgotpw' => 'Forgot your password?',
'newuser' => 'New User?',	'newuser' => 'New User?',
'learn' => 'Learn Physics includes an online physics course, to which you may receive admission after successfully completing a pre-course test.',	'learn' => 'Learn Physics includes an online mechanics course, to which you may receive admission after successfully completing a pre-course test.',
'click' => 'Click here to sign up',	'click' => 'Click here to sign up',
'plea' => 'Please log-in',	'plea' => 'Please log-in',
'supp' => 'Support from NSF, NIH, Google',	'supp' => 'Support from NSF, NIH, Google',
Line 387 ENDSCRIPT	Line 387 ENDSCRIPT
onload => 'javascript:enableInput();',);	onload => 'javascript:enableInput();',);

my $css_url = "/css/$domain/login.css";	my $css_url = "/css/$domain/login.css";
$js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'">'."\n";	$js .= "\n".'<link type="text/css" rel="stylesheet" href="'.$css_url.'" />'."\n";
$r->print(&Apache::loncommon::start_page($pagetitle,$js,	$r->print(&Apache::loncommon::start_page($pagetitle,$js,
{'redirect' => [$expire,'/adm/roles'],	{'redirect' => [$expire,'/adm/roles'],
'add_entries' => \%add_entries,	'add_entries' => \%add_entries,
Line 396 ENDSCRIPT	Line 396 ENDSCRIPT
# ------------------------------------------------------------ Additional Texts	# ------------------------------------------------------------ Additional Texts
$lt{'newto'} = &mt('New to the [_1]Learn Physics[_2] site?','<i>','</i>');	$lt{'newto'} = &mt('New to the [_1]Learn Physics[_2] site?','<i>','</i>');
$lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source freeware distributed learning content management and assessment system.',	$lt{'runson'} = &mt('Learn Physics runs on [_1]LON-CAPA[_2] - an open source freeware distributed learning content management and assessment system.',
'<a href="http://loncapa.org/">','</a>');	'<a href="http://loncapa.org/" style="text-decoration: underline;">',
	' <img src="/images/login/lclogosm.gif" width="16" height="14" alt="LC" valign="middle" border="0" /></a>');
$lt{'newhere'} = &mt('New to [_1]Learn Physics[_2]:','<i>','</i>');	$lt{'newhere'} = &mt('New to [_1]Learn Physics[_2]:','<i>','</i>');
$lt{'exist'} = &mt('Existing [_1]Learn Physics[_2] user','<i>','</i>');	$lt{'exist'} = &mt('Existing [_1]Learn Physics[_2] user','<i>','</i>');
$lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]',	$lt{'browser'} = &mt('Your browser must allow [_1]cookies[_2]',
'<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff">','</a>');	'<a href="http://loncapa.msu.edu/cookies.html" style="color: #ffffff; text-decoration:underline;">','</a>');

	my ($contactrow,$domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
	$contactrow = <<"END";
	<tr>
	<td colspan="2">
	$contactblock
	</td>
	</tr>
	END
	$domainrow = <<"END";
	<tr>
	<td align="left" valign="top">
	<small><b>$lt{'dom'}: </b></small>
	</td>
	<td align="left" valign="top">
	<small><tt> $domain</tt></small>
	</td>
	</tr>
	END
	$serverrow = <<"END";
	<tr>
	<td align="left" valign="top">
	<small><b>$lt{'serv'}: </b></small>
	</td>
	<td align="left" valign="top">
	<small><tt> $lonhost ($role)</tt></small>
	</td>
	</tr>
	END
	if ($loadlim) {
	$loadrow = <<"END";
	<tr>
	<td align="left" valign="top">
	<small><b>$lt{'load'}: </b></small>
	</td>
	<td align="left" valign="top">
	<small><tt> $loadpercent $lt{'perc'}</tt></small>
	</td>
	</tr>
	END
	}
	if ($uloadlim) {
	$userloadrow = <<"END";
	<tr>
	<td align="left" valign="top">
	<small><b>$lt{'userload'}: </b></small>
	</td>
	<td align="left" valign="top">
	<small><tt> $userloadpercent $lt{'perc'}</tt></small>
	</td>
	</tr>
	END
	}
	if (($version ne '') && ($version ne '<!-- VERSION -->')) {
	$versionrow = <<"END";
	<tr>
	<td colspan="2" align="left">
	<small>$version</small>
	</td>
	</tr>
	END
	}

# -------------------------------------------- Static cid for prerequisite test	# -------------------------------------------- Static cid for prerequisite test
$prereqcid = 'relate_9615072b469884921relatel1';	my $prereqcid = 'relate_9615072b469884921relatel1';

# ---------------------------------------------------- Warning if no Javascript	# ---------------------------------------------------- Warning if no Javascript
my $noscript_warning = '<noscript><span class="LC_warning">'.	my $noscript_warning = '<noscript><span class="LC_warning">'.
'<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.'	'<b>'.$lt{'note'}.'</b>'.$lt{'jscr'}.
'</span></noscript>';	'</span></noscript>';

# ---------------------------------------------------- Serve out DES JavaScript	# ---------------------------------------------------- Serve out DES JavaScript
Line 444 ENDSCRIPT	Line 507 ENDSCRIPT
<tr>	<tr>
<td width="10"> </td>	<td width="10"> </td>
<td valign="top" class="bodyred" width="430" align="left"><br />	<td valign="top" class="bodyred" width="430" align="left"><br />
<span style="font-size: 18px; line-height: 22px; ">$lt{'newt'}</span>	<span style="font-size: 18px; line-height: 22px; ">$lt{'newto'}</span>
<br />	<br />
<span class="bodyred">$lt{'learn'}<br /><br />$lt{'runson'}	<span class="bodyred">$lt{'learn'}<br /><br />$lt{'runson'}
<br /><br />	<br /><br />
Line 457 ENDSCRIPT	Line 520 ENDSCRIPT
</tr>	</tr>
<tr>	<tr>
<td> </td>	<td> </td>
<td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b>: <a href="javascript:send('newaccount')" style="color: #ffffff">$lt{'click'}</a></span></td>	<td align="center" valign="middle"><span style="white-space: nowrap;"><b>$lt{'newhere'}</b> <a href="javascript:send('newaccount')" style="color: #ffffff; text-decoration:underline;">$lt{'click'}</a></span></td>
<td> </td>	<td> </td>
</tr>	</tr>
<tr>	<tr>
Line 478 ENDSCRIPT	Line 541 ENDSCRIPT
<table class="LC_loginbox_right">	<table class="LC_loginbox_right">
<tr>	<tr>
<td colspan="3" height="23" class="LC_loginbox_strip"> </td>	<td colspan="3" height="23" class="LC_loginbox_strip"> </td>
i </tr>	</tr>
<tr>	<tr>
<td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>	<td align="left" valign="top" width="11" height="11"><img src="/images/login/tlc_11_993333_ffffff.gif" width="10" height="10" border="0" alt=""></td>
<td> </td>	<td> </td>
Line 522 i </tr>	Line 585 i </tr>
<span style="font-size: smaller;">$lt{'browser'}</span><br />	<span style="font-size: smaller;">$lt{'browser'}</span><br />
<hr class="login" />	<hr class="login" />
<br />	<br />
<a href="/adm/resetpw" style="color: #ffffff">$lt{forgotpw'}</a><br>	<a href="/adm/resetpw" style="color: #ffffff; text-decoration:underline;">$lt{'forgotpw'}</a><br>
<br />	<br />
</td>	</td>
</tr>	</tr>
Line 536 i </tr>	Line 599 i </tr>

<td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>	<td align="right" valign="bottom" width="11" height="11"><img src="/images/login/br_11_993333_ffffff.gif" width="11" height="11" border="0" alt=""></td>
</tr>	</tr>
<tr>
<td colspan="3" height="10" class="LC_loginbox_strip"> $contactblock</td>
</tr>
</table>	</table>
</td>	</td>
<td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>	<td align="right" valign="top" width="11"><img src="/images/login/tr_11_ffffff_e2e2e2.gif" width="11" height="11" border="0" alt=""></td>
</tr>	</tr>
<tr>	<tr>
<td colspan="4">	<td colspan="4">
<div align="right">	<br />
<img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />	<hr style="clear:both;" />
</div>	</td>
	</tr>
	<tr>
	<td width="10"> </td>
	<td colspan="3">
	<div style="float: left;">
	<table border="0" cellspacing="0" cellpadding="0">
	$contactrow
	$domainrow
	$serverrow
	$loadrow
	$userloadrow
	$versionrow
	</table>
	</div>
	<div style="float: right;">
	<img src="/images/login/sponsors.png" alt="$lt{'supp'}" align="right" />
	<br style="clear:both;" />
	</div>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
Line 581 if ( document.client.uname ) { document.	Line 659 if ( document.client.uname ) { document.
// ]]>	// ]]>
</script>	</script>

	<script type="text/javascript">
	// <![CDATA[
	// the if prevents the script error if the browser can not handle this
	if ( document.client.uname ) { document.client.uname.focus(); }
	// ]]>
	</script>

ENDLOGIN	ENDLOGIN

# -------------------------------------------------------- Standard page ending	# -------------------------------------------------------- Standard page ending
Line 659 sub contactdisplay {	Line 744 sub contactdisplay {
'<tt>'.$servadm.'</tt><br />';	'<tt>'.$servadm.'</tt><br />';
}	}
if ($showhelpdesk) {	if ($showhelpdesk) {
$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';	$contactblock .= '<a href="javascript:helpdesk()" style="text-decoration:underline;">'.$lt->{'helpdesk'}.'</a><br />';
my $thisurl = &escape('/adm/login');	my $thisurl = &escape('/adm/login');
$$helpdeskscript = <<"ENDSCRIPT";	$$helpdeskscript = <<"ENDSCRIPT";
<script type="text/javascript">	<script type="text/javascript">

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

Removed from v.1.1
changed lines
	Added in v.1.2