--- loncom/interface/lonhtmlcommon.pm	2010/02/17 18:42:38	1.265.2.1
+++ loncom/interface/lonhtmlcommon.pm	2010/03/11 12:15:19	1.268
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.265.2.1 2010/02/17 18:42:38 faziophi Exp $
+# $Id: lonhtmlcommon.pm,v 1.268 2010/03/11 12:15:19 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1061,7 +1061,7 @@ sub Increment_PrgWin {
     # 
     my $str;
     if ($min == 0 && $sec > 1) {
-        $str = '[_2] seconds';
+        $str = '[_1] seconds';
     } elsif ($min == 1 && $sec > 1) {
         $str = '1 minute [_2] seconds';
     } elsif ($min == 1 && $sec < 2) {
@@ -1258,7 +1258,7 @@ sub disablelink {
     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>';
+    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 {
@@ -1283,7 +1283,6 @@ sub htmlarea_lang {
 sub htmlareaselectactive {
     my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }
-    #if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
     my $output='<script type="text/javascript" defer="defer">'."\n"
               .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();
@@ -1357,8 +1356,7 @@ sub htmlareaselectactive {
 '; 
     $output.="\nwindow.status='Activated Editfields';\n"
             .'// ]]>'."\n"
-            .'</script><br />'.
-	&disablelink(@fields);
+            .'</script><br />';
     return $output;
 }