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.419 and 1.430

version 1.419, 2006/07/04 21:31:02	version 1.430, 2006/07/18 21:55:24
Line 706 sub helpLatexCheatsheet {	Line 706 sub helpLatexCheatsheet {
.'</td></tr></table>';	.'</td></tr></table>';
}	}

	sub general_help {
	my $helptopic='Student_Intro';
	if ($env{'request.role'}=~/^(ca\|au)/) {
	$helptopic='Authoring_Intro';
	} elsif ($env{'request.role'}=~/^cc/) {
	$helptopic='Course_Coordination_Intro';
	}
	return $helptopic;
	}

	sub update_help_link {
	my ($topic,$component_help,$faq,$bug,$stayOnPage) = @_;
	my $origurl = $ENV{'REQUEST_URI'};
	$origurl=~s\|^/~\|/priv/\|;
	my $timestamp = time;
	foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
	$$datum = &escape($$datum);
	}

	my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
	my $output .= <<"ENDOUTPUT";
	<script type="text/javascript">
	// <!-- BEGIN LON-CAPA Internal
	banner_link = '$banner_link';
	// END LON-CAPA Internal -->
	</script>
	ENDOUTPUT
	return $output;
	}

	# now just updates the help link and generates a blue icon
sub help_open_menu {	sub help_open_menu {
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) = @_;	my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
	= @_;

	$stayOnPage = 0 if (not defined $stayOnPage);
	if ($env{'browser.interface'} eq 'textual' \|\|
	$env{'environment.remote'} eq 'off' ) {
	$stayOnPage=1;
	}
	my $output;
	if ($component_help) {
	if (!$text) {
	$output=&help_open_topic($component_help,undef,$stayOnPage,
	$width,$height);
	} else {
	my $help_text;
	$help_text=&unescape($topic);
	$output='<table><tr><td>'.
	&help_open_topic($component_help,$help_text,$stayOnPage,
	$width,$height).'</td></tr></table>';
	}
	}
	my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
	return $output.$banner_link;
	}

	sub top_nav_help {
	my ($text) = @_;

	my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height);

