--- loncom/interface/lonhtmlcommon.pm	2010/06/18 09:06:29	1.279
+++ loncom/interface/lonhtmlcommon.pm	2010/08/07 19:23:50	1.281
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.279 2010/06/18 09:06:29 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.281 2010/08/07 19:23:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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="";
@@ -1275,22 +1259,43 @@ 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;
+    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'};
+            }
+        }
+    }
     $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 +1306,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 +1321,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 +1365,31 @@ 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;
+     }
+';
+
+    }
     $output.="\nwindow.status='Activated Editfields';\n"
             .'// ]]>'."\n"
-            .'</script><br />';
+            .'</script>';
     return $output;
 }
 
@@ -1809,15 +1848,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[
@@ -1864,7 +1903,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 = ();
@@ -1894,7 +1933,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".