loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.518 and 1.535

version 1.518, 2007/04/04 00:10:01	version 1.535, 2007/05/15 20:05:13
Line 240 Inputs: formname, elementname	Line 240 Inputs: formname, elementname

formname and elementname specify the name of the html form and the name	formname and elementname specify the name of the html form and the name
of the element the selection from the search results will be placed in.	of the element the selection from the search results will be placed in.
	=back
=cut	=cut

sub browser_and_searcher_javascript {	sub browser_and_searcher_javascript {
Line 1272 sub domain_select {	Line 1272 sub domain_select {

=pod	=pod

	=head1 Routines for form select boxes

	=over 4

	=cut

=item * multiple_select_form($name,$value,$size,$hash,$order)	=item * multiple_select_form($name,$value,$size,$hash,$order)

Returns a string containing a <select> element int multiple mode	Returns a string containing a <select> element int multiple mode
Line 1461 sub home_server_option_list {	Line 1467 sub home_server_option_list {

=pod	=pod

=back	=back

=cut	=cut

Line 2908 sub blockcheck {	Line 2914 sub blockcheck {
}	}
my $no_ownblock = 0;	my $no_ownblock = 0;
my $no_userblock = 0;	my $no_userblock = 0;
if ($otheruser) {	if ($otheruser && $activity ne 'com') {
# Check if current user has 'evb' priv for this	# Check if current user has 'evb' priv for this
if (defined($own_courses{$course})) {	if (defined($own_courses{$course})) {
foreach my $sec (keys(%{$own_courses{$course}})) {	foreach my $sec (keys(%{$own_courses{$course}})) {
Line 3161 Returns: Determines which domain should	Line 3167 Returns: Determines which domain should
###############################################	###############################################
sub determinedomain {	sub determinedomain {
my $domain=shift;	my $domain=shift;
if (! $domain) {	if (! $domain) {
# Determine domain if we have not been given one	# Determine domain if we have not been given one
$domain = $Apache::lonnet::perlvar{'lonDefDomain'};	$domain = $Apache::lonnet::perlvar{'lonDefDomain'};
if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }	if ($env{'user.domain'}) { $domain=$env{'user.domain'}; }
Line 3218 sub get_domainconf {	Line 3224 sub get_domainconf {
}	}
}	}
if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {	if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
$designhash{$udom.'.login.domlogo'} =	$designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
&lonhttpdurl("/adm/lonDomLogos/$udom.gif");
}	}
}	}
&Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,	&Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
Line 3244 sub domainlogo {	Line 3249 sub domainlogo {
my %designhash = &get_domainconf($domain);	my %designhash = &get_domainconf($domain);
# See if there is a logo	# See if there is a logo
if ($designhash{$domain.'.login.domlogo'} ne '') {	if ($designhash{$domain.'.login.domlogo'} ne '') {
return '<img src="'.$designhash{$domain.'.login.domlogo'}.	my $imgsrc = $designhash{$domain.'.login.domlogo'};
'" alt="'.$domain.'" />';	if ($imgsrc =~ /^\/(adm\|res)/) {
	$imgsrc = &lonhttpdurl($imgsrc);
	}
	return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) {	} elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
return &Apache::lonnet::domain($domain,'description');	return &Apache::lonnet::domain($domain,'description');
} else {	} else {
Line 3284 sub designparm {	Line 3292 sub designparm {
}	}
$domain=&determinedomain($domain);	$domain=&determinedomain($domain);
my %domdesign = &get_domainconf($domain);	my %domdesign = &get_domainconf($domain);
	my $output;
if ($domdesign{$domain.'.'.$which} ne '') {	if ($domdesign{$domain.'.'.$which} ne '') {
return $domdesign{$domain.'.'.$which};	$output = $domdesign{$domain.'.'.$which};
} else {	} else {
return $defaultdesign{$which};	$output = $defaultdesign{$which};
	}
	if (($which =~ /^(student\|coordinator\|author\|admin)\.img$/) \|\|
	($which =~ /login\.(img\|logo\|domlogo)/)) {
	if ($output =~ /^\/(adm\|res)\//) {
	$output = &lonhttpdurl($output);
	}
}	}
	return $output;
}	}

###############################################	###############################################
Line 3397 sub bodytag {	Line 3413 sub bodytag {
my $bodytag = "<body $extra_body_attr>".	my $bodytag = "<body $extra_body_attr>".
&Apache::lontexconvert::init_math_support();	&Apache::lontexconvert::init_math_support();

if ($bodyonly	if ($bodyonly) {
\|\| ($env{'request.state'} eq 'construct'
&& $env{'environment.remote'} ne 'off' )) {
return $bodytag;	return $bodytag;
} elsif ($env{'browser.interface'} eq 'textual') {	} elsif ($env{'browser.interface'} eq 'textual') {
# Accessibility	# Accessibility
Line 3676 sub standard_css {	Line 3690 sub standard_css {
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'	my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
: '0px 3px 0px 4px';	: '0px 3px 0px 4px';


return <<END;	return <<END;
h1, h2, h3, th { font-family: $sans }	h1, h2, h3, th { font-family: $sans }
a:focus { color: red; background: yellow }	a:focus { color: red; background: yellow }
table.thinborder,	table.thinborder,
table.LC_optres_prior {
border-collapse: collapse;
}
table.thinborder tr th {	table.thinborder tr th {
border-style: solid;	border-style: solid;
border-width: 1px;	border-width: 1px;
background: $tabbg;	background: $tabbg;
}	}
table.thinborder tr td,	table.thinborder tr td {
table.LC_optres_prior tr td {
border-style: solid;	border-style: solid;
border-width: 1px	border-width: 1px
}	}
Line 3705 form, .inline { display: inline; }	Line 3717 form, .inline { display: inline; }
.LC_diff_removed {	.LC_diff_removed {
color: red;	color: red;
}	}

	.LC_info,
.LC_success,	.LC_success,
.LC_diff_added {	.LC_diff_added {
color: green;	color: green;
Line 3713 form, .inline { display: inline; }	Line 3727 form, .inline { display: inline; }
border: 0px;	border: 0px;
}	}

	.LC_internal_info {
	color: #999;
	}

table.LC_pastsubmission {	table.LC_pastsubmission {
border: 1px solid black;	border: 1px solid black;
margin: 2px;	margin: 2px;
Line 3774 table#LC_title_bar td.LC_title_bar_role_	Line 3792 table#LC_title_bar td.LC_title_bar_role_
}	}

table#LC_menubuttons_mainmenu {	table#LC_menubuttons_mainmenu {
background: $pgbg;	width: 100%;
border: 0px;	border: 0px;
border-spacing: 1px;	border-spacing: 1px;
padding: 0px 1px;	padding: 0px 1px;
Line 3829 td.LC_table_cell_checkbox {	Line 3847 td.LC_table_cell_checkbox {
text-align: center;	text-align: center;
}	}

	table#LC_mainmenu td.LC_mainmenu_column {
	vertical-align: top;
	}

.LC_menubuttons_inline_text {	.LC_menubuttons_inline_text {
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
font-size: smaller;	font-size: smaller;
}	}

	.LC_menubuttons_link {
	text-decoration: none;
	}

	.LC_menubuttons_category {
	color: $font;
	background: $pgbg;
	font-family: $sans;
	font-size: larger;
	font-weight: bold;
	}

td.LC_menubuttons_text {	td.LC_menubuttons_text {
	width: 90%;
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
}	}

td.LC_menubuttons_img {	td.LC_menubuttons_img {
background: $tabbg;
}	}

.LC_current_location {	.LC_current_location {
font-family: $sans;	font-family: $sans;
background: $tabbg;	background: $tabbg;
Line 3851 td.LC_menubuttons_img {	Line 3887 td.LC_menubuttons_img {
font-weight: bold;	font-weight: bold;
}	}

	.LC_rolesmenu_is {
	font-family: $sans;
	}

	.LC_rolesmenu_selected {
	font-family: $sans;
	}

	.LC_rolesmenu_future {
	font-family: $sans;
	}


	.LC_rolesmenu_will {
	font-family: $sans;
	}

	.LC_rolesmenu_will_not {
	font-family: $sans;
	}

	.LC_rolesmenu_expired {
	font-family: $sans;
	}

	.LC_rolesinfo {
	font-family: $sans;
	}

	.LC_dropadd_labeltext {
	font-family: $sans;
	text-align: right;
	}

	.LC_preferences_labeltext {
	font-family: $sans;
	text-align: right;
	}

table.LC_aboutme_port {	table.LC_aboutme_port {
border: 0px;	border: 0px;
border-collapse: collapse;	border-collapse: collapse;
Line 3876 table.LC_nested {	Line 3951 table.LC_nested {
border-spacing: 0px;	border-spacing: 0px;
width: 100%;	width: 100%;
}	}
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {	table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
	table.LC_prior_tries tr th {
font-weight: bold;	font-weight: bold;
background-color: $data_table_head;	background-color: $data_table_head;
font-size: smaller;	font-size: smaller;
Line 4254 span.LC_feedback_link {	Line 4330 span.LC_feedback_link {
}	}

table.LC_prior_tries {	table.LC_prior_tries {
border-width: 1px;	border: 1px solid #000000;
border-style: solid;	border-collapse: separate;
border-color: gray;	border-spacing: 1px;
border-collapse: collapse;
}	}
table.LC_prior_tries th,
table.LC_prior_tries td {	table.LC_prior_tries td {
border-width: 1px;	padding: 2px;
border-style: solid;	}
border-color: gray;
padding: 3px;	.LC_answer_correct {
}	background: #AAFFAA;
table.LC_prior_tries tr.LC_correct {	color: black;
font-weight: bold;	}
background: #aaffaa;	.LC_answer_charged_try {
}	background: #FFAAAA ! important;
span.LC_prior_numerical {	color: black;
font-family: monospace;	}
white-space: pre;	.LC_answer_not_charged_try,
	.LC_answer_no_grade,
	.LC_answer_late {
	background: #FFFFAA;
	color: black;
	}
	.LC_answer_previous {
	background: #AAAAFF;
	color: black;
	}
	.LC_answer_no_message {
	background: #FFFFFF;
	color: black;
	}
	.LC_answer_unknown {
	background: orange;
	color: black;
	}


	span.LC_prior_numerical,
	span.LC_prior_string,
	span.LC_prior_custom,
	span.LC_prior_reaction,
	span.LC_prior_math {
	font-family: monospace;
	white-space: pre;
	}

	span.LC_prior_string {
	font-family: monospace;
	white-space: pre;
	}

	table.LC_prior_option {
	width: 100%;
	border-collapse: collapse;
	}
	table.LC_prior_rank, table.LC_prior_match {
	border-collapse: collapse;
	}
	table.LC_prior_option tr td,
	table.LC_prior_rank tr td,
	table.LC_prior_match tr td {
	border: 1px solid #000000;
	}

	span.LC_nobreak {
	white-space: nowrap;
}	}

END	END

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

Removed from v.1.518
changed lines
	Added in v.1.535