loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.223 and 1.236

version 1.223, 2009/06/10 13:32:38	version 1.236, 2009/10/30 05:10:03
Line 82 sub confirm_success {	Line 82 sub confirm_success {
.'</span>'."\n";	.'</span>'."\n";
} else {	} else {
return '<span class="LC_success">'."\n"	return '<span class="LC_success">'."\n"
.'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('Ok').'" /> '."\n"	.'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('OK').'" /> '."\n"
.$message."\n"	.$message."\n"
.'</span>'."\n";	.'</span>'."\n";
}	}
Line 160 sub authorbombs {	Line 160 sub authorbombs {
$url=&Apache::lonnet::declutter($url);	$url=&Apache::lonnet::declutter($url);
my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});	my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);	my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
foreach (keys %bombs) {	foreach my $bomb (keys(%bombs)) {
if ($_=~/^$udom\/$uname\//) {	if ($bomb =~ /^$udom\/$uname\//) {
return '<a href="/adm/bombs/'.$url.	return '<a href="/adm/bombs/'.$url.
'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" alt="'.&mt('Bomb').'" border="0" /></a>'.	'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" alt="'.&mt('Bomb').'" border="0" /></a>'.
&Apache::loncommon::help_open_topic('About_Bombs');	&Apache::loncommon::help_open_topic('About_Bombs');
Line 239 sub get_recent {	Line 239 sub get_recent {
# Begin filling return_hash with any 'always_include' option	# Begin filling return_hash with any 'always_include' option
my %time_hash = ();	my %time_hash = ();
my %return_hash = ();	my %return_hash = ();
foreach my $item (keys %recent) {	foreach my $item (keys(%recent)) {
my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));	my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
if ($thistime eq 'always_include') {	if ($thistime eq 'always_include') {
$return_hash{$item} = &unescape($thisvalue);	$return_hash{$item} = &unescape($thisvalue);
Line 505 ENDJS	Line 505 ENDJS
unshift(@Months,'If you can read this an error occurred');	unshift(@Months,'If you can read this an error occurred');
if ($includeempty) { $monthselector.="<option value=''></option>"; }	if ($includeempty) { $monthselector.="<option value=''></option>"; }
for(my $m = 1;$m <=$#Months;$m++) {	for(my $m = 1;$m <=$#Months;$m++) {
$monthselector .= qq{ <option value="$m" };	$monthselector .= qq{ <option value="$m"};
$monthselector .= "selected " if ($m-1 eq $month);	$monthselector .= ' selected="selected"' if ($m-1 eq $month);
$monthselector .= '> '.&mt($Months[$m]).' </option>';	$monthselector .= '> '.&mt($Months[$m]).' </option>'."\n";
}	}
$monthselector.= ' </select>';	$monthselector.= ' </select>';
# Day	# Day
my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};	my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
# Year	# Year
my $yearselector = qq{<input type="year" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};	my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
#	#
my $hourselector = qq{<select name="$dname\_hour" $special $state >};	my $hourselector = qq{<select name="$dname\_hour" $special $state >};
if ($includeempty) {	if ($includeempty) {
$hourselector.=qq{<option value=''></option>};	$hourselector.=qq{<option value=''></option>};
}	}
for (my $h = 0;$h<24;$h++) {	for (my $h = 0;$h<24;$h++) {
$hourselector .= qq{<option value="$h" };	$hourselector .= qq{<option value="$h"};
$hourselector .= "selected " if (defined($hour) && $hour == $h);	$hourselector .= ' selected="selected"' if (defined($hour) && $hour == $h);
$hourselector .= ">";	$hourselector .= ">";
my $timest='';	my $timest='';
if ($h == 0) {	if ($h == 0) {
Line 609 Inputs:	Line 609 Inputs:

=item $dname	=item $dname

The name passed to &datesetter, which prefixes the form elements.	The name passed to &date_setter, which prefixes the form elements.

=item $defaulttime	=item $defaulttime

Line 978 sub Create_PrgWin {	Line 978 sub Create_PrgWin {

#the whole function called through timeout is due to issues	#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story	#in mozilla Read BUG #2665 if you want to know the whole story
&r_print($r,'<script type="text/javascript">'.	&r_print($r,&Apache::lonhtmlcommon::scripttag(
'// <![CDATA['.
"var popwin;	"var popwin;
function openpopwin () {	function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".	popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
Line 990 sub Create_PrgWin {	Line 989 sub Create_PrgWin {
&mt('Starting').'" /><\\/form>'.$end_page.	&mt('Starting').'" /><\\/form>'.$end_page.
"\');".	"\');".
"popwin.document.close();}".	"popwin.document.close();}".
"\nwindow.setTimeout(openpopwin,0)".	"\nwindow.setTimeout(openpopwin,0)"
'// ]]>'.	));
'</script>');
$prog_state{'formname'}='popremain';	$prog_state{'formname'}='popremain';
$prog_state{'inputname'}="remaining";	$prog_state{'inputname'}="remaining";
} elsif ($type eq 'inline') {	} elsif ($type eq 'inline') {
Line 1025 sub Create_PrgWin {	Line 1023 sub Create_PrgWin {
# update progress	# update progress
sub Update_PrgWin {	sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;	my ($r,$prog_state,$displayString)=@_;
&r_print($r,'<script type="text/javascript">'.	&r_print($r,&Apache::lonhtmlcommon::scripttag(
'// <![CDATA['.
$$prog_state{'window'}.'.document.'.	$$prog_state{'window'}.'.document.'.
$$prog_state{'formname'}.'.'.	$$prog_state{'formname'}.'.'.
$$prog_state{'inputname'}.'.value="'.	$$prog_state{'inputname'}.'.value="'.
$displayString.'";'.	$displayString.'";'
'// ]]>'.	));
'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1085 sub Increment_PrgWin {	Line 1081 sub Increment_PrgWin {
if ($user_browser eq 'explorer' && $user_os =~ 'mac') {	if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
$lasttime = '';	$lasttime = '';
}	}
&r_print($r,'<script>'.	&r_print($r,&Apache::lonhtmlcommon::scripttag(
'// <![CDATA['.
$$prog_state{'window'}.'.document.'.	$$prog_state{'window'}.'.document.'.
$$prog_state{'formname'}.'.'.	$$prog_state{'formname'}.'.'.
$$prog_state{'inputname'}.'.value="'.	$$prog_state{'inputname'}.'.value="'.
$$prog_state{'done'}.'/'.$$prog_state{'max'}.	$$prog_state{'done'}.'/'.$$prog_state{'max'}.
': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.	': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'
'// ]]>'.	));
'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1101 sub Increment_PrgWin {	Line 1095 sub Increment_PrgWin {
sub Close_PrgWin {	sub Close_PrgWin {
my ($r,$prog_state)=@_;	my ($r,$prog_state)=@_;
if ($$prog_state{'type'} eq 'popup') {	if ($$prog_state{'type'} eq 'popup') {
&r_print($r,'<script>'.	&r_print($r,&Apache::lonhtmlcommon::scripttag(
'// <![CDATA['.	'popwin.close()'
'popwin.close()'.	));
'// ]]>'.
'</script>'."\n");
} elsif ($$prog_state{'type'} eq 'inline') {	} elsif ($$prog_state{'type'} eq 'inline') {
&Update_PrgWin($r,$prog_state,&mt('Done'));	&Update_PrgWin($r,$prog_state,&mt('Done'));
}	}
Line 1272 sub htmlareaselectactive {	Line 1264 sub htmlareaselectactive {
my @fields=@_;	my @fields=@_;
unless (&htmlareabrowser()) { return ''; }	unless (&htmlareabrowser()) { return ''; }
if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }	if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
my $output='<script type="text/javascript" defer="1">'	my $output='<script type="text/javascript" defer="1">'."\n"
.'// <![CDATA[';	.'// <![CDATA['."\n";
my $lang = &htmlarea_lang();	my $lang = &htmlarea_lang();
foreach my $field (@fields) {	foreach my $field (@fields) {
$output.="	$output.="
Line 1287 sub htmlareaselectactive {	Line 1279 sub htmlareaselectactive {
}";	}";
}	}
$output.="\nwindow.status='Activated Editfields';\n"	$output.="\nwindow.status='Activated Editfields';\n"
.'// ]]>'	.'// ]]>'."\n"
.'</script><br />'.	.'</script><br />'.
&disablelink(@fields);	&disablelink(@fields);
return $output;	return $output;
Line 1435 returns: nothing	Line 1427 returns: nothing
unless ($CourseBreadcrumbs) {	unless ($CourseBreadcrumbs) {
$links = htmltag('ol', $links, { id => "LC_MenuBreadcrumbs" });	$links = htmltag('ol', $links, { id => "LC_MenuBreadcrumbs" });
} else {	} else {
$links = htmltag('ul', $links, { id => "LC_CourseBreadcrumbs" });	$links = htmltag('ul', $links, { class => "LC_CourseBreadcrumbs" });
}	}

if ($component) {	if ($component) {
Line 1447 returns: nothing	Line 1439 returns: nothing
}	}

$links = htmltag('div', $links,	$links = htmltag('div', $links,
{ id => "LC_head_subbox" }) unless ($CourseBreadcrumbs) ;	{ id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;

# Return the @Crumbs stack to what we started with	# Return the @Crumbs stack to what we started with
push(@Crumbs,$last);	push(@Crumbs,$last);
Line 1461 returns: nothing	Line 1453 returns: nothing
}	}

sub add_breadcrumb {	sub add_breadcrumb {
push (@Crumbs,@_);	push(@Crumbs,@_);
}	}

} # End of scope for @Crumbs	} # End of scope for @Crumbs
Line 1598 ENDTWO	Line 1590 ENDTWO

sub role_select_row {	sub role_select_row {
my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;	my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
	my $crstype = 'Course';
	if ($cdom ne '' && $cnum ne '') {
	$crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
	}
my $output;	my $output;
if (defined($title)) {	if (defined($title)) {
$output = &row_title($title,$css_class);	$output = &row_title($title,$css_class);
Line 1622 sub role_select_row {	Line 1618 sub role_select_row {
$plrole = &mt('Custom Role');	$plrole = &mt('Custom Role');
}	}
} else {	} else {
$plrole=&Apache::lonnet::plaintext($role);	$plrole=&Apache::lonnet::plaintext($role,$crstype);
}	}
if (($role ne 'cr') \|\| (!$show_separate_custom)) {	if (($role ne 'cr') \|\| (!$show_separate_custom)) {
$output .= ' <option value="'.$role.'">'.$plrole.'</option>';	$output .= ' <option value="'.$role.'">'.$plrole.'</option>';
Line 1953 sub set_form_elements {	Line 1949 sub set_form_elements {
$values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g;	$values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g;
$values{$name}[$i] =~ s/"/\\"/g;	$values{$name}[$i] =~ s/"/\\"/g;
}	}
if ($$elements{$name} eq 'text') {	if (($$elements{$name} eq 'text') \|\| ($$elements{$name} eq 'hidden')) {
my $numvalues = @{$values{$name}};	my $numvalues = @{$values{$name}};
if ($numvalues > 1) {	if ($numvalues > 1) {
my $valuestring = join('","',@{$values{$name}});	my $valuestring = join('","',@{$values{$name}});
Line 1988 sub set_form_elements {	Line 1984 sub set_form_elements {
$output .= qq\|	$output .= qq\|
if (courseForm.elements['$name'].value == "$value") {	if (courseForm.elements['$name'].value == "$value") {
courseForm.elements['$name'].checked = true;	courseForm.elements['$name'].checked = true;
	} else {
	courseForm.elements['$name'].checked = false;
}\|;	}\|;
}	}
}	}
Line 2029 sub set_form_elements {	Line 2027 sub set_form_elements {
}	}
}	}
$output .= "	$output .= "
	return;
}\n";	}\n";
return $output;	return $output;
}	}
Line 2117 sub inittags {	Line 2116 sub inittags {
}	}


	# USAGE: scripttag(scriptcode, [start\|end\|both]);
	#
	# EXAMPLES:
	# - scripttag("alert('Hello World!')", 'both')
	# returns:
	# <script type="text/javascript">
	# // BEGIN LON-CAPA Internal
	# alert(Hello World!')
	# // END LON-CAPA Internal
	# </script>
	#
	# NOTES:
	# - works currently only for javascripts
	#
	# OUTPUT:
	# Scriptcode properly enclosed in <script> and CDATA tags (and LC
	# Internal markers if 2nd argument is given)
	sub scripttag {
	my ( $content, $marker ) = @_;
	return unless defined $content;

	my $begin = "\n// BEGIN LON-CAPA Internal\n";
	my $end = "\n// END LON-CAPA Internal\n";

	if ($marker) {
	$content = $begin . $content if $marker eq 'start' or $marker eq 'both';
	$content .= $end if $marker eq 'end' or $marker eq 'both';
	}

	$content = "\n// <![CDATA[\n$content\n// ]]>\n";

	return htmltag('script', $content, {type => 'text/javascript'});
	};


##############################################	##############################################
##############################################	##############################################

Line 2167 sub generate_menu {	Line 2201 sub generate_menu {
# create the markup for the current $link and push it into @links.	# create the markup for the current $link and push it into @links.
# each entry consists of an image and a text optionally followed	# each entry consists of an image and a text optionally followed
# by a help link.	# by a help link.
push @links, $li->(	push(@links,$li->(
$a->(	$a->(
$img->("", {	$img->("", {
class => "LC_noBorder LC_middle",	class => "LC_noBorder LC_middle",
Line 2185 sub generate_menu {	Line 2219 sub generate_menu {
}).	}).
(defined($$link{help}) ?	(defined($$link{help}) ?
Apache::loncommon::help_open_topic($$link{help}) : ''),	Apache::loncommon::help_open_topic($$link{help}) : ''),
{class => "LC_menubuttons_inline_text"});	{class => "LC_menubuttons_inline_text"}));
}	}

# wrap categorytitle in <h3>, concatenate with	# wrap categorytitle in <h3>, concatenate with
Line 2195 sub generate_menu {	Line 2229 sub generate_menu {
# such that each element looks like:	# such that each element looks like:
# <div><h3>title</h3><ul><li>...</li>...</ul></div>	# <div><h3>title</h3><ul><li>...</li>...</ul></div>
# the category won't be added if there aren't any links	# the category won't be added if there aren't any links
push @categories,	push(@categories,
$div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).	$div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),	$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
{class=>"LC_Box LC_400Box"}) if scalar(@links);	{class=>"LC_Box LC_400Box"})) if scalar(@links);
}	}

# wrap the joined @categories in another <div> (column layout)	# wrap the joined @categories in another <div> (column layout)
return $div->(join('', @categories), {class => "LC_columnSection"});	return $div->(join('', @categories), {class => "LC_columnSection"});
}	}

	##############################################
	##############################################

	=pod

	=item &start_funclist

	Start list of available functions

	Typically used to offer a simple list of available functions
	at top or bottom of page.
	All available functions/actions for the current page
	should be included in this list.

	If the optional headline text is not provided, a default text will be used.


	Related routines:
	=over 4
	add_item_funclist
	end_funclist
	=back


	Inputs: (optional) headline text

	Returns: HTML code with function list start

	=cut

	##############################################
	##############################################

	sub start_funclist {
	my($legendtext)=@_;
	$legendtext=&mt('Functions') if !$legendtext;
	return "<fieldset>\n<legend>$legendtext</legend>\n"
	.'<ul class="LC_funclist">'."\n";
	}


	##############################################
	##############################################

	=pod

	=item &add_item_funclist

	Adds an item to the list of available functions

	Related routines:
	=over 4
	start_funclist
	end_funclist
	=back

	Inputs: content item with text and link to function

	Returns: HTML code with list item for funclist

	=cut

	##############################################
	##############################################

	sub add_item_funclist {
	my($content) = @_;
	return '<li>'.$content.'</li>'."\n";
	}

	##############################################
	##############################################

	=pod

	=item &end_funclist

	End list of available functions

	Related routines:
	=over 4
	start_funclist
	add_item_funclist
	=back

	Inputs: ./.

	Returns: HTML code with function list end

	=cut

	##############################################
	##############################################

	sub end_funclist {
	my($r)=@_;
	return "</ul>\n</fieldset>\n";
	}

1;	1;

__END__	__END__

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

Removed from v.1.223
changed lines
	Added in v.1.236