--- loncom/interface/lonhtmlcommon.pm 2004/10/21 11:18:06 1.94
+++ loncom/interface/lonhtmlcommon.pm 2005/02/17 08:29:42 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.94 2004/10/21 11:18:06 foxr Exp $
+# $Id: lonhtmlcommon.pm,v 1.103 2005/02/17 08:29:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,7 +80,7 @@ sub authorbombs {
foreach (keys %bombs) {
if ($_=~/^$udom\/$uname\//) {
return '<a href="/adm/bombs/'.$url.
- '"><img src="/adm/lonMisc/bomb.gif" border="0" /></a>'.
+ '"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" border="0" /></a>'.
&Apache::loncommon::help_open_topic('About_Bombs');
}
}
@@ -127,7 +127,7 @@ 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\:/) {
@@ -141,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
@@ -287,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;
@@ -319,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;
}
@@ -737,13 +759,14 @@ sub Create_PrgWin {
$prog_state{'type'}=$type;
if ($type eq 'popup') {
$prog_state{'window'}='popwin';
+ my $html=&Apache::lonxml::xmlbegin();
#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story
&r_print($r,'<script>'.
"var popwin;
function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
- "popwin.document.writeln(\'<html><head><title>$title</title></head>".
+ "popwin.document.writeln(\'".$html."<head><title>$title</title></head>".
"<body bgcolor=\"#88DDFF\">".
"<h4>$heading</h4>".
"<form name=popremain>".
@@ -877,23 +900,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) {
- my $escaped_path = &Apache::loncommon::escape_single($path);
- $linkpath="javascript:$form.action='$escaped_path';$form.submit();";
- }
- my $escaped_linkpath = &Apache::loncommon::escape_single($linkpath);
- my $escaped_target = &Apache::loncommon::escape_single($target);
- $output.='<a href="'.$escaped_linkpath.'"'.($target?' target="'.$escaped_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;
@@ -905,15 +930,15 @@ sub crumbs {
# --------------------- A function that generates a window for the spellchecker
sub spellheader {
- my $nothing = &javascript_nothing();
+ my $html=&Apache::lonxml::xmlbegin();
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=window.open('/adm/rat/empty.html','spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+ checkwin.document.writeln('$html<head></head><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 -->