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.182.4.11 and 1.222

version 1.182.4.11, 2010/01/23 22:23:53	version 1.222, 2009/06/08 18:04:45
Line 62 use Apache::lonlocal;	Line 62 use Apache::lonlocal;
use Apache::lonnet;	use Apache::lonnet;
use LONCAPA;	use LONCAPA;

sub coursepreflink {
my ($text,$category)=@_;
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
return '<a href="/adm/courseprefs?phase=display&actions='.$category.'">'.$text.'</a>';
} else {
return '';
}
}

sub raw_href_to_link {
my ($message)=@_;
$message=~s/(https?\:\/\/[^\s\'\"]+)(\s\|$)/<a href="$1"><tt>$1<\/tt><\/a>$2/gi;
return $message;
}

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

Line 97 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 178 sub authorbombs {	Line 163 sub authorbombs {
foreach (keys %bombs) {	foreach (keys %bombs) {
if ($_=~/^$udom\/$uname\//) {	if ($_=~/^$udom\/$uname\//) {
return '<a href="/adm/bombs/'.$url.	return '<a href="/adm/bombs/'.$url.
'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" 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 237 sub select_recent {	Line 222 sub select_recent {
unless ($value =~/^error\:/) {	unless ($value =~/^error\:/) {
my $escaped = &Apache::loncommon::escape_url($value);	my $escaped = &Apache::loncommon::escape_url($value);
&Apache::loncommon::inhibit_menu_check(\$escaped);	&Apache::loncommon::inhibit_menu_check(\$escaped);
if ($area eq 'residx') {
next if ((!&Apache::lonnet::allowed('bre',$value)) && (!&Apache::lonnet::allowed('bro',$value)));
}
$return.="\n<option value='$escaped'>".	$return.="\n<option value='$escaped'>".
&unescape((split(/\&/,$recent{$value}))[1]).	&unescape((split(/\&/,$recent{$value}))[1]).
'</option>';	'</option>';
Line 436 sub date_setter {	Line 418 sub date_setter {
($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue);	($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue);
}	}
unless ($wasdefined) {	unless ($wasdefined) {
	($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
if (($defhour) \|\| ($defmin) \|\| ($defsec)) {	if (($defhour) \|\| ($defmin) \|\| ($defsec)) {
($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
$sec=($defsec?$defsec:0);	$sec=($defsec?$defsec:0);
$min=($defmin?$defmin:0);	$min=($defmin?$defmin:0);
$hour=($defhour?$defhour:0);	$hour=($defhour?$defhour:0);
Line 514 document.$formname.$dname\_year.value,	Line 496 document.$formname.$dname\_year.value,
// ]]>	// ]]>
</script>	</script>
ENDJS	ENDJS
$result .= ' <span style="white-space: nowrap;">';	$result .= ' <span class="LC_nobreak">';
my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};	my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
# Month	# Month
my @Months = qw/January February March April May June	my @Months = qw/January February March April May June
Line 523 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="selected"' if ($m-1 eq $month);	$monthselector .= "selected " if ($m-1 eq $month);
$monthselector .= '> '.&mt($Months[$m]).' </option>'."\n";	$monthselector .= '> '.&mt($Months[$m]).' </option>';
}	}
$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="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};	my $yearselector = qq{<input type="year" 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="selected"' if (defined($hour) && $hour == $h);	$hourselector .= "selected " if (defined($hour) && $hour == $h);
$hourselector .= ">";	$hourselector .= ">";
my $timest='';	my $timest='';
if ($h == 0) {	if ($h == 0) {
Line 627 Inputs:	Line 609 Inputs:

=item $dname	=item $dname

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

=item $defaulttime	=item $defaulttime

Line 996 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">'."\n".	&r_print($r,'<script type="text/javascript">'.
'// <![CDATA['."\n".	'// <![CDATA['.
"var popwin;	"var popwin;
function openpopwin () {	function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".	popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
"popwin.document.writeln(\'".$start_page.	"popwin.document.writeln(\'".$start_page.
"<h4>".&mt("$heading")."<\/h4>".	"<h4>".&mt("$heading")."<\/h4>".
"<form action= \"\" name=\"popremain\" method=\"post\">".	"<form action=\"\" name=\"popremain\" method=\"post\">".
'<input type="text" size="'.$width.'" name="remaining" value="'.	'<input type="text" size="'.$width.'" name="remaining" value="'.
&mt('Starting').'" /><\\/form>'.$end_page.	&mt('Starting').'" /><\\/form>'.$end_page.
"\');".	"\');".
"popwin.document.close();}".	"popwin.document.close();}".
"\nwindow.setTimeout(openpopwin,0)\n".	"\nwindow.setTimeout(openpopwin,0)".
'// ]]>'."\n".	'// ]]>'.
'</script>');	'</script>');
$prog_state{'formname'}='popremain';	$prog_state{'formname'}='popremain';
$prog_state{'inputname'}="remaining";	$prog_state{'inputname'}="remaining";
Line 1043 sub Create_PrgWin {	Line 1025 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">'."\n".	&r_print($r,'<script type="text/javascript">'.
'// <![CDATA['."\n".	'// <![CDATA['.
$$prog_state{'window'}.'.document.'.	$$prog_state{'window'}.'.document.'.
$$prog_state{'formname'}.'.'.	$$prog_state{'formname'}.'.'.
$$prog_state{'inputname'}.'.value="'.	$$prog_state{'inputname'}.'.value="'.
$displayString.'";'."\n".	$displayString.'";'.
'// ]]>'."\n".	'// ]]>'.
'</script>');	'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1103 sub Increment_PrgWin {	Line 1085 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>'."\n".	&r_print($r,'<script>'.
'// <![CDATA['."\n".	'// <![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.'";'."\n".	': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.
'// ]]>'."\n".	'// ]]>'.
'</script>');	'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1119 sub Increment_PrgWin {	Line 1101 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>'."\n".	&r_print($r,'<script>'.
'// <![CDATA['."\n".	'// <![CDATA['.
'popwin.close()'."n".	'popwin.close()'.
'// ]]>'."\n".	'// ]]>'.
'</script>'."\n");	'</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 1154 sub crumbs {	Line 1136 sub crumbs {
my $output='';	my $output='';
unless ($noformat) { $output.='<br /><tt><b>'; }	unless ($noformat) { $output.='<br /><tt><b>'; }
$output.='<font size="'.$size.'">'.$prefix.'/';	$output.='<font size="'.$size.'">'.$prefix.'/';
if (($env{'user.adv'}) \|\| ($env{'user.author'})) {	if ($env{'user.adv'}) {
my $path=$prefix.'/';	my $path=$prefix.'/';
foreach my $dir (split('/',$uri)) {	foreach my $dir (split('/',$uri)) {
if (! $dir) { next; }	if (! $dir) { next; }
Line 1204 sub spellheader {	Line 1186 sub spellheader {

my $nothing=&javascript_nothing();	my $nothing=&javascript_nothing();
return (<<ENDCHECK);	return (<<ENDCHECK);
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
//<!-- BEGIN LON-CAPA Internal	//<!-- BEGIN LON-CAPA Internal
var checkwin;	var checkwin;
Line 1290 sub htmlareaselectactive {	Line 1272 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">'
'// <![CDATA[';	.'// <![CDATA[';
my $lang = &htmlarea_lang();	my $lang = &htmlarea_lang();
foreach my $field (@fields) {	foreach my $field (@fields) {
$output.="	$output.="
Line 1304 sub htmlareaselectactive {	Line 1286 sub htmlareaselectactive {
oFCKeditor.Config['DefaultLanguage'] = '$lang';	oFCKeditor.Config['DefaultLanguage'] = '$lang';
}";	}";
}	}
$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 1345 Inputs: $component (the large text on th	Line 1327 Inputs: $component (the large text on th
$menulink (boolean, controls whether to include a link to /adm/menu)	$menulink (boolean, controls whether to include a link to /adm/menu)
$helplink (if 'nohelp' don't include the orange help link)	$helplink (if 'nohelp' don't include the orange help link)
$css_class (optional name for the class to apply to the table for CSS)	$css_class (optional name for the class to apply to the table for CSS)
	$no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
	when including the text on the right.
Returns a string containing breadcrumbs for the current page.	Returns a string containing breadcrumbs for the current page.

=item clear_breadcrumbs	=item clear_breadcrumbs
Line 1370 returns: nothing	Line 1354 returns: nothing
my @Crumbs;	my @Crumbs;

sub breadcrumbs {	sub breadcrumbs {
my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;	my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $CourseBreadcrumbs) = @_;
#	#
$css_class \|\|= 'LC_breadcrumbs';	$css_class \|\|= 'LC_breadcrumbs';
my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';	my $Str1 = '<div id="LC_head_subbox"><ol id="LC_MenuBreadcrumbs">';

	if($CourseBreadcrumbs){
	$Str1 = '<ul id="LC_CourseBreadcrumbs">';
	}

	my $Str = '';
#	#
# Make the faq and bug data cascade	# Make the faq and bug data cascade
my $faq = '';	my $faq = '';
my $bug = '';	my $bug = '';
my $help='';	my $help='';
# Crumb Symbol	# Crumb Symbol
my $crumbsymbol = '» ';	my $crumbsymbol = '» ';
# The last breadcrumb does not have a link, so handle it separately.	# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);	my $last = pop(@Crumbs);
#	#
# The first one should be the course or a menu link	# The first one should be the course or a menu link
if (!defined($menulink)) { $menulink=1; }	if (!defined($menulink)) { $menulink=1; }
if ($menulink) {	if ($menulink) {
my $description = 'Menu';	my $description = 'Menu';
my $no_mt_descr = 0;	my $no_mt_descr = 0;
Line 1395 returns: nothing	Line 1385 returns: nothing
$env{'course.'.$env{'request.course.id'}.'.description'};	$env{'course.'.$env{'request.course.id'}.'.description'};
$no_mt_descr = 1;	$no_mt_descr = 1;
}	}
unshift(@Crumbs,{	$menulink = { href =>'/adm/menu',
href =>'/adm/menu',	title =>'Go to main menu',
title =>'Go to main menu',	target =>'_top',
target =>'_top',	text =>$description,
text =>$description,	no_mt =>$no_mt_descr, };
no_mt =>$no_mt_descr,	if($last) {
});	#$last set, so we have some crumbs
	unshift(@Crumbs,$menulink);
	} else {
	#only menulink crumb present
	$last = $menulink;
	}
}	}
my $links .=	my $links = join "",
join($crumbsymbol,
map {	map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));	$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));	$bug = $_->{'bug'} if (exists($_->{'bug'}));
$help = $_->{'help'} if (exists($_->{'help'}));	$help = $_->{'help'} if (exists($_->{'help'}));
my $result = '<a href="'.$_->{'href'}.'" ';
if (defined($_->{'target'}) && $_->{'target'} ne '') {	my $result = htmltag( 'a',
$result .= 'target="'.$_->{'target'}.'" ';	$_->{no_mt} ? $_->{text} : mt($_->{text}),
}	{
if ($_->{'no_mt'}) {	href => $_->{href},
$result .='title="'.$_->{'title'}.'">'.	title => $_->{no_mt} ? $_->{title} : mt($_->{title}),
$_->{'text'}.'</a>';	target => $_->{target},
} else {	});
$result .='title="'.&mt($_->{'title'}).'">'.	$result = htmltag( 'li', $crumbsymbol.$result);
&mt($_->{'text'}).'</a>';	} @Crumbs;
}	#Workaround for edit course.
$result;	if(@Crumbs == 0 ){
} @Crumbs	$links .= '<li>' if ($links ne '');
);	} else {
$links .= $crumbsymbol if ($links ne '');	$links .= '<li>'.$crumbsymbol if ($links ne '');
	}
	#should the last Element be translated?
if ($last->{'no_mt'}) {	if ($last->{'no_mt'}) {
$links .= '<b>'.$last->{'text'}.'</b>';	$links .= '<b>'.$last->{'text'}.'</b>';
} else {	} else {
$links .= '<b>'.&mt($last->{'text'}).'</b>';	$links .= '<b>'.&mt($last->{'text'}).'</b>';
}	}
#	$links .= '</li>';
my $icons = '';	my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));	$faq = $last->{'faq'} if (exists($last->{'faq'}));
$bug = $last->{'bug'} if (exists($last->{'bug'}));	$bug = $last->{'bug'} if (exists($last->{'bug'}));
Line 1447 returns: nothing	Line 1443 returns: nothing
$faq,$bug);	$faq,$bug);
}	}
#	#
$Str .= $links.'</td>';

	if($CourseBreadcrumbs){
	$Str1 .= $links.'</ul>';
	} else {
	$Str1 .= $links.'</ol></div>';
	}
#	#
if (defined($component)) {	if (defined($component)) {
$Str .= '<td class="'.$css_class.'_component">';	$Str .= "\n".'<table class="'.$css_class.'">'
	.'<tr><td class="'.$css_class.'_component">';
if ($no_mt) {	if ($no_mt) {
$Str .= $component;	$Str .= $component;
} else {	} else {
Line 1459 returns: nothing	Line 1462 returns: nothing
if ($icons ne '') {	if ($icons ne '') {
$Str .= ' '.$icons;	$Str .= ' '.$icons;
}	}
$Str .= '</td>';	$Str .= '</td></tr></table>'."\n";
}	}
$Str .= '</tr></table>'."\n";
#	#
# Return the @Crumbs stack to what we started with	# Return the @Crumbs stack to what we started with
push(@Crumbs,$last);	push(@Crumbs,$last);
shift(@Crumbs);	shift(@Crumbs);
#	# Return a table and after that the breadcrumb's line
return $Str;	return "$Str\n$Str1";
}	}

sub clear_breadcrumbs {	sub clear_breadcrumbs {
Line 1612 ENDTWO	Line 1614 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);
}	}
$output .= qq\|	$output .= qq\|
<select name="roles" multiple="multiple" >\n\|;	<select name="roles" multiple="multiple">\n\|;
foreach my $role (@$roles) {	foreach my $role (@$roles) {
my $plrole;	my $plrole;
if ($role eq 'ow') {	if ($role eq 'ow') {
Line 1640 sub role_select_row {	Line 1638 sub role_select_row {
$plrole = &mt('Custom Role');	$plrole = &mt('Custom Role');
}	}
} else {	} else {
$plrole=&Apache::lonnet::plaintext($role,$crstype);	$plrole=&Apache::lonnet::plaintext($role);
}	}
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 1655 sub role_select_row {	Line 1653 sub role_select_row {

sub course_select_row {	sub course_select_row {
my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,	my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
$css_class,$crstype) = @_;	$css_class) = @_;
my $output = &row_title($title,$css_class);	my $output = &row_title($title,$css_class);
$output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype);	$output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles);
$output .= &row_closure();	$output .= &row_closure();
return $output;	return $output;
}	}

sub course_selection {	sub course_selection {
my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_;	my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
my $output = qq\|	my $output = qq\|
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 1692 sub course_selection {	Line 1690 sub course_selection {
// ]]>	// ]]>
</script>	</script>
\|;	\|;

my ($allcrs,$pickspec);
if ($crstype eq 'Community') {
$allcrs = &mt('All communities');
$pickspec = &mt('Pick specific communities:');
} else {
$allcrs = &mt('All courses');
$pickspec = &mt('Pick specific course(s):');
}

my $courseform='<b>'.&Apache::loncommon::selectcourse_link	my $courseform='<b>'.&Apache::loncommon::selectcourse_link
($formname,'pickcourse','pickdomain','coursedesc','',1,$crstype).'</b>';	($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
$output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.$allcrs.'<br />';	$output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
if ($totcodes > 0) {	if ($totcodes > 0) {
my $numtitles = @$codetitles;	my $numtitles = @$codetitles;
if ($numtitles > 0) {	if ($numtitles > 0) {
Line 1749 sub course_selection {	Line 1737 sub course_selection {
$output .= '</tr></table><br />';	$output .= '</tr></table><br />';
}	}
}	}
$output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1'".')" />'.$pickspec.' '.$courseform.'  <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";	$output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'  <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
return $output;	return $output;
}	}

Line 1842 sub course_custom_roles {	Line 1830 sub course_custom_roles {
#	#
sub topic_bar {	sub topic_bar {
my ($imgnum,$title) = @_;	my ($imgnum,$title) = @_;
return '	return '<div class="LC_topic_bar">'
<div class="LC_topic_bar">	.'<img src="/res/adm/pages/bl_step'.$imgnum.'.gif"'
<img alt="'.&mt('Step [_1]',$imgnum).	.' alt="'.&mt('Step [_1]',$imgnum).'" />'
'" src="/res/adm/pages/bl_step'.$imgnum.'.gif" /> '.$title.'	.' '.$title
</div>	.'</div>';
';
}	}

##############################################	##############################################
Line 1982 sub set_form_elements {	Line 1969 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') \|\| ($$elements{$name} eq 'hidden')) {	if ($$elements{$name} eq 'text') {
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 2017 sub set_form_elements {	Line 2004 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 2060 sub set_form_elements {	Line 2045 sub set_form_elements {
}	}
}	}
$output .= "	$output .= "
return;
}\n";	}\n";
return $output;	return $output;
}	}
Line 2103 END	Line 2087 END
}	}


	# USAGE: htmltag(element, content, {attribute => value,...});
	#
	# EXAMPLES:
	# - htmltag('a', 'this is an anchor', {href => 'www.example.com',
	# title => 'this is a title'})
	#
	# - You might want to set up needed tags like:
	#
	# my $h3 = sub { return htmltag( "h3", @_ ) };
	#
	# ... and use them: $h3->("This is a headline")
	#
	# - To set up a couple of tags, see sub inittags
	#
	# NOTES:
	# - Empty elements, such as <br/> are correctly terminated,
	# i.e. htmltag('br') returns <br/>
	# - Empty attributes (title="") are filtered out.
	# - The function will not check for deprecated attributes.
	#
	# OUTPUT: content enclosed in xhtml conform tags
	sub htmltag{
	return
	qq\|<$_[0]\|
	. join( '', map { qq\| $_="${$_[2]}{$_}"\| if ${$_[2]}{$_} } keys %{ $_[2] } )
	. ($_[1] ? qq\|>$_[1]</$_[0]>\| : qq\|/>\|). "\n";
	};


	# USAGE: inittags(@tags);
	#
	# EXAMPLES:
	# - my ($h1, $h2, $h3) = initTags( qw( h1 h2 h3 ) )
	# $h1->("This is a headline") #Returns: <h1>This is a headline</h1>
	#
	# NOTES: See sub htmltag for further information.
	#
	# OUTPUT: List of subroutines.
	sub inittags {
	my @tags = @_;
	return map { my $tag = $_;
	sub { return htmltag( $tag, @_ ) }
	} @tags;
	}


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

	# generate_menu
	#
	# Generates html markup for a menu.
	#
	# Inputs:
	# An array of following structure:
	# ({ categorytitle => 'Categorytitle',
	# items => [
	# {
	# linktext => 'Text to be displayed',
	# url => 'URL the link is pointing to, i.e. /adm/site?action=dosomething',
	# permission => 'Contains permissions as returned from lonnet::allowed(),
	# must evaluate to true in order to activate the link',
	# icon => 'icon filename',
	# alttext => 'alt text for the icon',
	# help => 'Name of the corresponding helpfile',
	# linktitle => 'Description of the link (used for title tag)'
	# },
	# ...
	# ]
	# },
	# ...
	# )
	#
	# Outputs: A scalar containing the html markup for the menu.

	# ---- Remove when done ----
	# This routine is part of the redesign of LON-CAPA and it's
	# subject to change during this project.
	# Don't rely on its current functionality as it might be
	# changed or removed.
	# --------------------------
	sub generate_menu {
	my @menu = @_;
	# subs for specific html elements
	my ($h3, $div, $ul, $li, $a, $img) = inittags( qw(h3 div ul li a img) );

	my @categories; # each element represents the entire markup for a category

	foreach my $category (@menu) {
	my @links; # contains the links for the current $category
	foreach my $link (@{$$category{items}}) {
	next unless $$link{permission};

	# create the markup for the current $link and push it into @links.
	# each entry consists of an image and a text optionally followed
	# by a help link.
	push @links, $li->(
	$a->(
	$img->("", {
	class => "LC_noBorder LC_middle",
	src => "/res/adm/pages/$$link{icon}",
	alt => mt(defined($$link{alttext}) ?
	$$link{alttext} : $$link{linktext})
	}), {
	href => $$link{url},
	title => mt($$link{linktitle})
	}).
	$a->(mt($$link{linktext}), {
	href => $$link{url},
	title => mt($$link{linktitle}),
	class => "LC_menubuttons_link"
	}).
	(defined($$link{help}) ?
	Apache::loncommon::help_open_topic($$link{help}) : ''),
	{class => "LC_menubuttons_inline_text"});
	}

	# wrap categorytitle in <h3>, concatenate with
	# joined and in <ul> tags wrapped @links
	# and wrap everything in an enclosing <div> and push it into
	# @categories
	# such that each element looks like:
	# <div><h3>title</h3><ul><li>...</li>...</ul></div>
	# the category won't be added if there aren't any links
	push @categories,
	$div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
	$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
	{class=>"LC_Box LC_400Box"}) if scalar(@links);
	}

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

1;	1;

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

Removed from v.1.182.4.11
changed lines
	Added in v.1.222