$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);	$stayOnPage = 0 if (not defined $stayOnPage);
if ($env{'browser.interface'} eq 'textual' \|\|	if ($env{'browser.interface'} eq 'textual' \|\|
Line 718 sub help_open_menu {	Line 778 sub help_open_menu {
$height = 600 if (not defined $height);	$height = 600 if (not defined $height);
my $link='';	my $link='';
my $title = &mt('Get help');	my $title = &mt('Get help');
my $origurl = $ENV{'REQUEST_URI'};	if ($stayOnPage) {
$origurl=~s\|^/~\|/priv/\|;	$link = "javascript:helpMenu('display')";
my $timestamp = time;
foreach my $datum (\$topic,\$component_help,\$faq,\$bug,\$origurl) {
$$datum = &escape($$datum);
}
if (!$stayOnPage) {
$link = "javascript:helpMenu('open')";
} else {	} else {
$link = "javascript:helpMenu('display')";	$link = "javascript:helpMenu('open')";
}	}
my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";	my $helptopic=&general_help();
my $details_link = "/adm/helpmenu?page=body&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";	my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
	my $details_link = '/adm/help/'.$helptopic.'.hlp';
my $template;	my $template;
if ($text ne "") {
$template .=
"<table bgcolor='#CC3300' cellspacing='1' cellpadding='1' border='0'><tr>".
"<td bgcolor='#CC6600'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
}
my $nothing=&Apache::lonhtmlcommon::javascript_nothing();	my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");	my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
my $start_page =	my $start_page =
Line 754 sub help_open_menu {	Line 804 sub help_open_menu {
<script type="text/javascript">	<script type="text/javascript">
// <!-- BEGIN LON-CAPA Internal	// <!-- BEGIN LON-CAPA Internal
// <![CDATA[	// <![CDATA[
	var banner_link = '';
function helpMenu(target) {	function helpMenu(target) {
var caller = this;	var caller = this;
if (target == 'open') {	if (target == 'open') {
Line 773 function helpMenu(target) {	Line 824 function helpMenu(target) {
return;	return;
}	}
function writeHelp(caller) {	function writeHelp(caller) {
caller.document.writeln('$start_page<frame name="bannerframe" src="$banner_link" /><frame name="bodyframe" src="$details_link" /> $end_page')	caller.document.writeln('$start_page<frame name="bannerframe" src="'+banner_link+'" /><frame name="bodyframe" src="$details_link" /> $end_page')
caller.document.close()	caller.document.close()
caller.focus()	caller.focus()
}	}
// ]]>	// ]]>
// END LON-CAPA Internal -->	// END LON-CAPA Internal -->
</script>	</script>
<a href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help Menu)" /></a>	$banner_link
	<a href="$link" title="$title">$text<img src="$helpicon" border="0" alt="(Help Menu)" /></a>
ENDTEMPLATE	ENDTEMPLATE
if ($component_help) {
if (!$text) {
$template=&help_open_topic($component_help,undef,$stayOnPage,
$width,$height).' '.$template;
} else {
my $help_text;
$help_text=&unescape($topic);
$template='<table><tr><td>'.
&help_open_topic($component_help,$help_text,$stayOnPage,
$width,$height).'</td><td>'.$template.
'</td></tr></table>';
}
}
if ($text ne '') { $template.='</td></tr></table>' };
return $template;	return $template;
}	}

Line 1918 sub get_related_words {	Line 1956 sub get_related_words {
return ();	return ();
}	}
my @Words=();	my @Words=();
	my $count=0;
if (exists($thesaurus_db{$keyword})) {	if (exists($thesaurus_db{$keyword})) {
# The first element is the number of times	# The first element is the number of times
# the word appears. We do not need it now.	# the word appears. We do not need it now.
(undef,@Words) = (split(/:/,$thesaurus_db{$keyword}));	my (undef,@RelatedWords) = (split(/:/,$thesaurus_db{$keyword}));
for (my $i=0;$i<=$#Words;$i++) {	my (undef,$mostfrequentcount)=split(/\,/,$RelatedWords[0]);
($Words[$i],undef)= split(/\,/,$Words[$i]);	my $threshold=$mostfrequentcount/10;
	foreach my $possibleword (@RelatedWords) {
	my ($word,$wordcount)=split(/\,/,$possibleword);
	if ($wordcount>$threshold) {
	push(@Words,$word);
	$count++;
	if ($count>10) { last; }
	}
}	}
}	}
untie %thesaurus_db;	untie %thesaurus_db;
Line 3107 sub standard_css {	Line 3153 sub standard_css {
my $data_table_head = $tabbg;	my $data_table_head = $tabbg;
my $data_table_light = '#EEEEEE';	my $data_table_light = '#EEEEEE';
my $data_table_dark = '#DDD';	my $data_table_dark = '#DDD';
	my $data_table_darker = '#CCC';
my $data_table_highlight = '#FFFF00';	my $data_table_highlight = '#FFFF00';
my $mail_new = '#FFBB77';	my $mail_new = '#FFBB77';
my $mail_new_hover = '#DD9955';	my $mail_new_hover = '#DD9955';
Line 3124 sub standard_css {	Line 3171 sub standard_css {
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 { border-collapse: collapse; }	table.thinborder { border-collapse: collapse; }
table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}	table.thinborder tr th { border-style: solid; border-width: 1px; background: $tabbg;}
	table.thinborder tr td { border-style: solid; border-width: 1px}

form, .inline { display: inline; }	form, .inline { display: inline; }
.center { text-align: center; }	.center { text-align: center; }
.LC_filename {font-family: $mono;}	.LC_filename {font-family: $mono;}
Line 3175 table#LC_title_bar td {	Line 3224 table#LC_title_bar td {
table#LC_title_bar td.LC_title_bar_who {	table#LC_title_bar td.LC_title_bar_who {
background: $tabbg;	background: $tabbg;
color: $font;	color: $font;
font: medium $sans;	font: small $sans;
text-align: right;	text-align: right;
}	}
span.LC_title_bar_title {	span.LC_title_bar_title {
Line 3264 td.LC_menubuttons_img {	Line 3313 td.LC_menubuttons_img {
table.LC_data_table, table.LC_mail_list {	table.LC_data_table, table.LC_mail_list {
border: 1px solid #000000;	border: 1px solid #000000;
border-collapse: separate;	border-collapse: separate;
	border-spacing: 1px;
	}
	.LC_data_table_dense {
	font-size: small;
}	}
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 {
font-weight: bold;	font-weight: bold;
background-color: $data_table_head;	background-color: $data_table_head;
	font-size: smaller;
}	}
table.LC_data_table tr td {	table.LC_data_table tr td {
background-color: $data_table_light;	background-color: $data_table_light;
	padding: 2px;
}	}
table.LC_data_table tr.LC_even_row td {	table.LC_data_table tr.LC_even_row td {
background-color: $data_table_dark;	background-color: $data_table_dark;
}	}
table.LC_data_table tr.LC_empty td {	table.LC_data_table tr.LC_data_table_highlight td {
	background-color: $data_table_darker;
	}
	table.LC_data_table tr.LC_empty_row td {
background-color: #FFFFFF;	background-color: #FFFFFF;
	font-weight: bold;
	font-style: italic;
	text-align: center;
	padding: 8px;
}	}

table.LC_calendar {	table.LC_calendar {
Line 3474 table#LC_helpmenu_links a:hover {	Line 3536 table#LC_helpmenu_links a:hover {
background: #CCCCFF;	background: #CCCCFF;
}	}

	table.LC_pick_box {
	width: 100%;
	border-collapse: separate;
	background: white;
	border: 1px solid black;
	border-spacing: 1px;
	}
	table.LC_pick_box td.LC_pick_box_title {
	background: $tabbg;
	font-weight: bold;
	text-align: right;
	width: 184px;
	padding: 8px;
	}
	table.LC_pick_box td.LC_pick_box_separator {
	padding: 0px;
	height: 1px;
	background: black;
	}
	table.LC_pick_box td.LC_pick_box_submit {
	text-align: right;
	}

	table.LC_group_priv_box {
	background: white;
	border: 1px solid black;
	border-spacing: 1px;
	}
	table.LC_group_priv_box td.LC_pick_box_title {
	background: $tabbg;
	font-weight: bold;
	text-align: right;
	width: 184px;
	}
	table.LC_group_priv_box td.LC_groups_fixed {
	background: $data_table_light;
	text-align: center;
	}
	table.LC_group_priv_box td.LC_groups_optional {
	background: $data_table_dark;
	text-align: center;
	}
	table.LC_group_priv_box td.LC_groups_functionality {
	background: $data_table_darker;
	text-align: center;
	font-weight: bold;
	}
	table.LC_group_priv td {
	text-align: left;
	padding: 0px;
	}

	table.LC_notify_front_page {
	background: white;
	border: 1px solid black;
	padding: 8px;
	}
	table.LC_notify_front_page td {
	padding: 8px;
	}
	.LC_navbuttons {
	margin: 2ex 0ex 2ex 0ex;
	}
	.LC_topic_bar {
	font-family: $sans;
	font-weight: bold;
	width: 100%;
	background: $tabbg;
	vertical-align: middle;
	margin: 2ex 0ex 2ex 0ex;
	}
	.LC_topic_bar span {
	vertical-align: middle;
	}
	.LC_topic_bar img {
	vertical-align: bottom;
	}
	table.LC_course_group_status {
	margin: 20px;
	}
	table.LC_status_selector td {
	vertical-align: top;
	text-align: center;
	padding: 4px;
	}
	table.LC_descriptive_input td.LC_description {
	vertical-align: top;
	text-align: right;
	font-weight: bold;
	}

END	END
}	}

Line 3844 sub simple_error_page {	Line 3997 sub simple_error_page {
{	{
my $row_count;	my $row_count;
sub start_data_table {	sub start_data_table {
	my ($add_class) = @_;
	my $css_class = (join(' ','LC_data_table',$add_class));
undef($row_count);	undef($row_count);
return '<table class="LC_data_table">'."\n";	return '<table class="'.$css_class.'">'."\n";
}	}

sub end_data_table {	sub end_data_table {
Line 3854 sub simple_error_page {	Line 4009 sub simple_error_page {
}	}

sub start_data_table_row {	sub start_data_table_row {
	my ($add_class) = @_;
$row_count++;	$row_count++;
return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>'."\n";;	my $css_class = ($row_count % 2)?'':'LC_even_row';
	$css_class = (join(' ',$css_class,$add_class));
	return '<tr class="'.$css_class.'">'."\n";;
}	}

sub end_data_table_row {	sub end_data_table_row {
return '</tr>'."\n";;	return '</tr>'."\n";;
}	}

	sub start_data_table_empty_row {
	$row_count++;
	return '<tr class="LC_empty_row" >'."\n";;
	}

	sub end_data_table_empty_row {
	return '</tr>'."\n";;
	}

sub start_data_table_header_row {	sub start_data_table_header_row {
return '<tr class="LC_header_row">'."\n";;	return '<tr class="LC_header_row">'."\n";;
}	}
Line 4113 sub get_course_users {	Line 4280 sub get_course_users {
$section = 'none';	$section = 'none';
}	}
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {	if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
if (grep/^all$/,@{$sections}) {	if (grep(/^all$/,@{$sections})) {
$secmatch = 1;	$secmatch = 1;
} elsif ($$classlist{$student}[$idx{section}] eq '') {	} elsif ($$classlist{$student}[$idx{section}] eq '') {
if (grep/^none$/,@{$sections}) {	if (grep(/^none$/,@{$sections})) {
$secmatch = 1;	$secmatch = 1;
}	}
} else {	} else {
Line 4128 sub get_course_users {	Line 4295 sub get_course_users {
next;	next;
}	}
}	}
push (@{$seclists{$student}},$section);	push(@{$seclists{$student}},$section);
if (defined($$types{'active'})) {	if (defined($$types{'active'})) {
if ($$classlist{$student}[$idx{status}] eq 'Active') {	if ($$classlist{$student}[$idx{status}] eq 'Active') {
push(@{$$users{st}{$student}},'active');	push(@{$$users{st}{$student}},'active');
Line 4162 sub get_course_users {	Line 4329 sub get_course_users {
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {	if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) {
my ($uname,$udom) = split(/:/,$user);	my ($uname,$udom) = split(/:/,$user);
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {	if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) {
if (grep/^all$/,@{$sections}) {	if (grep(/^all$/,@{$sections})) {
$secmatch = 1;	$secmatch = 1;
} elsif ($usec eq '') {	} elsif ($usec eq '') {
if (grep/^none$/,@{$sections}) {	if (grep(/^none$/,@{$sections})) {
$secmatch = 1;	$secmatch = 1;
}	}
} else {	} else {
Line 4185 sub get_course_users {	Line 4352 sub get_course_users {
$usec);	$usec);
foreach my $type (keys(%{$types})) {	foreach my $type (keys(%{$types})) {
if ($status eq $type) {	if ($status eq $type) {
if (!grep/^\Q$type\E$/,@{$$users{$role}{$user}}) {	if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) {
push(@{$$users{$role}{$user}},$type);	push(@{$$users{$role}{$user}},$type);
}	}
$match = 1;	$match = 1;
Line 4195 sub get_course_users {	Line 4362 sub get_course_users {
if (!exists($$userdata{$uname.':'.$udom})) {	if (!exists($$userdata{$uname.':'.$udom})) {
&get_user_info($udom,$uname,\%idx,$userdata);	&get_user_info($udom,$uname,\%idx,$userdata);
}	}
if (!grep/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}}) {	if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) {
push(@{$seclists{$uname.':'.$udom}},$usec);	push(@{$seclists{$uname.':'.$udom}},$usec);
}	}
}	}
Line 4211 sub get_course_users {	Line 4378 sub get_course_users {
if (defined($userdata) &&	if (defined($userdata) &&
!exists($$userdata{$owner.':'.$cdom})) {	!exists($$userdata{$owner.':'.$cdom})) {
&get_user_info($cdom,$owner,\%idx,$userdata);	&get_user_info($cdom,$owner,\%idx,$userdata);
if (!grep/^none$/,@{$seclists{$owner.':'.$cdom}}) {	if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) {
push(@{$seclists{$owner.':'.$cdom}},'none');	push(@{$seclists{$owner.':'.$cdom}},'none');
}	}
}	}

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

Removed from v.1.419
changed lines
	Added in v.1.430