--- loncom/interface/lonhtmlcommon.pm	2010/08/07 19:23:50	1.281
+++ loncom/interface/lonhtmlcommon.pm	2011/10/11 13:12:23	1.285.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.281 2010/08/07 19:23:50 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.285.2.2 2011/10/11 13:12:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,8 +60,14 @@ 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)=@_;
@@ -78,6 +84,11 @@ sub raw_href_to_link {
    return $message;
 }
 
+sub entity_encode {
+    my ($text)=@_;
+    return &HTML::Entities::encode($text, '<>&"');
+}
+
 ##############################################
 ##############################################
 
@@ -121,7 +132,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;
@@ -1231,22 +1242,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';
@@ -1265,7 +1260,7 @@ sub htmlareaselectactive {
               .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();
     my $fullpage = 'false';
-    my $dragmath_prefix;
+    my ($dragmath_prefix,$dragmath_helpicon,$dragmath_whitespace);
     if (ref($args) eq 'HASH') {
         if (exists($args->{'lang'})) {
             if ($args->{'lang'} ne '') {
@@ -1280,6 +1275,8 @@ sub htmlareaselectactive {
         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");
             }
         }
     }
@@ -1383,6 +1380,16 @@ sub htmlareaselectactive {
              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.'";
+         }
      }
 ';
 
@@ -1602,7 +1609,7 @@ returns: nothing
     sub add_breadcrumb_tool {
         my ($category, @html) = @_;
         return unless @html;
-        if (!defined(%tools)) { 
+        if (!keys(%tools)) { 
             %tools = ( navigation => [], tools => [], advtools => []);
         }
 
@@ -1610,7 +1617,9 @@ returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) { 
             s/align="(right|left)"//; 
-            s/<span.*?\/span>// if $category ne 'advtools'; 
+            if (($category ne 'advtools') && ($category ne 'tools')) {
+                s/<span.*?\/span>//;
+            }
         } 
 
         push @{$tools{$category}}, @html;
@@ -1642,7 +1651,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" } });
@@ -2104,30 +2113,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";
             }
         }
     }
@@ -2428,6 +2437,7 @@ 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;
@@ -2479,11 +2489,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})
                             }), {
@@ -2636,6 +2650,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'} });