--- loncom/interface/lonhtmlcommon.pm	2010/01/26 05:22:03	1.264
+++ loncom/interface/lonhtmlcommon.pm	2011/06/03 13:00:39	1.290
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.264 2010/01/26 05:22:03 faziophi Exp $
+# $Id: lonhtmlcommon.pm,v 1.290 2011/06/03 13:00:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,13 +60,19 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use HTML::Entities();
 use LONCAPA;
 
+sub java_not_enabled {
+   return "\n".'<span class="LC_error">'.
+          &mt('The required Java applet could not be started. Please make sure to have Java installed and active in your browser.').
+          "</span>\n";
+}
 
 sub coursepreflink {
    my ($text,$category)=@_;
    if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
-      return '<a href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'">'.$text.'</a>';
+      return '<a href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
    } else {
       return '';
    }
@@ -78,6 +84,22 @@ sub raw_href_to_link {
    return $message;
 }
 
+sub entity_encode {
+    my ($text)=@_;
+    return &HTML::Entities::encode($text, '<>&"');
+}
+
+sub direct_parm_link {
+    my ($linktext,$symb,$filter,$part,$target)=@_;
+    $symb=&entity_encode($symb);
+    $filter=&entity_encode($filter);
+    $part=&entity_encode($part);
+    if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
+       return "<a href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";
+    } else {
+       return $linktext;
+    }
+}
 ##############################################
 ##############################################
 
