--- loncom/interface/lonhtmlcommon.pm	2010/07/09 14:40:20	1.280
+++ loncom/interface/lonhtmlcommon.pm	2010/08/30 02:55:17	1.283
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.280 2010/07/09 14:40:20 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.283 2010/08/30 02:55:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,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;
@@ -1212,23 +1212,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="";
@@ -1247,22 +1231,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';
@@ -1275,22 +1243,45 @@ sub htmlarea_lang {
 # ----------------------------------------- Script to activate only some fields
 
 sub htmlareaselectactive {
-    my @fields=@_;
+    my ($args) = @_; 
     unless (&htmlareabrowser()) { return ''; }
     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.',
     		}
     	);
     }
@@ -1301,9 +1292,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");
@@ -1315,24 +1307,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");
@@ -1343,14 +1351,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 />';
+            .'</script>';
     return $output;
 }
 
@@ -2440,11 +2475,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})
                             }), {