[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface lonhtmlcommon.pm

[raeburn]

raeburn		Sun May 15 23:57:33 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Include text for the six icons on the far right of the inline menu.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.285 loncom/interface/lonhtmlcommon.pm:1.285.2.1
--- loncom/interface/lonhtmlcommon.pm:1.285	Mon Jan  3 13:10:12 2011
+++ loncom/interface/lonhtmlcommon.pm	Sun May 15 23:57:32 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.285 2011/01/03 13:10:12 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.285.2.1 2011/05/15 23:57:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1611,7 +1611,9 @@
         @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;