--- loncom/interface/lonhtmlcommon.pm 2011/12/08 21:37:46 1.295 +++ loncom/interface/lonhtmlcommon.pm 2011/12/21 21:25:40 1.297 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.295 2011/12/08 21:37:46 www Exp $ +# $Id: lonhtmlcommon.pm,v 1.297 2011/12/21 21:25:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,7 +72,7 @@ sub java_not_enabled { sub coursepreflink { my ($text,$category)=@_; if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { - return '&"').'">'.$text.''; + return '&"').'">'.$text.''; } else { return ''; } @@ -95,7 +95,7 @@ sub direct_parm_link { $filter=&entity_encode($filter); $part=&entity_encode($part); if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) { - return "$linktext"; + return "$linktext"; } else { return $linktext; } @@ -991,82 +991,23 @@ Returns: none ######################################################## ######################################################## -my $uniq=0; -sub get_uniq_name { - $uniq++; - return 'uniquename'.$uniq; -} # Create progress sub Create_PrgWin { - my ($r, $title, $heading, $number_to_do,$type,$width,$formname, - $inputname)=@_; - if (!defined($type)) { $type='popup'; } - if (!defined($width)) { $width=55; } + my ($r,$number_to_do)=@_; my %prog_state; - $prog_state{'type'}=$type; - if ($type eq 'popup') { - $prog_state{'window'}='popwin'; - my $start_page = - &Apache::loncommon::start_page($title,undef, - {'only_body' => 1, - 'bgcolor' => '#88DDFF', - 'js_ready' => 1}); - my $end_page = &Apache::loncommon::end_page({'js_ready' => 1}); - - #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,&Apache::lonhtmlcommon::scripttag( - "var popwin; - function openpopwin () { - popwin=open(\'\',\'popwin\',\'width=400,height=100\');". - "popwin.document.writeln(\'".$start_page. - "