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.948.2.29 and 1.1010

version 1.948.2.29, 2011/05/28 00:02:38	version 1.1010, 2011/06/06 21:25:59
Line 409 sub studentbrowser_javascript {	Line 409 sub studentbrowser_javascript {
<script type="text/javascript" language="Javascript">	<script type="text/javascript" language="Javascript">
// <![CDATA[	// <![CDATA[
var stdeditbrowser;	var stdeditbrowser;
function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {	function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadvonly) {
var url = '/adm/pickstudent?';	var url = '/adm/pickstudent?';
var filter;	var filter;
if (!ignorefilter) {	if (!ignorefilter) {
Line 421 sub studentbrowser_javascript {	Line 421 sub studentbrowser_javascript {
}	}
}	}
url += 'form=' + formname + '&unameelement='+uname+	url += 'form=' + formname + '&unameelement='+uname+
'&udomelement='+udom;	'&udomelement='+udom+
	'&clicker='+clicker;
if (roleflag) { url+="&roles=1"; }	if (roleflag) { url+="&roles=1"; }
if (courseadvonly) { url+="&courseadvonly=1"; }	if (courseadvonly) { url+="&courseadvonly=1"; }
var title = 'Student_Browser';	var title = 'Student_Browser';
Line 435 sub studentbrowser_javascript {	Line 436 sub studentbrowser_javascript {
ENDSTDBRW	ENDSTDBRW
}	}

	sub resourcebrowser_javascript {
	unless ($env{'request.course.id'}) { return ''; }
	return (<<'ENDRESBRW');
	<script type="text/javascript" language="Javascript">
	// <![CDATA[
	var reseditbrowser;
	function openresbrowser(formname,reslink) {
	var url = '/adm/pickresource?form='+formname+'&reslink='+reslink;
	var title = 'Resource_Browser';
	var options = 'scrollbars=1,resizable=1,menubar=0';
	options += ',width=700,height=500';
	reseditbrowser = open(url,title,options,'1');
	reseditbrowser.focus();
	}
	// ]]>
	</script>
	ENDRESBRW
	}

sub selectstudent_link {	sub selectstudent_link {
my ($form,$unameele,$udomele,$courseadvonly)=@_;	my ($form,$unameele,$udomele,$courseadvonly,$clickerid)=@_;
my $callargs = "'".$form."','".$unameele."','".$udomele."'";	my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
	&Apache::lonhtmlcommon::entity_encode($unameele)."','".
	&Apache::lonhtmlcommon::entity_encode($udomele)."'";
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})	if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
&& !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.	&& !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
'/'.$env{'request.course.sec'})) {	'/'.$env{'request.course.sec'})) {
return '';	return '';
}	}
	$callargs.=",'".&Apache::lonhtmlcommon::entity_encode($clickerid)."'";
if ($courseadvonly) {	if ($courseadvonly) {
$callargs .= ",'',1,1";	$callargs .= ",'',1,1";
}	}
Line 460 sub selectstudent_link {	Line 483 sub selectstudent_link {
return '';	return '';
}	}

	sub selectresource_link {
	my ($form,$reslink,$arg)=@_;

	my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
	&Apache::lonhtmlcommon::entity_encode($reslink)."'";
	unless ($env{'request.course.id'}) { return $arg; }
	return '<span class="LC_nobreak">'.
	'<a href="javascript:openresbrowser('.$callargs.');">'.
	$arg.'</a></span>';
	}



