--- loncom/interface/lonhtmlcommon.pm 2003/01/14 22:01:56 1.11 +++ loncom/interface/lonhtmlcommon.pm 2004/02/16 22:28:55 1.49 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.11 2003/01/14 22:01:56 minaeibi Exp $ +# $Id: lonhtmlcommon.pm,v 1.49 2004/02/16 22:28:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,8 +56,120 @@ html. package Apache::lonhtmlcommon; use Time::Local; +use Time::HiRes; +use Apache::lonlocal; use strict; + +############################################## +############################################## + +=pod + +=item authorbombs + +=cut + +############################################## +############################################## + +sub authorbombs { + my $url=shift; + $url=&Apache::lonnet::declutter($url); + my ($udom,$uname)=($url=~/^(\w+)\/(\w+)\//); + my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); + foreach (keys %bombs) { + if ($_=~/^$udom\/$uname\//) { + return '<a href="/adm/bombs/'.$url. + '"><img src="/adm/lonMisc/bomb.gif" border="0" /></a>'. + &Apache::loncommon::help_open_topic('About_Bombs'); + } + } + return ''; +} + +############################################## +############################################## + +sub recent_filename { + my $area=shift; + return 'nohist_recent_'.&Apache::lonnet::escape($area); +} + +sub store_recent { + my ($area,$name,$value)=@_; + my $file=&recent_filename($area); + my %recent=&Apache::lonnet::dump($file); + if (scalar(keys(%recent))>10) { +# remove oldest value + my $oldest=time; + my $delkey=''; + foreach (keys %recent) { + my $thistime=(split(/\&/,$recent{$_}))[0]; + if ($thistime<$oldest) { + $oldest=$thistime; + $delkey=$_; + } + } + &Apache::lonnet::del($file,[$delkey]); + } +# store new value + &Apache::lonnet::put($file,{ $name => + time.'&'.&Apache::lonnet::escape($value) }); +} + +sub select_recent { + my ($area,$fieldname,$event)=@_; + my %recent=&Apache::lonnet::dump(&recent_filename($area)); + my $return="\n<select name='$fieldname'". + ($event?" onChange='$event'":''). + ">\n<option value=''>--- ".&mt('Recent')." ---</option>"; + foreach (sort keys %recent) { + unless ($_=~/^error\:/) { + $return.="\n<option value='$_'>". + &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]). + '</option>'; + } + } + $return.="\n</select>\n"; + return $return; +} + + +=pod + +=item textbox + +=cut + +############################################## +############################################## +sub textbox { + my ($name,$value,$size,$special) = @_; + $size = 40 if (! defined($size)); + my $Str = '<input type="text" name="'.$name.'" size="'.$size.'" '. + 'value="'.$value.'" '.$special.' />'; + return $Str; +} + +############################################## +############################################## + +=pod + +=item checkbox + +=cut + +############################################## +############################################## +sub checkbox { + my ($name,$value) = @_; + my $Str = '<input type="checkbox" name="'.$name.'"'. + ($value?' checked="1"':'').' />'; + return $Str; +} + ############################################## ############################################## @@ -65,6 +177,9 @@ use strict; =item &date_setter +&date_setter returns html and javascript for a compact date-setting form. +To retrieve values from it, use &get_date_from_form(). + Inputs =over 4 @@ -82,19 +197,37 @@ The current setting for this time parame An undefined value is taken to indicate the value is the current time. Also, to be explicit, a value of 'now' also indicates the current time. +=item $special + +Additional html/javascript to be associated with each element in +the date_setter. See lonparmset for example usage. + +=back + +Bugs + +The method used to restrict user input will fail in the year 2400. + =cut ############################################## ############################################## sub date_setter { - my ($formname,$dname,$currentvalue) = @_; + my ($formname,$dname,$currentvalue,$special,$includeempty) = @_; if (! defined($currentvalue) || $currentvalue eq 'now') { - $currentvalue = time; + unless ($includeempty) { + $currentvalue = time; + } else { + $currentvalue = 0; + } } # other potentially useful values: wkday,yrday,is_daylight_savings - my ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = - localtime($currentvalue); - $year += 1900; + my ($sec,$min,$hour,$mday,$month,$year)=('','','','','',''); + if ($currentvalue) { + ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = + localtime($currentvalue); + $year += 1900; + } my $result = "\n<!-- $dname date setting form -->\n"; $result .= <<ENDJS; <script language="Javascript"> @@ -128,57 +261,76 @@ 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 .= " <select name=\"$dname\_month\" ". + $result .= " <nobr><select name=\"$dname\_month\" ".$special.' '. "onChange=\"javascript:$dname\_checkday()\" >\n"; 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>"; } for(my $m = 1;$m <=$#Months;$m++) { $result .= " <option value=\"$m\" "; - $result .= "selected " if ($m-1 == $month); - $result .= "> $Months[$m] </option>\n"; + $result .= "selected " if ($m-1 eq $month); + $result .= "> ".&mt($Months[$m])." </option>\n"; } $result .= " </select>\n"; $result .= " <input type=\"text\" name=\"$dname\_day\" ". - "value=\"$mday\" size=\"3\" ". + "value=\"$mday\" size=\"3\" ".$special.' '. "onChange=\"javascript:$dname\_checkday()\" />\n"; $result .= " <input type=\"year\" name=\"$dname\_year\" ". - "value=\"$year\" size=\"5\" ". + "value=\"$year\" size=\"5\" ".$special.' '. "onChange=\"javascript:$dname\_checkday()\" />\n"; $result .= " "; - $result .= " <select name=\"$dname\_hour\" >\n"; + $result .= " <select name=\"$dname\_hour\" ".$special." >\n"; + if ($includeempty) { $result.="<option value=''></option>"; } for (my $h = 0;$h<24;$h++) { $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\" ". + $result .= " <input type=\"text\" name=\"$dname\_minute\" ".$special.' '. "value=\"$min\" size=\"3\" /> m\n"; - $result .= " <input type=\"text\" name=\"$dname\_second\" ". + $result .= " <input type=\"text\" name=\"$dname\_second\" ".$special.' '. "value=\"$sec\" size=\"3\" /> s\n"; - $result .= "<!-- 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; } ############################################## ############################################## +=pod + =item &get_date_from_form +get_date_from_form retrieves the date specified in an &date_setter form. + Inputs: =over 4 @@ -217,7 +369,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; } } @@ -239,7 +391,10 @@ sub get_date_from_form { $year = $tmpyear - 1900; } } - if (eval(&timelocal($sec,$min,$hour,$day,$month,$year))) { + if (($year<70) || ($year>137)) { return undef; } + 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; @@ -249,174 +404,100 @@ sub get_date_from_form { ############################################## ############################################## -sub AscendOrderOptions { - my ($order, $page, $formName)=@_; +=pod - my $OpSel1 = ''; - my $OpSel2 = ''; +=item &pjump_javascript_definition() - if($order eq 'Ascending') { - $OpSel1 = ' selected'; - } else { - $OpSel2 = ' selected'; - } +Returns javascript defining the 'pjump' function, which opens up a +parameter setting wizard. - my $Str = ''; - $Str .= '<select name="'.(($page)?$page:'').'Ascend"'; - if($formName) { - $Str .= ' onchange="document.'.$formName.'.submit()"'; - } - $Str .= '>'."\n"; - $Str .= '<option'.$OpSel1.'>Ascending</option>'."\n". - '<option'.$OpSel2.'>Descending</option>'."\n"; - $Str .= '</select>'."\n"; +=cut +############################################## +############################################## +sub pjump_javascript_definition { + my $Str = <<END; + function pjump(type,dis,value,marker,ret,call) { + parmwin=window.open("/adm/rat/parameter.html?type="+escape(type) + +"&value="+escape(value)+"&marker="+escape(marker) + +"&return="+escape(ret) + +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms", + "height=350,width=350,scrollbars=no,menubar=no"); + } +END return $Str; } -sub MapOptions { - my ($data, $page, $formName)=@_; - my $Str = ''; - $Str .= '<select name="'; - $Str .= (($page)?$page:'').'Maps"'; - if($formName) { - $Str .= ' onchange="document.'.$formName.'.submit()"'; - } - $Str .= '>'."\n"; +############################################## +############################################## - my $selected = 0; - foreach my $sequence (split(':',$data->{'orderedSequences'})) { - $Str .= '<option'; - if($data->{$page.'Maps'} eq $data->{$sequence.':title'}) { - $Str .= ' selected'; - $selected = 1; - } - $Str .= '>'.$data->{$sequence.':title'}.'</option>'."\n"; - } - $Str .= '<option'; - if(!$selected) { - $Str .= ' selected'; - } - $Str .= '>All Maps</option>'."\n"; +=pod - $Str .= '</select>'."\n"; +=item &javascript_nothing() - return $Str; -} +Return an appropriate null for the users browser. This is used +as the first arguement for window.open calls when you want a blank +window that you can then write to. -sub ProblemOptions { - my ($data, $page, $map, $formName)=@_; - my $Str = ''; - $Str .= '<select name="'; - $Str .= (($page)?$page:'').'ProblemSelect"'; - if($formName) { - $Str .= ' onchange="document.'.$formName.'.submit()"'; - } - $Str .= '>'."\n"; +=cut - my $selected = 0; - foreach my $sequence (split(':',$data->{'orderedSequences'})) { - if($data->{$sequence.':title'} eq $map || $map eq 'All Maps') { - foreach my $problem (split(':', $data->{$sequence.':problems'})) { - $Str .= '<option'; - if($data->{$page.'ProblemSelect'} eq - $data->{$problem.':title'}) { - $Str .= ' selected'; - $selected = 1; - } - $Str .= '>'.$data->{$problem.':title'}.'</option>'."\n"; - } - } +############################################## +############################################## +sub javascript_nothing { + # mozilla and other browsers work with "''", but IE on mac does not. + 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(); } - $Str .= '<option'; - if(!$selected) { - $Str .= ' selected'; + if ($user_browser eq 'explorer' && $user_os =~ 'mac') { + $nothing = "'javascript:void(0);'"; } - $Str .= '>All Problems</option>'."\n"; - - $Str .= '</select>'."\n"; - - return $Str; + return $nothing; } -sub PartOptions { - my ($data, $page, $parts, $formName)=@_; - my $Str = ''; - - if(!defined($parts)) { - return ''; - } - $Str .= '<select name="'; - $Str .= (($page)?$page:'').'PartSelect"'; - if($formName) { - $Str .= ' onchange="document.'.$formName.'.submit()"'; - } - $Str .= '>'."\n"; - - my $selected = 0; - foreach my $part (@$parts) { - $Str .= '<option'; - if($data->{$page.'PartSelect'} eq $part) { - $Str .= ' selected'; - $selected = 1; - } - $Str .= '>'.$part.'</option>'."\n"; - } - $Str .= '<option'; - if(!$selected) { - $Str .= ' selected'; - } - $Str .= '>All Parts</option>'."\n"; +############################################## +############################################## - $Str .= '</select>'."\n"; +=pod - return $Str; -} +=item &StatusOptions() -sub StudentOptions { - my ($cache, $students, $selectedName, $page, $formName)=@_; +Returns html for a selection box which allows the user to choose the +enrollment status of students. The selection box name is 'Status'. - my $Str = ''; - $Str .= '<select name="'.(($page)?$page:'').'Student"'; - if($formName) { - $Str .= ' onchange="document.'.$formName.'.submit()"'; - } - $Str .= '>'."\n"; +Inputs: - my $selected=0; +$status: the currently selected status. If undefined the value of +$ENV{'form.Status'} is taken. If that is undefined, a value of 'Active' +is used. - foreach (@$students) { - $Str .= '<option'; - if($selectedName eq $_) { - $Str .= ' selected'; - $selected = 1; - } - $Str .= '>'; - $Str .= $cache->{$_.':fullname'}; - $Str .= '</option>'."\n"; - } +$formname: The name of the form. If defined the onchange attribute of +the selection box is set to document.$formname.submit(). - $Str .= '<option'; - if($selectedName eq 'No Student Selected') { - $Str .= ' selected'; - $selected = 1; - } - $Str .= '>No Student Selected</option>'."\n"; +$size: the size (number of lines) of the selection box. - $Str .= '<option'; - if(!$selected) { - $Str .= ' selected'; - } - $Str .= '>All Students</option>'."\n"; +$onchange: javascript to use when the value is changed. Enclosed in +double quotes, ""s, not single quotes. - $Str .= '</select>'."\n"; +Returns: a perl string as described. - return $Str; -} +=cut +############################################## +############################################## sub StatusOptions { - my ($status, $formName)=@_; + my ($status, $formName,$size,$onchange)=@_; + $size = 1 if (!defined($size)); + if (! defined($status)) { + $status = 'Active'; + $status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); + } my $OpSel1 = ''; my $OpSel2 = ''; @@ -428,186 +509,283 @@ 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'.$OpSel1.'>Active</option>'."\n"; - $Str .= '<option'.$OpSel2.'>Expired</option>'."\n"; - $Str .= '<option'.$OpSel3.'>Any</option>'."\n"; + $Str .= '<option value="Active" '.$OpSel1.'>'. + &mt('Currently Enrolled').'</option>'."\n"; + $Str .= '<option value="Expired" '.$OpSel2.'>'. + &mt('Previously Enrolled').'</option>'."\n"; + $Str .= '<option value="Any" '.$OpSel3.'>'. + &mt('Any Enrollment Status').'</option>'."\n"; $Str .= '</select>'."\n"; } -sub MultipleSectionSelect { - my ($sections,$selectedSections)=@_; +######################################################## +######################################################## - my $Str = ''; - $Str .= '<select name="Section" multiple="true" size="4">'."\n"; +=pod - foreach (sort @$sections) { - $Str .= '<option'; - foreach my $selected (@$selectedSections) { - if($_ eq $selected) { - $Str .= ' selected=""'; - } - } - $Str .= '>'.$_.'</option>'."\n"; - } - $Str .= '</select>'."\n"; +=item Progess Window Handling Routines - return $Str; -} +These routines handle the creation, update, increment, and closure of +progress windows. The progress window reports to the user the number +of items completed and an estimate of the time required to complete the rest. -sub Title { - my ($pageName)=@_; +=over 4 - my $Str = ''; - $Str .= '<html><head><title>'.$pageName.'</title></head>'."\n"; - $Str .= &Apache::loncommon::bodytag($pageName)."\n"; - $Str .= '<script>window.focus(); window.width=500;window.height=500;'; - $Str .= '</script>'."\n"; +=item &Create_PrgWin - return $Str; -} +Writes javascript to the client to open a progress window and returns a +data structure used for bookkeeping. -=pod +Inputs -=item &CreateTableHeadings() +=over 4 -This function generates the column headings for the chart. +=item $r Apache request -=over 4 +=item $title The title of the progress window -Inputs: $CacheData, $keyID, $headings, $spacePadding +=item $heading A description (usually 1 line) of the process being initiated. -$CacheData: pointer to a hash tied to the cached data database +=item $number_to_do The total number of items being processed. -$keyID: a pointer to an array containing the names of the data -held in a column and is used as part of a key into $CacheData +=back -$headings: The names of the headings for the student information +Returns a hash containing the progress state data structure. -$spacePadding: The spaces to go between columns -Output: $Str +=item &Update_PrgWin -$Str: A formatted string of the table column headings. +Updates the text in the progress indicator. Does not increment the count. +See &Increment_PrgWin. -=back +Inputs: -=cut +=over 4 -sub CreateHeadings { - my ($data,$keyID,$headings,$displayString,$format)=@_; - my $Str=''; - my $formatting = ''; - - for(my $index=0; $index<(scalar @$headings); $index++) { - my $currentHeading=$headings->[$index]; - if($format eq 'preformatted') { - my @dataLength=split(//,$currentHeading); - my $length=scalar @dataLength; - $formatting = (' 'x - ($data->{$keyID->[$index].':columnWidth'}-$length)); - } - my $linkdata=$keyID->[$index]; +=item $r Apache request - my $tempString = $displayString; - $tempString =~ s/LINKDATA/$linkdata/; - $tempString =~ s/DISPLAYDATA/$currentHeading/; - $tempString =~ s/FORMATTING/$formatting/; +=item $prog_state Pointer to the data structure returned by &Create_PrgWin - $Str .= $tempString; - } +=item $displaystring The string to write to the status indicator - return $Str; -} +=back + +Returns: none -=pod -=item &FormatStudentInformation() +=item Increment_PrgWin -This function produces a formatted string of the student\'s information: -username, domain, section, full name, and PID. +Increment the count of items completed for the progress window by 1. + +Inputs: =over 4 -Input: $cache, $name, $keyID, $spacePadding +=item $r Apache request + +=item $prog_state Pointer to the data structure returned by Create_PrgWin -$cache: This is a pointer to a hash that is tied to the cached data +=item $extraInfo A description of the items being iterated over. Typically +'student'. -$name: The name and domain of the current student in name:domain format +=back -$keyID: A pointer to an array holding the names used to +Returns: none -remove data from the hash. They represent the name of the data to be removed. -$spacePadding: Extra spaces that represent the space between columns +=item Close_PrgWin -Output: $Str +Closes the progress window. -$Str: Formatted string. +Inputs: -=back +=over 4 -=cut +=item $r Apache request -sub FormatStudentInformation { - my ($data,$name,$keyID,$displayString,$format)=@_; - my $Str=''; - my $currentColumn; - - for(my $index=0; $index<(scalar @$keyID); $index++) { - $currentColumn=$data->{$name.':'.$keyID->[$index]}; - - if($format eq 'preformatted') { - my @dataLength=split(//,$currentColumn); - my $length=scalar @dataLength; - $currentColumn.= (' 'x - ($data->{$keyID->[$index].':columnWidth'}-$length)); - } +=item $prog_state Pointer to the data structure returned by Create_PrgWin - my $tempString = $displayString; - $tempString =~ s/DISPLAYDATA/$currentColumn/; +=back - $Str .= $tempString; - } +Returns: none - return $Str; -} +=back + +=cut + +######################################################## +######################################################## # Create progress sub Create_PrgWin { - my ($r, $title, $heading)=@_; - $r->print('<script>'. - "popwin=open(\'\',\'popwin\',\'width=400,height=100\');". - "popwin.document.writeln(\'<html><body bgcolor=\"#88DDFF\">". - "<title>$title</title>". + my ($r, $title, $heading, $number_to_do,$type,$formname,$inputname)=@_; + if (!defined($type)) { $type='popup'; } + my %prog_state; + $prog_state{'type'}=$type; + if ($type eq 'popup') { + $prog_state{'window'}='popwin'; + #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>". + "<body bgcolor=\"#88DDFF\">". "<h4>$heading</h4>". "<form name=popremain>". - "<input type=text size=35 name=remaining value=Starting></form>". + '<input type="text" size="55" name="remaining" value="'. + &mt('Starting').'"></form>'. "</body></html>\');". - "popwin.document.close();". - "</script>"); + "popwin.document.close();}". + "\nwindow.setTimeout(openpopwin,0)</script>"); + $prog_state{'formname'}='popremain'; + $prog_state{'inputname'}="remaining"; + } elsif ($type eq 'inline') { + $prog_state{'window'}='window'; + if (!$formname) { + &r_print($r,'<form name="progresswindow">'); + $prog_state{'formname'}='progresswindow'; + } else { + $prog_state{'formname'}=$formname; + } + if (!$inputname) { + &r_print($r,'<input type="text" name="progressline" />'); + $prog_state{'inputname'}="progressline"; + } else { + $prog_state{'inputname'}=$inputname; + + } + if (!$formname) { &r_print($r,'</form>'); } + &Update_PrgWin($r,\%prog_state,&mt('Starting')); + } - $r->rflush(); + $prog_state{'done'}=0; + $prog_state{'firststart'}=&Time::HiRes::time(); + $prog_state{'laststart'}=&Time::HiRes::time(); + $prog_state{'max'}=$number_to_do; + + return %prog_state; } # update progress sub Update_PrgWin { - my ($displayString,$r)=@_; - $r->print('<script>popwin.document.popremain.remaining.value="'. - $displayString.'";</script>'); - $r->rflush(); + my ($r,$prog_state,$displayString)=@_; + &r_print($r,'<script>'.$$prog_state{'window'}.'.document.'. + $$prog_state{'formname'}.'.'. + $$prog_state{'inputname'}.'.value="'. + $displayString.'";</script>'); + $$prog_state{'laststart'}=&Time::HiRes::time(); +} + +# increment progress state +sub Increment_PrgWin { + my ($r,$prog_state,$extraInfo)=@_; + $$prog_state{'done'}++; + my $time_est= (&Time::HiRes::time() - $$prog_state{'firststart'})/ + $$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 $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'}; + if ($lasttime > 9) { + $lasttime = int($lasttime); + } elsif ($lasttime < 0.01) { + $lasttime = 0; + } else { + $lasttime = sprintf("%3.2f",$lasttime); + } + if ($lasttime == 1) { + $lasttime = '('.$lasttime.' '.&mt('second for').' '.$extraInfo.')'; + } else { + $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($r,'<script>'.$$prog_state{'window'}.'.document.'. + $$prog_state{'formname'}.'.'. + $$prog_state{'inputname'}.'.value="'. + $$prog_state{'done'}.'/'.$$prog_state{'max'}. + ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>'); + $$prog_state{'laststart'}=&Time::HiRes::time(); } # close Progress Line sub Close_PrgWin { - my ($r)=@_; - $r->print('<script>popwin.close()</script>'."\n"); - $r->rflush(); + my ($r,$prog_state)=@_; + if ($$prog_state{'type'} eq 'popup') { + &r_print($r,'<script>popwin.close()</script>'."\n"); + } elsif ($$prog_state{'type'} eq 'inline') { + &Update_PrgWin($r,$prog_state,&mt('Done')); + } + undef(%$prog_state); } +sub r_print { + my ($r,$to_print)=@_; + if ($r) { + $r->print($to_print); + $r->rflush(); + } else { + print($to_print); + } +} + +# ------------------------------------------------------- Puts directory header + +sub crumbs { + my ($uri,$target,$prefix,$form)=@_; + my $output='<br /><tt><b><font size="+2">'.$prefix.'/'; + if ($ENV{'user.adv'}) { + my $path=$prefix.'/'; + foreach (split('/',$uri)) { + unless ($_) { next; } + $path.=$_; + 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>/'; + } + } else { + $output.=$uri; + } + unless ($uri=~/\/$/) { $output=~s/\/$//; } + return $output.'</font></b></tt><br />'; +} + + 1; + __END__