--- loncom/interface/lonhtmlcommon.pm 2003/06/20 16:13:06 1.26
+++ loncom/interface/lonhtmlcommon.pm 2003/12/29 17:11:53 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.26 2003/06/20 16:13:06 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.35 2003/12/29 17:11:53 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,7 @@ html.
package Apache::lonhtmlcommon;
use Time::Local;
+use Apache::lonlocal;
use strict;
@@ -181,6 +182,16 @@ sub date_setter {
document.$formname.$dname\_day.value = 30;
}
}
+
+ function $dname\_opencalendar() {
+ var calwin=window.open(
+"/adm/announcements?pickdate=yes&formname=$formname&element=$dname&month="+
+document.$formname.$dname\_month.value+"&year="+
+document.$formname.$dname\_year.value,
+ "LONCAPAcal",
+ "height=350,width=350,scrollbars=yes,resizable=yes,menubar=no");
+
+ }
</script>
ENDJS
$result .= " <nobr><select name=\"$dname\_month\" ".$special.' '.
@@ -192,7 +203,7 @@ ENDJS
for(my $m = 1;$m <=$#Months;$m++) {
$result .= " <option value=\"$m\" ";
$result .= "selected " if ($m-1 == $month);
- $result .= "> $Months[$m] </option>\n";
+ $result .= "> ".&mt($Months[$m])." </option>\n";
}
$result .= " </select>\n";
$result .= " <input type=\"text\" name=\"$dname\_day\" ".
@@ -207,23 +218,26 @@ ENDJS
$result .= " <option value=\"$h\" ";
$result .= "selected " if ($hour == $h);
$result .= "> ";
+ my $timest='';
if ($h == 0) {
- $result .= "12 am";
+ $timest .= "12 am";
} elsif($h == 12) {
- $result .= "12 noon";
+ $timest .= "12 noon";
} elsif($h < 12) {
- $result .= "$h am";
+ $timest .= "$h am";
} else {
- $result .= $h-12 ." pm";
+ $timest .= $h-12 ." pm";
}
- $result .= " </option>\n";
+ $timest=&mt($timest);
+ $result .= $timest." </option>\n";
}
$result .= " </select>\n";
$result .= " <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.
"value=\"$min\" size=\"3\" /> m\n";
$result .= " <input type=\"text\" name=\"$dname\_second\" ".$special.' '.
"value=\"$sec\" size=\"3\" /> s\n";
- $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
+ $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
+ &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
return $result;
}
@@ -274,7 +288,7 @@ sub get_date_from_form {
}
if (defined($ENV{'form.'.$dname.'_hour'})) {
my $tmphour = $ENV{'form.'.$dname.'_hour'};
- if (($tmphour =~ /^\d+$/) && ($tmphour > 0) && ($tmphour < 32)) {
+ if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
$hour = $tmphour;
}
}
@@ -297,7 +311,9 @@ sub get_date_from_form {
}
}
if (($year<70) || ($year>137)) { return undef; }
- if (eval(&timelocal($sec,$min,$hour,$day,$month,$year))) {
+ if (defined($sec) && defined($min) && defined($hour) &&
+ defined($day) && defined($month) && defined($year) &&
+ eval(&timelocal($sec,$min,$hour,$day,$month,$year))) {
return &timelocal($sec,$min,$hour,$day,$month,$year);
} else {
return undef;
@@ -385,6 +401,9 @@ the selection box is set to document.$fo
$size: the size (number of lines) of the selection box.
+$onchange: javascript to use when the value is changed. Enclosed in
+double quotes, ""s, not single quotes.
+
Returns: a perl string as described.
=cut
@@ -392,7 +411,7 @@ Returns: a perl string as described.
##############################################
##############################################
sub StatusOptions {
- my ($status, $formName,$size)=@_;
+ my ($status, $formName,$size,$onchange)=@_;
$size = 1 if (!defined($size));
if (! defined($status)) {
$status = 'Active';
@@ -409,9 +428,12 @@ sub StatusOptions {
my $Str = '';
$Str .= '<select name="Status"';
- if(defined($formName) && $formName ne '') {
+ if(defined($formName) && $formName ne '' && ! defined($onchange)) {
$Str .= ' onchange="document.'.$formName.'.submit()"';
}
+ if (defined($onchange)) {
+ $Str .= ' onchange="'.$onchange.'"';
+ }
$Str .= ' size="'.$size.'" ';
$Str .= '>'."\n";
$Str .= '<option value="Active" '.$OpSel1.'>'.
@@ -728,7 +750,8 @@ sub Create_PrgWin {
"<body bgcolor=\"#88DDFF\">".
"<h4>$heading</h4>".
"<form name=popremain>".
- "<input type=text size=55 name=remaining value=Starting></form>".
+ '<input type="text" size="55" name="remaining" value="'.
+ &mt('Starting').'"></form>'.
"</body></html>\');".
"popwin.document.close();".
"</script>");
@@ -763,16 +786,16 @@ sub Increment_PrgWin {
if (int ($time_est/60) > 0) {
my $min = int($time_est/60);
my $sec = $time_est % 60;
- $time_est = $min.' minutes';
+ $time_est = $min.' '.&mt('minutes');
if ($min < 10) {
if ($sec > 1) {
- $time_est.= ', '.$sec.' seconds';
+ $time_est.= ', '.$sec.' '.&mt('seconds');
} elsif ($sec > 0) {
- $time_est.= ', '.$sec.' second';
+ $time_est.= ', '.$sec.' '.&mt('second');
}
}
} else {
- $time_est .= ' seconds';
+ $time_est .= ' '.&mt('seconds');
}
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
if ($lasttime > 9) {
@@ -783,13 +806,23 @@ sub Increment_PrgWin {
$lasttime = sprintf("%3.2f",$lasttime);
}
if ($lasttime == 1) {
- $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
+ $lasttime = '('.$lasttime.' '.&mt('second for').' '.$extraInfo.')';
} else {
- $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
+ $lasttime = '('.$lasttime.' '.&mt('seconds for').' '.$extraInfo.')';
+ }
+ #
+ my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
+ my $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 'explorer' && $user_os =~ 'mac') {
+ $lasttime = '';
}
$r->print('<script>popwin.document.popremain.remaining.value="'.
$$prog_state{'done'}.'/'.$$prog_state{'max'}.
- ': '.$time_est.' remaining '.$lasttime.'";'.'</script>');
+ ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');
$$prog_state{'laststart'}=&Time::HiRes::time();
$r->rflush();
}
@@ -802,6 +835,26 @@ sub Close_PrgWin {
$r->rflush();
}
+
+# ------------------------------------------------------- Puts directory header
+
+sub crumbs {
+ my ($uri,$target,$prefix)=@_;
+ my $output='<br /><tt><b><font size="+2">'.$prefix.'/';
+ if ($ENV{'user.adv'}) {
+ my $path=$prefix.'/';
+ foreach (split('/',$uri)) {
+ unless ($_) { next; }
+ $path.=$_.'/';
+ $output.='<a href="'.$path.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';
+ }
+ } else {
+ $output.=$uri;
+ }
+ return $output.'</font></b></tt><br />';
+}
+
+
1;
__END__