sub authorbrowser_javascript {	sub authorbrowser_javascript {
return <<"ENDAUTHORBRW";	return <<"ENDAUTHORBRW";
<script type="text/javascript" language="JavaScript">	<script type="text/javascript" language="JavaScript">
Line 1090 a new window using Javascript. (Default	Line 1126 a new window using Javascript. (Default

$width and $height are optional numerical parameters that will	$width and $height are optional numerical parameters that will
override the width and height of the popped up window, which may	override the width and height of the popped up window, which may
be useful for certain help topics with big pictures included.	be useful for certain help topics with big pictures included.

	$imgid is the id of the img tag used for the help icon. This may be
	used in a javascript call to switch the image src. See
	lonhtmlcommon::htmlareaselectactive() for an example.

=cut	=cut

Line 1130 sub help_open_topic {	Line 1170 sub help_open_topic {
$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'	$template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
.'<img src="'.$helpicon.'" border="0"'	.'<img src="'.$helpicon.'" border="0"'
.' alt="'.&mt('Help: [_1]',$topic).'"'	.' alt="'.&mt('Help: [_1]',$topic).'"'
.' title="'.$title.'" style="vertical-align:middle;"'.$imgid	.' title="'.$title.'" style="vertical-align:middle;"'.$imgid
.' /></a>';	.' /></a>';
if ($text ne "") {	if ($text ne "") {
$template.='</span>';	$template.='</span>';
}	}
return $template;	return $template;
Line 1205 ENDOUTPUT	Line 1245 ENDOUTPUT
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);	$stayOnPage = 1;
# only use pop-up help (stayOnPage == 0)
# if environment.remote is on (using remote control UI)
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;
}
my $output;	my $output;
if ($component_help) {	if ($component_help) {
if (!$text) {	if (!$text) {
Line 1231 sub help_open_menu {	Line 1266 sub help_open_menu {
sub top_nav_help {	sub top_nav_help {
my ($text) = @_;	my ($text) = @_;
$text = &mt($text);	$text = &mt($text);
my $stay_on_page =	my $stay_on_page = 1;
($env{'environment.remote'} eq 'off' );
my $link = ($stay_on_page) ? "javascript:helpMenu('display')"	my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
: "javascript:helpMenu('open')";	: "javascript:helpMenu('open')";
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);	my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
Line 1247 END	Line 1282 END

sub help_menu_js {	sub help_menu_js {
my ($text) = @_;	my ($text) = @_;
	my $stayOnPage = 1;
my $stayOnPage =
($env{'environment.remote'} eq 'off' );

my $width = 620;	my $width = 620;
my $height = 600;	my $height = 600;
my $helptopic=&general_help();	my $helptopic=&general_help();
Line 1307 sub help_open_bug {	Line 1339 sub help_open_bug {
unless ($env{'user.adv'}) { return ''; }	unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }	unless ($Apache::lonnet::perlvar{'BugzillaHost'}) { return ''; }
$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;	$stayOnPage=1;
}
$width = 600 if (not defined $width);	$width = 600 if (not defined $width);
$height = 600 if (not defined $height);	$height = 600 if (not defined $height);

Line 1351 sub help_open_faq {	Line 1380 sub help_open_faq {
unless ($env{'user.adv'}) { return ''; }	unless ($env{'user.adv'}) { return ''; }
unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }	unless ($Apache::lonnet::perlvar{'FAQHost'}) { return ''; }
$text = "" if (not defined $text);	$text = "" if (not defined $text);
$stayOnPage = 0 if (not defined $stayOnPage);
if ($env{'environment.remote'} eq 'off' ) {
$stayOnPage=1;	$stayOnPage=1;
}
$width = 350 if (not defined $width);	$width = 350 if (not defined $width);
$height = 400 if (not defined $height);	$height = 400 if (not defined $height);

Line 1870 sub multiple_select_form {	Line 1896 sub multiple_select_form {
Returns a string containing a <select name='$name' size='1'> form to	Returns a string containing a <select name='$name' size='1'> form to
allow a user to select options from a ref to a hash containing:	allow a user to select options from a ref to a hash containing:
option_name => displayed text. An optional $onchange can include	option_name => displayed text. An optional $onchange can include
a javascript onchange item, e.g., onchange="this.form.submit();"	a javascript onchange item, e.g., onchange="this.form.submit();"

See lonrights.pm for an example invocation and use.	See lonrights.pm for an example invocation and use.

Line 1886 sub select_form {	Line 1912 sub select_form {
my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";	my $selectform = "<select name=\"$name\" size=\"1\"$onchange>\n";
my @keys;	my @keys;
if (exists($hashref->{'select_form_order'})) {	if (exists($hashref->{'select_form_order'})) {
@keys=@{$hashref->{'select_form_order'}};	@keys=@{$hashref->{'select_form_order'}};
} else {	} else {
@keys=sort(keys(%{$hashref}));	@keys=sort(keys(%{$hashref}));
}	}
foreach my $key (@keys) {	foreach my $key (@keys) {
$selectform.=	$selectform.=
Line 2287 function set_auth_radio_buttons(newvalue	Line 2313 function set_auth_radio_buttons(newvalue
var numauthchoices = currentform.login.length;	var numauthchoices = currentform.login.length;
if (typeof numauthchoices == "undefined") {	if (typeof numauthchoices == "undefined") {
return;	return;
}	}
var i=0;	var i=0;
while (i < numauthchoices) {	while (i < numauthchoices) {
if (currentform.login[i].value == newvalue) { break; }	if (currentform.login[i].value == newvalue) { break; }
Line 3260 sub filemimetype {	Line 3286 sub filemimetype {
sub filecategoryselect {	sub filecategoryselect {
my ($name,$value)=@_;	my ($name,$value)=@_;
return &select_form($value,$name,	return &select_form($value,$name,
{'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});	{'' => &mt('Any category'), map { $_,$_ } sort(keys(%category_extensions))});
}	}

=pod	=pod
Line 3433 sub get_previous_attempt {	Line 3459 sub get_previous_attempt {
my $data=$parts[-1];	my $data=$parts[-1];
next if ($data eq 'foilorder');	next if ($data eq 'foilorder');
pop(@parts);	pop(@parts);
	$prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.' </th>';
if ($data eq 'type') {	if ($data eq 'type') {
unless ($showsurv) {	unless ($showsurv) {
my $id = join(',',@parts);	my $id = join(',',@parts);
Line 3441 sub get_previous_attempt {	Line 3468 sub get_previous_attempt {
$lasthidden{$ign.'.'.$id} = 1;	$lasthidden{$ign.'.'.$id} = 1;
}	}
}	}
delete($lasthash{$key});	}
} else {
$prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.' </th>';
}
} else {	} else {
if ($#parts == 0) {	if ($#parts == 0) {
$prevattempts.='<th>'.$parts[0].'</th>';	$prevattempts.='<th>'.$parts[0].'</th>';
Line 3575 sub format_previous_attempt_value {	Line 3599 sub format_previous_attempt_value {
}	}
my $tag_internal_answer_name = 'INTERNAL';	my $tag_internal_answer_name = 'INTERNAL';
if ($anskeys[0] eq $tag_internal_answer_name) {	if ($anskeys[0] eq $tag_internal_answer_name) {
$value = $answer;	$value = $answer;
} else {	} else {
$value = $anskeys[0].'='.$answer;	$value = $anskeys[0].'='.$answer;
}	}
Line 3586 sub format_previous_attempt_value {	Line 3610 sub format_previous_attempt_value {
$answer =~ s{\0}{,}g;	$answer =~ s{\0}{,}g;
}	}
$value .= $ans.'='.$answer.'<br />';;	$value .= $ans.'='.$answer.'<br />';;
}	}
}	}
} else {	} else {
$value = &unescape($value);	$value = &unescape($value);
Line 4592 Inputs:	Line 4616 Inputs:

=item * $bgcolor, used to override the bgcolor on a webpage to a specific value	=item * $bgcolor, used to override the bgcolor on a webpage to a specific value

=item * $no_inline_link, if true and in remote mode, don't show the
'Switch To Inline Menu' link

=item * $args, optional argument valid values are	=item * $args, optional argument valid values are
no_auto_mt_title -> prevents &mt()ing the title arg	no_auto_mt_title -> prevents &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
Line 4612 other decorations will be returned.	Line 4633 other decorations will be returned.

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
$no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;	$no_nav_bar,$bgcolor,$args)=@_;

my $public;	my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))	if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
Line 4654 sub bodytag {	Line 4675 sub bodytag {
}	}

if (!$realm) { $realm=' '; }	if (!$realm) { $realm=' '; }
# Set messages
my $messages=&domainlogo($domain);

my $extra_body_attr = &make_attr_string($forcereg,\%design);	my $extra_body_attr = &make_attr_string($forcereg,\%design);

Line 4673 sub bodytag {	Line 4692 sub bodytag {
} else {	} else {
$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
}	}

my $titleinfo = '<h1>'.$title.'</h1>';	my $titleinfo = '<h1>'.$title.'</h1>';
#	#
# Extra info if you are the DC	# Extra info if you are the DC
Line 4689 sub bodytag {	Line 4708 sub bodytag {
$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;	$role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);	&get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);

if ($env{'environment.remote'} ne 'on') {
# No Remote
if ($no_nav_bar \|\| $env{'form.inhibitmenu'} eq 'yes') {	if ($no_nav_bar \|\| $env{'form.inhibitmenu'} eq 'yes') {
return $bodytag;	return $bodytag;
}	}

if ($env{'request.state'} eq 'construct') { $forcereg=1; }	if ($env{'request.state'} eq 'construct') { $forcereg=1; }

Line 4711 sub bodytag {	Line 4728 sub bodytag {
<em>$realm</em> $dc_info</div>\|;	<em>$realm</em> $dc_info</div>\|;
return $bodytag;	return $bodytag;
}	}
if (($env{'request.noversionuri'} =~ m{^/adm/navmaps}) &&
($env{'environment.remotenavmap'} eq 'on')) {
return $bodytag;
}

unless ($env{'request.symb'} =~ m/\.page___\d+___/) {	unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>\|;	$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>\|;
Line 4736 sub bodytag {	Line 4749 sub bodytag {
$bodytag .= Apache::lonmenu::serverform();	$bodytag .= Apache::lonmenu::serverform();
$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');	$bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
if ($env{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,'',	$bodytag .= &Apache::lonmenu::innerregister($forcereg,
$args->{'bread_crumbs'});	$args->{'bread_crumbs'});
} elsif ($forcereg) {	} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg);	$bodytag .= &Apache::lonmenu::innerregister($forcereg);
Line 4749 sub bodytag {	Line 4762 sub bodytag {
}	}

return $bodytag;	return $bodytag;
}

#
# Top frame rendering, Remote is up
#

my $imgsrc = $img;
if ($img =~ /^\/adm/) {
$imgsrc = &lonhttpdurl($img);
}
my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';

# Explicit link to get inline menu
my $menu= ($no_inline_link?''
:'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');

if ($dc_info) {
$dc_info = qq\|<span class="LC_cusr_subheading">($dc_info)</span>\|;
}

unless ($env{'form.inhibitmenu'}) {
$bodytag .= qq\|<div id="LC_nav_bar">$name $role</div>
<ol class="LC_primary_menu LC_right">
<li>$menu</li>
</ol><div id="LC_realm"> $realm $dc_info</div>\|;
}

return(<<ENDBODY);
$bodytag
<table id="LC_title_bar" class="LC_with_remote">
<tr><td>$upperleft</td>
<td>$messages </td>
</tr>
<tr><td>$titleinfo $dc_info $menu</td>
</tr>
</table>
ENDBODY
}	}

sub dc_courseid_toggle {	sub dc_courseid_toggle {
Line 4817 sub make_attr_string {	Line 4793 sub make_attr_string {
delete($attr_ref->{$key});	delete($attr_ref->{$key});
}	}
}	}
$attr_ref->{'onload'} =	$attr_ref->{'onload'} = $on_load;
&Apache::lonmenu::loadevents(). $on_load;	$attr_ref->{'onunload'}= $on_unload;
$attr_ref->{'onunload'}=
&Apache::lonmenu::unloadevents().$on_unload;
}

# Accessibility font enhance
if ($env{'browser.fontenhance'} eq 'on') {
my $style;
foreach my $key (keys(%{$attr_ref})) {
if (lc($key) eq 'style') {
$style.=$attr_ref->{$key}.';';
delete($attr_ref->{$key});
}
}
$attr_ref->{'style'}=$style.'; font-size: x-large;';
}	}

my $attr_string;	my $attr_string;
Line 4930 sub standard_css {	Line 4892 sub standard_css {
$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'	$env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
: '0 3px 0 4px';	: '0 3px 0 4px';


return <<END;	return <<END;

/* needed for iframe to allow 100% height in FF */	/* needed for iframe to allow 100% height in FF */
Line 4996 form, .inline {	Line 4959 form, .inline {
text-decoration:none;	text-decoration:none;
}	}

	.LC_setting {
	text-decoration:underline;
	}

.LC_error {	.LC_error {
color: red;	color: red;
font-size: larger;	font-size: larger;
Line 5163 td.LC_table_cell_checkbox {	Line 5130 td.LC_table_cell_checkbox {
text-align: left;	text-align: left;
}	}

/* Preliminary fix to hide breadcrumbs inside remote control window */
#LC_remote #LC_breadcrumbs {
display:none;
}

.LC_head_subbox {	.LC_head_subbox {
clear:both;	clear:both;
background: #F8F8F8; /* $sidebg; */	background: #F8F8F8; /* $sidebg; */
Line 5245 table.LC_nested {	Line 5207 table.LC_nested {
width: 100%;	width: 100%;
}	}

.ui-accordion,
.ui-accordion table.LC_data_table,
.ui-accordion table.LC_nested_outer{
border: 0px;
border-spacing: 0px;
margin: 3px;
}

table.LC_data_table tr th,	table.LC_data_table tr th,
table.LC_calendar tr th,	table.LC_calendar tr th,
table.LC_prior_tries tr th,	table.LC_prior_tries tr th,
Line 5368 table.LC_nested tr td.LC_right_item {	Line 5322 table.LC_nested tr td.LC_right_item {
text-align: right;	text-align: right;
}	}

.ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
.ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
text-align: right;
width: 40%;
padding-right:10px;
vertical-align: top;
padding: 5px;
}

.ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
.ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
text-align: left;
width: 60%;
padding: 2px 4px;
}

table.LC_nested tr.LC_odd_row td {	table.LC_nested tr.LC_odd_row td {
background-color: #EEEEEE;	background-color: #EEEEEE;
}	}
Line 5710 table.LC_group_priv td {	Line 5648 table.LC_group_priv td {
padding: 0;	padding: 0;
}	}

table.LC_notify_front_page {
background: white;
border: 1px solid black;
padding: 8px;
}

table.LC_notify_front_page td {
padding: 8px;
}

.LC_navbuttons {	.LC_navbuttons {
margin: 2ex 0ex 2ex 0ex;	margin: 2ex 0ex 2ex 0ex;
}	}
Line 6170 fieldset > legend {	Line 6098 fieldset > legend {
font-style: normal;	font-style: normal;
}	}

/* Preliminary fix to hide nav_bar inside bookmarks window */
#LC_bookmarks #LC_nav_bar {
display:none;
}

ol.LC_primary_menu {	ol.LC_primary_menu {
float: right;	float: right;
margin: 0;	margin: 0;
background-color: $pgbg_or_bgcolor;	background-color: $pgbg_or_bgcolor;
}	}

ol.LC_primary_menu a.LC_new_message {
font-weight:bold;
color: darkred;
}

ol#LC_PathBreadcrumbs {	ol#LC_PathBreadcrumbs {
margin: 0;	margin: 0;
}	}
Line 6206 ol.LC_primary_menu a {	Line 6124 ol.LC_primary_menu a {
text-decoration: none;	text-decoration: none;
}	}

	ol.LC_primary_menu a.LC_new_message {
	font-weight:bold;
	color: darkred;
	}

ol.LC_docs_parameters {	ol.LC_docs_parameters {
margin-left: 0;	margin-left: 0;
padding: 0;	padding: 0;
Line 6348 ul.LC_TabContentBigger li a {	Line 6271 ul.LC_TabContentBigger li a {
text-align: center;	text-align: center;
display: block;	display: block;
text-decoration: none;	text-decoration: none;
outline: none;	outline: none;
}	}

ul.LC_TabContentBigger li.active a {	ul.LC_TabContentBigger li.active a {
Line 6372 ul.LC_TabContentBigger li.active b {	Line 6295 ul.LC_TabContentBigger li.active b {
background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;	background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
color:$font;	color:$font;
border: 0;	border: 0;
cursor:default;
}	}


ul.LC_CourseBreadcrumbs {	ul.LC_CourseBreadcrumbs {
background: $sidebg;	background: $sidebg;
line-height: 32px;	line-height: 32px;
Line 6543 a#LC_content_toolbar_firsthomework {	Line 6466 a#LC_content_toolbar_firsthomework {
background-image:url(/res/adm/pages/open-first-problem.gif);	background-image:url(/res/adm/pages/open-first-problem.gif);
}	}

a#LC_content_toolbar_launchnav {
background-image:url(/res/adm/pages/start-navigation.gif);
}

a#LC_content_toolbar_closenav {
background-image:url(/res/adm/pages/close-navigation.gif);
}

a#LC_content_toolbar_everything {	a#LC_content_toolbar_everything {
background-image:url(/res/adm/pages/show-all.gif);	background-image:url(/res/adm/pages/show-all.gif);
}	}
Line 6635 ul.LC_funclist li {	Line 6550 ul.LC_funclist li {
line-height: 150%;	line-height: 150%;
}	}

.ui-accordion .LC_advanced_toggle {	.LC_hidden {
float: right;	display: none;
font-size: 90%;
padding: 0px 4px
}	}

END	END
Line 6692 sub headtag {	Line 6605 sub headtag {
if (!$args->{'frameset'}) {	if (!$args->{'frameset'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}	}
if ($args->{'force_register'}) {	if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
$result .= &Apache::lonmenu::registerurl(1);	$result .= Apache::lonxml::display_title();
}	}
if (!$args->{'no_nav_bar'}	if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}	&& !$args->{'only_body'}
Line 6719 ADDMETA	Line 6632 ADDMETA
$result .= '<title> LON-CAPA '.$title.'</title>'	$result .= '<title> LON-CAPA '.$title.'</title>'
.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
.$head_extra;	.$head_extra;
return $result;	return $result.'</head>';
}	}

=pod	=pod
Line 6772 sub xml_begin {	Line 6685 sub xml_begin {

=pod	=pod

=item * &endheadtag()

Returns a uniform </head> for LON-CAPA web pages.

Inputs: none

=cut

sub endheadtag {
return '</head>';
}

=pod

=item * &head()

Returns a uniform complete <head>..</head> section for LON-CAPA web pages.

Inputs:

=over 4

$title - optional title for the page

$head_extra - optional extra HTML to put inside the <head>

=back

=cut

sub head {
my ($title,$head_extra,$args) = @_;
return &headtag($title,$head_extra,$args).&endheadtag();
}

=pod

=item * &start_page()	=item * &start_page()

Returns a complete <html> .. <body> section for LON-CAPA web pages.	Returns a complete <html> .. <body> section for LON-CAPA web pages.
Line 6846 $args - additional optional args support	Line 6722 $args - additional optional args support
skip_phases -> hash ref of	skip_phases -> hash ref of
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation
no_inline_link -> if true and in remote mode, don't show the
'Switch To Inline Menu' link
no_auto_mt_title -> prevent &mt()ing the title arg	no_auto_mt_title -> prevent &mt()ing the title arg
inherit_jsmath -> when creating popup window in a page,	inherit_jsmath -> when creating popup window in a page,
should it have jsmath forced on by the	should it have jsmath forced on by the
Line 6864 $args - additional optional args support	Line 6738 $args - additional optional args support
sub start_page {	sub start_page {
my ($title,$head_extra,$args) = @_;	my ($title,$head_extra,$args) = @_;
#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));	#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
	#SD
	#I don't see why we copy certain elements of %$args to %head_args
	#head args is passed to headtag() and this routine only reads those
	#keys that are needed. There doesn't happen any writes or any processing
	#of other keys.
	#proposal: just pass $args to headtag instead of \%head_args and delete
	#marked lines
	#<- MARK
my %head_args;	my %head_args;
foreach my $arg ('redirect','force_register','domain','function',	foreach my $arg ('redirect','force_register','domain','function',
'bgcolor','frameset','no_nav_bar','only_body',	'bgcolor','frameset','no_nav_bar','only_body',
Line 6872 sub start_page {	Line 6754 sub start_page {
$head_args{$arg} = $args->{$arg};	$head_args{$arg} = $args->{$arg};
}	}
}	}
	#MARK ->

$env{'internal.start_page'}++;	$env{'internal.start_page'}++;
my $result;	my $result;

if (! exists($args->{'skip_phases'}{'head'}) ) {	if (! exists($args->{'skip_phases'}{'head'}) ) {
$result.=	$result .=
&xml_begin().	&xml_begin() . &headtag($title,$head_extra,\%head_args);
&headtag($title,$head_extra,\%head_args).&endheadtag();	#replace prev line by
	# &xml_begin() . &headtag($title, $head_extra, $args);
}	}

if (! exists($args->{'skip_phases'}{'body'}) ) {	if (! exists($args->{'skip_phases'}{'body'}) ) {
Line 6892 sub start_page {	Line 6777 sub start_page {
$args->{'function'}, $args->{'add_entries'},	$args->{'function'}, $args->{'add_entries'},
$args->{'only_body'}, $args->{'domain'},	$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},	$args->{'force_register'}, $args->{'no_nav_bar'},
$args->{'bgcolor'}, $args->{'no_inline_link'},	$args->{'bgcolor'}, $args);
$args);
}	}
}	}

Line 6909 sub start_page {	Line 6793 sub start_page {
# $result .= &build_functionlist();	# $result .= &build_functionlist();
#}	#}

# Don't add anything more if only_body wanted	# Don't add anything more if only_body wanted or in const space
return $result if $args->{'only_body'};	return $result if $args->{'only_body'}
	\|\| $env{'request.state'} eq 'construct';

#Breadcrumbs for Construction Space provided by &bodytag.
if (($env{'environment.remote'} eq 'off') && ($env{'request.state'} eq 'construct')) {
return $result;
}

#Breadcrumbs	#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {	if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
Line 6937 sub start_page {	Line 6817 sub start_page {
return $result;	return $result;
}	}


=pod

=item * &head()

Returns a complete </body></html> section for LON-CAPA web pages.

Inputs: $args - additional optional args supported are:
js_ready -> return a string ready for being used in
a javascript writeln
html_encode -> return a string ready for being used in
a html attribute
frameset -> if true will start with a <frameset>
rather than <body>
dicsussion -> if true will get discussion from
lonxml::xmlend
(you can pass the target and parser arguments
through optional 'target' and 'parser' args
to this routine)

=cut

sub end_page {	sub end_page {
my ($args) = @_;	my ($args) = @_;
$env{'internal.end_page'}++;	$env{'internal.end_page'}++;
Line 7033 sub validate_page {	Line 6891 sub validate_page {
}	}
}	}


	sub start_scrollbox {
	my ($outerwidth,$width,$height)=@_;
	unless ($outerwidth) { $outerwidth='520px'; }
	unless ($width) { $width='500px'; }
	unless ($height) { $height='200px'; }
	return "<table style='width: $outerwidth; border: 1px solid black;'><tr><td style='width: $width;' bgcolor='#FFFFFF'><div style='overflow:auto; width:$width; height: $height;'>";
	}

	sub end_scrollbox {
	return '</td></tr></table>';
	}

sub simple_error_page {	sub simple_error_page {
my ($r,$title,$msg) = @_;	my ($r,$title,$msg) = @_;
my $page =	my $page =
Line 7062 sub simple_error_page {	Line 6933 sub simple_error_page {
sub start_data_table {	sub start_data_table {
my ($add_class) = @_;	my ($add_class) = @_;
my $css_class = (join(' ','LC_data_table',$add_class));	my $css_class = (join(' ','LC_data_table',$add_class));
&start_data_table_count();	&start_data_table_count();
return '<table class="'.$css_class.'">'."\n";	return '<table class="'.$css_class.'">'."\n";
}	}

sub end_data_table {	sub end_data_table {
&end_data_table_count();	&end_data_table_count();
return '</table>'."\n";;	return '</table>'."\n";;
}	}

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

sub continue_data_table_row {	sub continue_data_table_row {
my ($add_class) = @_;	my ($add_class, $id) = @_;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');;	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
return '<tr class="'.$css_class.'">'."\n";;	$id = (' id="'.$id.'"') unless ($id eq '');
	return '<tr class="'.$css_class.'"'.$id.'>'."\n";
}	}

sub end_data_table_row {	sub end_data_table_row {
Line 7923 sub user_picker {	Line 7796 sub user_picker {
my ($newuserscript,$new_user_create);	my ($newuserscript,$new_user_create);
my $context_dom = $env{'request.role.domain'};	my $context_dom = $env{'request.role.domain'};
if ($context eq 'requestcrs') {	if ($context eq 'requestcrs') {
if ($env{'form.coursedom'} ne '') {	if ($env{'form.coursedom'} ne '') {
$context_dom = $env{'form.coursedom'};	$context_dom = $env{'form.coursedom'};
}	}
}	}
Line 8511 sub ask_for_embedded_content {	Line 8384 sub ask_for_embedded_content {
$url .= $current_path;	$url .= $current_path;
$getpropath = 1;	$getpropath = 1;
} elsif (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|	} elsif (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|
($actionurl eq '/adm/imsimport')) {	($actionurl eq '/adm/imsimport')) {
($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});	($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});
$url = '/home/'.$uname.'/public_html/';	$url = '/home/'.$uname.'/public_html/';
$toplevel = $url;	$toplevel = $url;
Line 8562 sub ask_for_embedded_content {	Line 8435 sub ask_for_embedded_content {
}	}
foreach my $path (keys(%subdependencies)) {	foreach my $path (keys(%subdependencies)) {
my %currsubfile;	my %currsubfile;
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
my @subdir_list = &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);	my @subdir_list = &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
foreach my $line (@subdir_list) {	foreach my $line (@subdir_list) {
my ($file_name,$rest) = split(/\&/,$line,2);	my ($file_name,$rest) = split(/\&/,$line,2);
Line 8670 sub ask_for_embedded_content {	Line 8543 sub ask_for_embedded_content {
} elsif ($applies) {	} elsif ($applies) {
$output = '<b>'.&mt('Referenced files').'</b>:<br />';	$output = '<b>'.&mt('Referenced files').'</b>:<br />';
if ($applies > 1) {	if ($applies > 1) {
$output .=	$output .=
&mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';	&mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';
if ($numremref) {	if ($numremref) {
$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";	$output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";
Line 8700 sub ask_for_embedded_content {	Line 8573 sub ask_for_embedded_content {
$embed_file,\%mapping,	$embed_file,\%mapping,
$allfiles,$codebase);	$allfiles,$codebase);
} else {	} else {
$pathchange_output .=	$pathchange_output .=
&start_data_table_row().	&start_data_table_row().
'<td><input type ="checkbox" name="namechange" value="'.	'<td><input type ="checkbox" name="namechange" value="'.
$chgcount.'" checked="checked" /></td>'.	$chgcount.'" checked="checked" /></td>'.
Line 8719 sub ask_for_embedded_content {	Line 8592 sub ask_for_embedded_content {
$output .= '<input type ="hidden" name="number_pathchange_items" value="'.	$output .= '<input type ="hidden" name="number_pathchange_items" value="'.
$numpathchg.'" />'."\n";	$numpathchg.'" />'."\n";
}	}
if (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|	if (($actionurl eq '/adm/upload') \|\| ($actionurl eq '/adm/testbank') \|\|
($actionurl eq '/adm/imsimport')) {	($actionurl eq '/adm/imsimport')) {
$output .= '<input type="hidden" name="phase" value="three" />'."\n";	$output .= '<input type="hidden" name="phase" value="three" />'."\n";
} elsif ($actionurl eq '/adm/portfolio' \|\| $actionurl eq '/adm/coursegrp_portfolio') {	} elsif ($actionurl eq '/adm/portfolio' \|\| $actionurl eq '/adm/coursegrp_portfolio') {
Line 8731 sub ask_for_embedded_content {	Line 8604 sub ask_for_embedded_content {
my %pathchange = ();	my %pathchange = ();
$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);	$output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);
if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {	if (($actionurl eq '/adm/portfolio') \|\| ($actionurl eq '/adm/coursegrp_portfolio')) {
$output .= '<p>'.&mt('or').'</p>';	$output .= '<p>'.&mt('or').'</p>';
}	}
}	}
return ($output,$num,$numpathchg);	return ($output,$num,$numpathchg);
}	}
Line 8747 sub embedded_file_element {	Line 8620 sub embedded_file_element {
}	}
$output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'.	$output .= '<input name="embedded_orig_'.$num.'" type="hidden" value="'.
&escape($embed_file).'" />';	&escape($embed_file).'" />';
unless (($context eq 'upload_embedded') &&	unless (($context eq 'upload_embedded') &&
($mapping->{$embed_file} eq $embed_file)) {	($mapping->{$embed_file} eq $embed_file)) {
$output .='	$output .='
<input name="embedded_ref_'.$num.'" type="hidden" value="'.&escape($mapping->{$embed_file}).'" />';	<input name="embedded_ref_'.$num.'" type="hidden" value="'.&escape($mapping->{$embed_file}).'" />';
Line 8848 sub upload_embedded {	Line 8721 sub upload_embedded {
next;	next;
} else {	} else {
$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.	$output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
$path.$fname.'</span>').'<br />';	$path.$fname.'</span>').'<br />';
}	}
}	}
} elsif ($context eq 'coursedoc') {	} elsif ($context eq 'coursedoc') {
Line 8955 sub modify_html_form {	Line 8828 sub modify_html_form {
'<input type="hidden" name="embedded_orig_'.$i.'" value="'.	'<input type="hidden" name="embedded_orig_'.$i.'" value="'.
&escape($env{'form.embedded_orig_'.$i}).'" /></td>'.	&escape($env{'form.embedded_orig_'.$i}).'" /></td>'.
&end_data_table_row();	&end_data_table_row();
}	}
}	}
} else {	} else {
$modifyform = $pathchgtable;	$modifyform = $pathchgtable;
Line 9006 sub modify_html_refs {	Line 8879 sub modify_html_refs {
$content = &Apache::lonnet::getfile($container);	$content = &Apache::lonnet::getfile($container);
return if ($content eq '-1');	return if ($content eq '-1');
} else {	} else {
return unless ($container =~ /^\Q$dir_root\E/);	return unless ($container =~ /^\Q$dir_root\E/);
if (open(my $fh,"<$container")) {	if (open(my $fh,"<$container")) {
$content = join('', <$fh>);	$content = join('', <$fh>);
close($fh);	close($fh);
Line 9018 sub modify_html_refs {	Line 8891 sub modify_html_refs {
my $mm = new File::MMagic;	my $mm = new File::MMagic;
my $mime_type = $mm->checktype_contents($content);	my $mime_type = $mm->checktype_contents($content);
if ($mime_type eq 'text/html') {	if ($mime_type eq 'text/html') {
my $parse_result =	my $parse_result =
&Apache::lonnet::extract_embedded_items($container,\%allfiles,	&Apache::lonnet::extract_embedded_items($container,\%allfiles,
\%codebase,\$content);	\%codebase,\$content);
if ($parse_result eq 'ok') {	if ($parse_result eq 'ok') {
Line 9051 sub modify_html_refs {	Line 8924 sub modify_html_refs {
my ($fname) = ($container =~ m{/([^/]+)$});	my ($fname) = ($container =~ m{/([^/]+)$});
$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',	$output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
$count,'<span class="LC_filename">'.	$count,'<span class="LC_filename">'.
$fname.'</span>').'</p>';	$fname.'</span>').'</p>';
} else {	} else {
$output = '<p class="LC_error">'.	$output = '<p class="LC_error">'.
&mt('Error: update failed for: [_1].',	&mt('Error: update failed for: [_1].',
Line 9103 sub check_for_upload {	Line 8976 sub check_for_upload {
my $filesize = length($env{'form.'.$element});	my $filesize = length($env{'form.'.$element});
if (!$filesize) {	if (!$filesize) {
my $msg = '<span class="LC_error">'.	my $msg = '<span class="LC_error">'.
&mt('Unable to upload [_1]. (size = [_2] bytes)',	&mt('Unable to upload [_1]. (size = [_2] bytes)',
'<span class="LC_filename">'.$fname.'</span>',	'<span class="LC_filename">'.$fname.'</span>',
$filesize).'<br />'.	$filesize).'<br />'.
&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.	&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'.
Line 9136 sub check_for_upload {	Line 9009 sub check_for_upload {
if ($crsid eq $env{'request.course.id'}) {	if ($crsid eq $env{'request.course.id'}) {
if (ref($navmap)) {	if (ref($navmap)) {
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
foreach my $part (@{$res->parts()}) {	foreach my $part (@{$res->parts()}) {
my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);	my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
unless (($slot_status == $res->RESERVED) \|\|	unless (($slot_status == $res->RESERVED) \|\|
($slot_status == $res->RESERVED_LOCATION)) {	($slot_status == $res->RESERVED_LOCATION)) {
Line 11153 sub construct_course {	Line 11026 sub construct_course {
############################################################	############################################################
############################################################	############################################################

	#SD
	# only Community and Course, or anything else?
sub course_type {	sub course_type {
my ($cid) = @_;	my ($cid) = @_;
if (!defined($cid)) {	if (!defined($cid)) {
Line 11318 sub init_user_environment {	Line 11193 sub init_user_environment {
my %userenv = &Apache::lonnet::dump('environment',$domain,$username);	my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
my ($tmp) = keys(%userenv);	my ($tmp) = keys(%userenv);
if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {	if ($tmp !~ /^(con_lost\|error\|no_such_host)/i) {
# default remote control to off
if ($userenv{'remote'} ne 'on') { $userenv{'remote'} = 'off'; }
} else {	} else {
undef(%userenv);	undef(%userenv);
}	}
if (($userenv{'interface'}) && (!$form->{'interface'})) {	if (($userenv{'interface'}) && (!$form->{'interface'})) {
$form->{'interface'}=$userenv{'interface'};	$form->{'interface'}=$userenv{'interface'};
}	}
$env{'environment.remote'}=$userenv{'remote'};
if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }	if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }

# --------------- Do not trust query string to be put directly into environment	# --------------- Do not trust query string to be put directly into environment
Line 11358 sub init_user_environment {	Line 11230 sub init_user_environment {
$initial_env{"browser.localres"} = $form->{'localres'};	$initial_env{"browser.localres"} = $form->{'localres'};
}	}

if ($public) {
$initial_env{"environment.remote"} = "off";
}
if ($form->{'interface'}) {	if ($form->{'interface'}) {
$form->{'interface'}=~s/\W//gs;	$form->{'interface'}=~s/\W//gs;
$initial_env{"browser.interface"} = $form->{'interface'};	$initial_env{"browser.interface"} = $form->{'interface'};
$env{'browser.interface'}=$form->{'interface'};	$env{'browser.interface'}=$form->{'interface'};
}	}

my %is_adv = ( is_adv => $env{'user.adv'} );	my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef = &Apache::lonnet::get_domain_defaults($domain);	my %domdef = &Apache::lonnet::get_domain_defaults($domain);

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

Removed from v.1.948.2.29
changed lines
	Added in v.1.1010