--- loncom/interface/lonhtmlcommon.pm 2004/07/03 18:49:42 1.79
+++ loncom/interface/lonhtmlcommon.pm 2004/11/30 08:06:38 1.100
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.79 2004/07/03 18:49:42 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.100 2004/11/30 08:06:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -117,15 +117,22 @@ sub store_recent {
time.'&'.&Apache::lonnet::escape($value) });
}
+sub remove_recent {
+ my ($area,$names)=@_;
+ my $file=&recent_filename($area);
+ return &Apache::lonnet::del($file,$names);
+}
+
sub select_recent {
my ($area,$fieldname,$event)=@_;
my %recent=&Apache::lonnet::dump(&recent_filename($area));
my $return="\n<select name='$fieldname'".
- ($event?" onChange='$event'":'').
+ ($event?" onchange='$event'":'').
">\n<option value=''>--- ".&mt('Recent')." ---</option>";
foreach (sort keys %recent) {
unless ($_=~/^error\:/) {
- $return.="\n<option value='$_'>".
+ my $escaped = &Apache::loncommon::escape_url($_);
+ $return.="\n<option value='$escaped'>".
&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
'</option>';
}
@@ -134,6 +141,30 @@ sub select_recent {
return $return;
}
+sub get_recent {
+ my ($area, $n) = @_;
+ my %recent=&Apache::lonnet::dump(&recent_filename($area));
+
+# Create hash with key as time and recent as value
+ my %time_hash = ();
+ foreach (keys %recent) {
+ my $thistime=(split(/\&/,$recent{$_}))[0];
+ $time_hash{$thistime} = $_;
+ }
+
+# Sort by decreasing time and return key value pairs
+ my %return_hash = ();
+ my $idx = 1;
+ foreach (reverse sort keys %time_hash) {
+ $return_hash{$time_hash{$_}} =
+ &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+ if ($n && ($idx++ >= $n)) {last;}
+ }
+
+ return %return_hash;
+}
+
+
=pod
@@ -280,7 +311,7 @@ sub date_setter {
document.$formname.$dname\_day.value = 30;
}
}
-
+
function $dname\_disable() {
document.$formname.$dname\_month.disabled=true;
document.$formname.$dname\_day.disabled=true;
@@ -312,64 +343,62 @@ document.$formname.$dname\_year.value,
}
</script>
ENDJS
- $result .= " <nobr><select name=\"$dname\_month\" ".$special.' '.
- $state.' '.
- "onChange=\"javascript:$dname\_checkday()\" >\n";
+ $result .= ' <nobr>';
+ my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
# Month
my @Months = qw/January February March April May June
July August September October November December/;
# Pad @Months with a bogus value to make indexing easier
unshift(@Months,'If you can read this an error occurred');
- if ($includeempty) { $result.="<option value=''></option>"; }
+ if ($includeempty) { $monthselector.="<option value=''></option>"; }
for(my $m = 1;$m <=$#Months;$m++) {
- $result .= " <option value=\"$m\" ";
- $result .= "selected " if ($m-1 eq $month);
- $result .= "> ".&mt($Months[$m])." </option>\n";
+ $monthselector .= qq{ <option value="$m" };
+ $monthselector .= "selected " if ($m-1 eq $month);
+ $monthselector .= '> '.&mt($Months[$m]).' </option>';
}
- $result .= " </select>\n";
+ $monthselector.= ' </select>';
# Day
- $result .= " <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
- "value=\"$mday\" size=\"3\" ".$special.' '.
- "onChange=\"javascript:$dname\_checkday()\" />\n";
+ my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
# Year
- $result .= " <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
- "value=\"$year\" size=\"5\" ".$special.' '.
- "onChange=\"javascript:$dname\_checkday()\" />\n";
- $result .= " ";
- if (! $no_hh_mm_ss) {
- # Hours
- $result .= " <select name=\"$dname\_hour\" ".$special." ".$state.' '.
- ">\n";
- if ($includeempty) { $result.="<option value=''></option>"; }
- for (my $h = 0;$h<24;$h++) {
- $result .= " <option value=\"$h\" ";
- $result .= "selected " if (defined($hour) && $hour == $h);
- $result .= "> ";
- my $timest='';
- if ($h == 0) {
- $timest .= "12 am";
- } elsif($h == 12) {
- $timest .= "12 noon";
- } elsif($h < 12) {
- $timest .= "$h am";
- } else {
- $timest .= $h-12 ." pm";
- }
- $timest=&mt($timest);
- $result .= $timest." </option>\n";
- }
- $result .= " </select>\n";
- $result .= " <input type=\"text\" name=\"$dname\_minute\" ".
- $special.' '.
- $state.' '.
- "value=\"$min\" size=\"3\" /> m\n";
- $result .= " <input type=\"text\" name=\"$dname\_second\" ".
- $special.' '.
- $state.' '.
- "value=\"$sec\" size=\"3\" /> s\n";
+ 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 >};
+ if ($includeempty) {
+ $hourselector.=qq{<option value=''></option>};
+ }
+ for (my $h = 0;$h<24;$h++) {
+ $hourselector .= qq{<option value="$h" };
+ $hourselector .= "selected " if (defined($hour) && $hour == $h);
+ $hourselector .= ">";
+ my $timest='';
+ if ($h == 0) {
+ $timest .= "12 am";
+ } elsif($h == 12) {
+ $timest .= "12 noon";
+ } elsif($h < 12) {
+ $timest .= "$h am";
+ } else {
+ $timest .= $h-12 ." pm";
+ }
+ $timest=&mt($timest);
+ $hourselector .= $timest." </option>\n";
}
- $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
- &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
+ $hourselector .= " </select>\n";
+ my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
+ my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
+ my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+ #
+ if ($no_hh_mm_ss) {
+ $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
+ $monthselector,$dayselector,$yearselector,
+ $cal_link,'</a>');
+ } else {
+ $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
+ $monthselector,$dayselector,$yearselector,
+ $hourselector,$minuteselector,$secondselector,
+ $cal_link,'</a>');
+ }
+ $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
return $result;
}
@@ -519,6 +548,27 @@ sub javascript_nothing {
return $nothing;
}
+##############################################
+##############################################
+sub javascript_docopen {
+ # safari does not understand document.open() and loads "text/html"
+ my $nothing = "''";
+ my $user_browser;
+ my $user_os;
+ $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
+ $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
+ if (! defined($user_browser) || ! defined($user_os)) {
+ (undef,$user_browser,undef,undef,undef,$user_os) =
+ &Apache::loncommon::decode_user_agent();
+ }
+ if ($user_browser eq 'safari' && $user_os =~ 'mac') {
+ $nothing = "document.clear()";
+ } else {
+ $nothing = "document.open('text/html','replace')";
+ }
+ return $nothing;
+}
+
##############################################
##############################################
@@ -772,20 +822,24 @@ sub Increment_PrgWin {
$$prog_state{'done'} *
($$prog_state{'max'}-$$prog_state{'done'});
$time_est = int($time_est);
- if (int ($time_est/60) > 0) {
- my $min = int($time_est/60);
- my $sec = $time_est % 60;
- $time_est = $min.' '.&mt('minutes');
- if ($min < 10) {
- if ($sec > 1) {
- $time_est.= ', '.$sec.' '.&mt('seconds');
- } elsif ($sec > 0) {
- $time_est.= ', '.$sec.' '.&mt('second');
- }
- }
- } else {
- $time_est .= ' '.&mt('seconds');
+ #
+ my $min = int($time_est/60);
+ my $sec = $time_est % 60;
+ #
+ my $str;
+ if ($min == 0 && $sec > 1) {
+ $str = '[_2] seconds';
+ } elsif ($min == 1 && $sec > 1) {
+ $str = '1 minute [_2] seconds';
+ } elsif ($min == 1 && $sec < 2) {
+ $str = '1 minute';
+ } elsif ($min < 10 && $sec > 1) {
+ $str = '[_1] minutes, [_2] seconds';
+ } elsif ($min >= 10 || $sec < 2) {
+ $str = '[_1] minutes';
}
+ $time_est = &mt($str,$min,$sec);
+ #
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
if ($lasttime > 9) {
$lasttime = int($lasttime);
@@ -845,20 +899,25 @@ sub crumbs {
if (! defined($size)) {
$size = '+2';
}
+ if ($target) {
+ $target = ' target="'.
+ &Apache::loncommon::escape_single($target).'"';
+ }
my $output='';
unless ($noformat) { $output.='<br /><tt><b>'; }
$output.='<font size="'.$size.'">'.$prefix.'/';
if ($ENV{'user.adv'}) {
my $path=$prefix.'/';
- foreach (split('/',$uri)) {
- unless ($_) { next; }
- $path.=$_;
+ foreach my $dir (split('/',$uri)) {
+ if (! $dir) { next; }
+ $path .= $dir;
unless ($path eq $uri) { $path.='/'; }
- my $linkpath=$path;
- if ($form) {
- $linkpath="javascript:$form.action='$path';$form.submit();";
- }
- $output.='<a href="'.$linkpath.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';
+ my $linkpath = &Apache::loncommon::escape_single($path);
+ if ($form) {
+ $linkpath=
+ qq{javascript:$form.action='$linkpath';$form.submit();};
+ }
+ $output.=qq{<a href="$linkpath" $target>$dir</a>/};
}
} else {
$output.=$uri;
@@ -867,6 +926,35 @@ sub crumbs {
return $output.'</font>'.($noformat?'':'</b></tt><br />');
}
+# --------------------- A function that generates a window for the spellchecker
+
+sub spellheader {
+ my $nothing = &javascript_nothing();
+ return (<<ENDCHECK);
+<script type="text/javascript">
+//<!-- BEGIN LON-CAPA Internal
+var checkwin;
+
+function spellcheckerwindow() {
+ checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+ checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+ checkwin.document.close();
+}
+// END LON-CAPA Internal -->
+</script>
+ENDCHECK
+}
+
+# ---------------------------------- Generate link to spell checker for a field
+
+sub spelllink {
+ my ($form,$field)=@_;
+ my $linktext=&mt('Check Spelling');
+ return (<<ENDLINK);
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { document.$form.onsubmit();};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+ENDLINK
+}
+
# ------------------------------------------------- Output headers for HTMLArea
sub htmlareaheaders {
@@ -895,14 +983,14 @@ sub htmlareaaddbuttons {
config.registerButton('ed_math','LaTeX Inline',
'/htmlarea/images/ed_math.gif',false,
function(editor,id) {
- editor.surroundHTML('<m>\$','\$</m>');
+ editor.surroundHTML(' <m>\$','\$</m> ');
}
);
config.registerButton('ed_math_eqn','LaTeX Equation',
'/htmlarea/images/ed_math_eqn.gif',false,
function(editor,id) {
editor.surroundHTML(
- '<center><m>\\\\[','\\\\]</m></center>');
+ ' \\n<center><m>\\\\[','\\\\]</m></center>\\n ');
}
);
config.toolbar.push(['ed_math','ed_math_eqn']);
@@ -916,7 +1004,7 @@ sub disablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+ return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
}
sub enablelink {
@@ -924,7 +1012,7 @@ sub enablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+ return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
}
# ----------------------------------------- Script to activate only some fields
@@ -1003,8 +1091,8 @@ returns: nothing
my @Crumbs;
sub breadcrumbs {
- my ($color,$component,$component_help,$function,$domain,$menulink) =
- @_;
+ my ($color,$component,$component_help,$function,$domain,$menulink,
+ $helplink) = @_;
if (! defined($color)) {
if (! defined($function)) {
$function = &Apache::loncommon::get_users_function();
@@ -1055,7 +1143,7 @@ returns: nothing
} @Crumbs
);
$links .= '->' if ($links ne '');
- $links .= '<b>'.$last->{'text'}.'</b>';
+ $links .= '<b>'.&mt($last->{'text'}).'</b>';
#
my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));
@@ -1066,7 +1154,9 @@ returns: nothing
# if ($bug ne '') {
# $icons .= &Apache::loncommon::help_open_bug($bug);
# }
- $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+ if ($helplink ne 'nohelp') {
+ $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+ }
if ($icons ne '') {
$Str .= $icons.' ';
}
@@ -1075,12 +1165,7 @@ returns: nothing
#
if (defined($component)) {
$Str .= '<td align="right" bgcolor="'.$color.'">'.
- '<font size="+1">'.&mt($component).'</font>';
- if (defined($component_help)) {
- $Str .=
- &Apache::loncommon::help_open_topic($component_help);
- }
- $Str.= '</td>';
+ '<font size="+1">'.&mt($component).'</font></td>';
}
$Str .= '</tr></table>'."\n";
#