@@ -90,7 +112,7 @@ Successful completion of an operation me
 sub confirm_success {
    my ($message,$failure)=@_;
    if ($failure) {
-      return '<span class="LC_error">'."\n"
+      return '<span class="LC_error" style="font-size: inherit;">'."\n"
             .'<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.&mt('Error').'" /> '."\n"
             .$message."\n"
             .'</span>'."\n";
@@ -121,7 +143,7 @@ sub dragmath_button {
     my ($textarea,$helpicon) = @_;
     my $help_text; 
     if ($helpicon) {
-        $help_text = &Apache::loncommon::help_open_topic('Authoring_Math_Editor');
+        $help_text = &Apache::loncommon::help_open_topic('Authoring_Math_Editor',undef,undef,undef,undef,'mathhelpicon_'.$textarea);
     }
     my $buttontext=&mt('Edit Math');
     return <<ENDDRAGMATH;
@@ -927,7 +949,7 @@ Returns: none
 
 =item Increment_PrgWin
 
-Increment the count of items completed for the progress window by 1.  
+Increment the count of items completed for the progress window by $step or 1 if no step is provided.
 
 Inputs:
 
@@ -940,6 +962,8 @@ Inputs:
 =item $extraInfo A description of the items being iterated over.  Typically
 'student'.
 
+=item $step (optional) counter step. Will be set to default 1 if ommited. step must be greater than 0 or empty.
+
 =back
 
 Returns: none
@@ -1049,30 +1073,25 @@ sub Update_PrgWin {
 
 # increment progress state
 sub Increment_PrgWin {
-    my ($r,$prog_state,$extraInfo)=@_;
-    $$prog_state{'done'}++;
+    my ($r,$prog_state,$extraInfo,$step)=@_;
+    $step = $step > 0 ? $step : 1;
+    $$prog_state{'done'} += $step;
+
+    # Catch (max modulo step) <> 0
+    my $current = $$prog_state{'done'};
+    my $last = ($$prog_state{'max'} - $current);
+    if ($last <= 0) {
+        $last = 1;
+        $current = $$prog_state{'max'};
+    }
+
     my $time_est= (&Time::HiRes::time() - $$prog_state{'firststart'})/
-        $$prog_state{'done'} *
-	($$prog_state{'max'}-$$prog_state{'done'});
+        $current * $last;
     $time_est = int($time_est);
     #
     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);
@@ -1081,27 +1100,24 @@ sub Increment_PrgWin {
     } 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 = '';
-    }
+
+    $sec = 0 if ($min >= 10); # Don't show seconds if remaining time >= 10 min.
+    $sec = 1 if ( ($min == 0) && ($sec == 0) ); # Little cheating: pretend to have 1 second remaining instead of 0 to have something to display
+
+    my $timeinfo =
+        &mt('[_1]/[_2]:'
+           .' [quant,_3,minute,minutes,] [quant,_4,second ,seconds ,]remaining'
+           .' ([quant,_5,second] for '.$extraInfo.')',
+            $current,
+            $$prog_state{'max'},
+            $min,
+            $sec,
+            $lasttime);
+
     &r_print($r,&Apache::lonhtmlcommon::scripttag(
         $$prog_state{'window'}.'.document.'.
         $$prog_state{'formname'}.'.'.
-        $$prog_state{'inputname'}.'.value="'.
-        $$prog_state{'done'}.'/'.$$prog_state{'max'}.
-        ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'
+        $$prog_state{'inputname'}.'.value="'.$timeinfo.'";'
     ));
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
@@ -1218,23 +1234,7 @@ sub spelllink {
 ENDLINK
 }
 
-# ------------------------------------------------- Output headers for HTMLArea
-
-{
-    my @htmlareafields;
-    sub init_htmlareafields {
-	undef(@htmlareafields);
-    }
-    
-    sub add_htmlareafields {
-	my (@newfields) = @_;
-	push(@htmlareafields,@newfields);
-    }
-
-    sub get_htmlareafields {
-	return @htmlareafields;
-    }
-}
+# ------------------------------------------------- Output headers for CKEditor
 
 sub htmlareaheaders {
 	my $s="";
@@ -1253,22 +1253,6 @@ ENDJQUERY
 
 # ----------------------------------------------------------------- Preferences
 
-sub disablelink {
-    my @fields=@_;
-    if (defined($#fields)) {
-	unless ($#fields>=0) { return ''; }
-    }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
-}
-
-sub enablelink {
-    my @fields=@_;
-    if (defined($#fields)) {
-	unless ($#fields>=0) { return ''; }
-    }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
-}
-
 # ------------------------------------------------- lang to use in html editor
 sub htmlarea_lang {
     my $lang='en';
@@ -1281,23 +1265,45 @@ sub htmlarea_lang {
 # ----------------------------------------- Script to activate only some fields
 
 sub htmlareaselectactive {
-    my @fields=@_;
+    my ($args) = @_; 
     unless (&htmlareabrowser()) { return ''; }
-    #if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
     my $output='<script type="text/javascript" defer="defer">'."\n"
               .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();
+    my $fullpage = 'false';
+    my ($dragmath_prefix,$dragmath_helpicon,$dragmath_whitespace);
+    if (ref($args) eq 'HASH') {
+        if (exists($args->{'lang'})) {
+            if ($args->{'lang'} ne '') {
+                $lang = $args->{'lang'};
+            }
+        }
+        if (exists($args->{'fullpage'})) { 
+            if ($args->{'fullpage'} eq 'true') {
+                $fullpage = $args->{'fullpage'};
+            }
+        }
+        if (exists($args->{'dragmath'})) {
+            if ($args->{'dragmath'} ne '') {
+                $dragmath_prefix = $args->{'dragmath'};
+                $dragmath_helpicon=&Apache::loncommon::lonhttpdurl("/adm/help/help.png");
+                $dragmath_whitespace=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/transparent1x1.gif");
+            }
+        }
+    }
     $output.='
     
     function containsBlockHtml(id) {
-		var re = $("#"+id).html().search(/(?:\&lt\;|\<)(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div)[\s]*((?:\/[\s]*(?:\&gt\;|\>)|(?:\&gt\;|\>)[\s\S]*(?:\&lt\;|\<)\/[\s]*\1[\s]*\(?:\&gt\;|\>))/im);
+		var re = $("#"+id).html().search(/(?:\&lt\;|\<)(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div)[\s]*((?:[\/]*[\s]*(?:\&gt\;|\>)|(?:\&gt\;|\>)[\s\S]*(?:\&lt\;|\<)\/[\s]*\1[\s]*\(?:\&gt\;|\>))/im);
     	return (re >= 0);
     }
     
     function startRichEditor(id) {
     	CKEDITOR.replace(id, 
     		{
-    			customConfig: "/ckeditor/loncapaconfig.js"
+    			customConfig: "/ckeditor/loncapaconfig.js",
+                        language : "'.$lang.'",
+                        fullPage : '.$fullpage.',
     		}
     	);
     }
@@ -1308,9 +1314,10 @@ sub htmlareaselectactive {
     
     function editorHandler(event) {
     	var rawid = $(this).attr("id");
-    	var id = new RegExp("LC_rt_(.*)").exec(rawid)[1]
+    	var id = new RegExp("LC_rt_(.*)").exec(rawid)[1];
     	event.preventDefault();
-    	if ($(this).hasClass("LC_enable_rt")) {
+    	var rt_enabled  = $(this).hasClass("LC_enable_rt");
+        if (rt_enabled) {
     		startRichEditor(id);
 			$("#LC_rt_"+id).html("<b>&laquo; Plain text</b>");
 			$("#LC_rt_"+id).attr("title", "Disable rich text formatting and edit in plain text");
@@ -1322,24 +1329,40 @@ sub htmlareaselectactive {
 			$("#LC_rt_"+id).attr("title", "Enable rich text formatting (bold, italic, etc.)");
 			$("#LC_rt_"+id).addClass("LC_enable_rt");
 			$("#LC_rt_"+id).removeClass("LC_disable_rt");
-		}
-	}
-    
+	}';
+    if ($dragmath_prefix ne '') {
+        $output .= "\n                 var visible = '';
+                                       if (rt_enabled) {
+                                           visible = 'none';
+                                       }
+                                       editmath_visibility(id,visible);\n";
+    }
+    $output .= '
+    }
     $(document).ready(function(){
 		$(".LC_richAlwaysOn").each(function() {
 			startRichEditor($(this).attr("id"));
 		});
 		$(".LC_richDetectHtml").each(function() {
 			var id = $(this).attr("id");
-			if(containsBlockHtml(id)) {
+                        var rt_enabled = containsBlockHtml(id);
+			if(rt_enabled) {
 				$(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Disable rich text formatting and edit in plain text\" class=\"LC_disable_rt\"><b>&laquo; Plain text</b></a></div>");				
 				startRichEditor(id);
-				$("#LC_rt_"+id).click(editorHandler);				
+				$("#LC_rt_"+id).click(editorHandler);
 			}
 			else {
 				$(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Enable rich text formatting (bold, italic, etc.)\" class=\"LC_enable_rt\"><b>Rich formatting &raquo;</b></a></div>");
 				$("#LC_rt_"+id).click(editorHandler);
-			}
+			}';
+    if ($dragmath_prefix ne '') {
+        $output .= "\n                 var visible = '';
+                                       if (rt_enabled) {
+                                           visible = 'none';
+                                       }
+                                       editmath_visibility(id,visible);\n";
+    }
+    $output .= '
 		});
 		$(".LC_richDefaultOn").each(function() {
 			var id = $(this).attr("id");
@@ -1350,15 +1373,41 @@ sub htmlareaselectactive {
 		$(".LC_richDefaultOff").each(function() {
 			var id = $(this).attr("id");
 			$(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Enable rich text formatting (bold, italic, etc.)\" class=\"LC_enable_rt\"><b>Rich formatting &raquo;</b></a></div>");
-			$("#LC_rt_"+id).click(editorHandler);			
+			$("#LC_rt_"+id).click(editorHandler);
 		});
-		
 	});
-'; 
+';
+    if ($dragmath_prefix ne '') {
+        $output .= '
+
+     function editmath_visibility(id,value) {
+
+         if ((id == "") || (id == null)) {
+             return;
+         }
+         var mathid = "'.$dragmath_prefix.'_"+id;
+         mathele = document.getElementById(mathid);
+         if (mathele == null) {
+             return;
+         }
+         mathele.style.display = value;
+         var mathhelpicon = "'.$dragmath_prefix.'helpicon'.'_"+id;
+         mathhelpiconele = document.getElementById(mathhelpicon);
+         if (mathhelpiconele == null) {
+             return;
+         }
+         if (value == "none") {
+             mathhelpiconele.src = "'.$dragmath_whitespace.'";
+         } else {
+             mathhelpiconele.src = "'.$dragmath_helpicon.'";
+         }
+     }
+';
+
+    }
     $output.="\nwindow.status='Activated Editfields';\n"
             .'// ]]>'."\n"
-            .'</script><br />'.
-	&disablelink(@fields);
+            .'</script>';
     return $output;
 }
 
@@ -1375,6 +1424,34 @@ sub htmlareabrowser {
     return 1;
 }
 
+#
+# Should the "return to content" link be shown?
+#
+
+sub show_return_link {
+
+    unless ($env{'request.course.id'}) { return 0; }
+    if ($env{'request.noversionuri'}=~m{^/priv/} ||
+        $env{'request.uri'}=~m{^/~}) { return 1; }
+
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
+        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
+
+        return if ($env{'form.register'});
+    }
+    return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
+             $env{'request.symb'} eq '')
+            ||
+            ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
+            ||
+            (($env{'request.noversionuri'}=~/^\/adm\//) &&
+             ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+             ($env{'request.noversionuri'}!~
+              m{^/adm/.*/(smppg|bulletinboard)($|\?)})
+           ));
+}
+
+
 ############################################################
 ############################################################
 
@@ -1440,8 +1517,9 @@ returns: nothing
         if ($menulink) {
             my $description = 'Menu';
             my $no_mt_descr = 0;
-            if (exists($env{'request.course.id'}) && 
-                $env{'request.course.id'} ne '') {
+            if ((exists($env{'request.course.id'})) && 
+                ($env{'request.course.id'} ne '') && 
+                ($env{'course.'.$env{'request.course.id'}.'.description'} ne '')) {
                 $description = 
                     $env{'course.'.$env{'request.course.id'}.'.description'};
                 $no_mt_descr = 1;
@@ -1459,22 +1537,28 @@ returns: nothing
                 $last = $menulink;
             }
         }
-        my $links = join "", 
+        my $links;
+        if ((&show_return_link) && (!$CourseBreadcrumbs)) {
+           $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' />",
+                            { href => '/adm/flip?postdata=return:',
+                              title => &mt("Back to most recent content resource") });
+        }
+        $links.= join "", 
              map {
                  $faq  = $_->{'faq'}  if (exists($_->{'faq'}));
                  $bug  = $_->{'bug'}  if (exists($_->{'bug'}));
                  $help = $_->{'help'} if (exists($_->{'help'}));
 
-                 my $result = $_->{no_mt} ? $_->{text} : mt($_->{text});
+                 my $result = $_->{no_mt} ? $_->{text} : &mt($_->{text});
 
                  if ($_->{href}){
-                     $result = htmltag( 'a', $result, 
+                     $result = &htmltag( 'a', $result, 
                        { href   => $_->{href},
-                         title  => $_->{no_mt} ? $_->{title} : mt($_->{title}),
+                         title  => $_->{no_mt} ? $_->{title} : &mt($_->{title}),
                          target => $_->{target}, });
                  }
 
-                 $result = htmltag( 'li', "$result $crumbsymbol");
+                 $result = &htmltag( 'li', "$result $crumbsymbol");
              } @Crumbs;
 
         #should the last Element be translated?
@@ -1482,7 +1566,10 @@ returns: nothing
         my $lasttext = $last->{'no_mt'} ? $last->{'text'} 
                      : mt( $last->{'text'} );
 
-        $links .= htmltag( 'li', htmltag('b', $lasttext), {title => $lasttext});
+        # last breadcrumb is the first order heading of a page
+        # for course breadcrumbs it's just bold
+        $links .= &htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
+                $lasttext), {title => $lasttext});
 
         my $icons = '';
         $faq  = $last->{'faq'}  if (exists($last->{'faq'}));
@@ -1504,23 +1591,23 @@ returns: nothing
 		
 
         unless ($CourseBreadcrumbs) {
-            $links = htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
+            $links = &htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
         } else {
-            $links = htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
+            $links = &htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
         }
 
         if ($component) {
-            $links = htmltag('span', 
+            $links = &htmltag('span', 
                              ( $no_mt ? $component : mt($component) ).
                              ( $icons ? $icons : '' ),
                              { class => 'LC_breadcrumbs_component' } )
                              .$links;
         }
         
-        render_tools(\$links);
-        $links = htmltag('div', $links, 
+        &render_tools(\$links);
+        $links = &htmltag('div', $links, 
                         { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
-        render_advtools(\$links);
+        &render_advtools(\$links);
 
         # Return the @Crumbs stack to what we started with
         push(@Crumbs,$last);
@@ -1567,7 +1654,7 @@ returns: nothing
     sub add_breadcrumb_tool {
         my ($category, @html) = @_;
         return unless @html;
-        if (!defined(%tools)) { 
+        if (!keys(%tools)) { 
             %tools = ( navigation => [], tools => [], advtools => []);
         }
 
@@ -1575,7 +1662,7 @@ returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) { 
             s/align="(right|left)"//; 
-            s/<span.*?\/span>// if $category ne 'advtools'; 
+#            s/<span.*?\/span>// if $category ne 'advtools'; 
         } 
 
         push @{$tools{$category}}, @html;
@@ -1607,7 +1694,7 @@ returns: nothing
 #TODO might split this in separate functions for each category
     sub render_tools {
         my ($breadcrumbs) = @_;
-        return unless defined %tools;
+        return unless (keys(%tools));
 
         my $navigation = list_from_array($tools{navigation}, 
                    { listattr => { class=>"LC_breadcrumb_tools_navigation" } });
@@ -1768,7 +1855,6 @@ ENDTWO
 
 } # End: row_count block for pick_box
 
-
 sub role_select_row {
     my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
     my $crstype = 'Course';
@@ -1814,15 +1900,15 @@ sub role_select_row {
 
 sub course_select_row {
     my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
-	$css_class,$crstype) = @_;
+	$css_class,$crstype,$standardnames) = @_;
     my $output = &row_title($title,$css_class);
-    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype);
+    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype,$standardnames);
     $output .= &row_closure();
     return $output;
 }
 
 sub course_selection {
-    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_;
+    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype,$standardnames) = @_;
     my $output = qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1869,7 +1955,7 @@ sub course_selection {
         if ($numtitles > 0) {
             $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
-               '<select name="'.$$codetitles[0].
+               '<select name="'.$standardnames->[0].
                '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
                ' <option value="-1" />Select'."\n";
             my @items = ();
@@ -1899,7 +1985,7 @@ sub course_selection {
             $output .= '</select></td>';
             for (my $i=1; $i<$numtitles; $i++) {
                 $output .= '<td>'.$$codetitles[$i].'<br />'."\n".
-                          '<select name="'.$$codetitles[$i].
+                          '<select name="'.$standardnames->[$i].
                           '" onChange="courseSet('."'$$codetitles[$i]'".')">'."\n".
                           '<option value="-1">&lt;-Pick '.$$codetitles[$i-1].'</option>'."\n".
                           '</select>'."\n".
@@ -1991,6 +2077,29 @@ sub course_custom_roles {
 }
 
 
+sub resource_info_box {
+   my ($symb,$onlyfolderflag)=@_;
+   my $return='';
+   if ($symb) {
+       $return=&Apache::loncommon::start_data_table();
+       my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symb);
+       my $folder=&Apache::lonnet::gettitle($map);
+       $return.=&Apache::loncommon::start_data_table_row().
+                    '<th>'.&mt('Folder:').'</th><td>'.$folder.'</td>'.
+                    &Apache::loncommon::end_data_table_row();
+       unless ($onlyfolderflag) {
+          $return.=&Apache::loncommon::start_data_table_row().
+                    '<th>'.&mt('Resource:').'</th><td>'.&Apache::lonnet::gettitle($symb).'</td>'.
+                    &Apache::loncommon::end_data_table_row();
+       }
+       $return.=&Apache::loncommon::end_data_table();
+    } else {
+       $return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';
+    }
+    return $return;
+
+}
+
 ##############################################
 ##############################################
 
@@ -2047,30 +2156,30 @@ sub echo_form_input {
         if ($key =~ /^form\.(.+)$/) {
             my $name = $1;
             my $match = 0;
-            if ((!@{$excluded}) || (!grep/^$name$/,@{$excluded})) {
-                if (defined($regexps)) {
-                    if (@{$regexps} > 0) {
-                        foreach my $regexp (@{$regexps}) {
-                            if ($name =~ /\Q$regexp\E/) {
-                                $match = 1;
-                                last;
-                            }
+            if (ref($excluded) eq 'ARRAY') {    
+                next if (grep(/^\Q$name\E$/,@{$excluded}));
+            }
+            if (ref($regexps) eq 'ARRAY') {
+                if (@{$regexps} > 0) {
+                    foreach my $regexp (@{$regexps}) {
+                        if ($name =~ /$regexp/) {
+                            $match = 1;
+                            last;
                         }
                     }
                 }
-                if (!$match) {
-                    if (ref($env{$key})) {
-                        foreach my $value (@{$env{$key}}) {
-                            $value = &HTML::Entities::encode($value,'<>&"');
-                            $output .= '<input type="hidden" name="'.$name.
-                                             '" value="'.$value.'" />'."\n";
-                        }
-                    } else {
-                        my $value = &HTML::Entities::encode($env{$key},'<>&"');
-                        $output .= '<input type="hidden" name="'.$name.
-                                             '" value="'.$value.'" />'."\n";
-                    }
+            }
+            next if ($match);
+            if (ref($env{$key}) eq 'ARRAY') {
+                foreach my $value (@{$env{$key}}) {
+                    $value = &HTML::Entities::encode($value,'<>&"');
+                    $output .= '<input type="hidden" name="'.$name.
+                               '" value="'.$value.'" />'."\n";
                 }
+            } else {
+                my $value = &HTML::Entities::encode($env{$key},'<>&"');
+                $output .= '<input type="hidden" name="'.$name.
+                           '" value="'.$value.'" />'."\n";
             }
         }
     }
@@ -2371,6 +2480,8 @@ returns: XHTML list as String.
 # \@items, {listattr => { class => 'abc', id => 'xyx' }, itemattr => {class => 'abc', id => 'xyx'}}
 sub list_from_array {
     my ($items, $args) = @_;
+    return unless (ref($items) eq 'ARRAY');
+    return unless scalar @$items;
     my ($ul, $li) = inittags( qw(ul li) );
     my $listitems = join '', map { $li->($_, $args->{itemattr}) } @$items;
     return $ul->( $listitems, $args->{listattr} );
@@ -2421,11 +2532,15 @@ sub generate_menu {
             # create the markup for the current $link and push it into @links.
             # each entry consists of an image and a text optionally followed 
             # by a help link.
+            my $src;
+            if ($$link{icon} ne '') {
+                $src = '/res/adm/pages/'.$$link{icon};
+            }
             push(@links,$li->(
                         $a->(
                             $img->("", {
                                 class => "LC_noBorder LC_middle",
-                                src   => "/res/adm/pages/$$link{icon}",
+                                src   => $src,
                                 alt   => mt(defined($$link{alttext}) ?
                                 $$link{alttext} : $$link{linktext})
                             }), {
@@ -2578,6 +2693,7 @@ returns: XHTML list as string.
 
 sub funclist_from_array {
     my ($items, $args) = @_;
+    return unless(ref($items) eq 'ARRAY');
     $args->{legend} ||= mt('Functions');
     return list_from_array( [$args->{legend}, @$items], 
                { listattr => {class => 'LC_funclist'} });