--- loncom/interface/lonhtmlcommon.pm	2012/05/29 01:11:30	1.317
+++ loncom/interface/lonhtmlcommon.pm	2012/10/08 10:26:34	1.326
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.317 2012/05/29 01:11:30 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.326 2012/10/08 10:26:34 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,9 +209,10 @@ dependencies for a web page uploaded dir
 =cut
 
 sub dependencycheck_js {
-    my ($symb,$title) = @_;
+    my ($symb,$title,$url) = @_;
     my $link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"').
-               '&title='.&HTML::Entities::encode($title,'<>&"');
+               '&title='.&HTML::Entities::encode($title,'<>&"').
+               '&url='.&HTML::Entities::encode($url,'<>&"');
     return <<ENDJS;
                 <script type="text/javascript">
                 // <![CDATA[
@@ -1100,6 +1101,7 @@ sub Close_PrgWin {
     undef(%$prog_state);
 }
 
+
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
@@ -1210,6 +1212,10 @@ ENDEDITOR
 <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
 <script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>
 <link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />
+
+<script type="text/javascript" src="/adm/spellchecker/js/jquery.spellchecker.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/adm/spellchecker/css/spellchecker.css" />
+
 ENDJQUERY
 	return $s;
 }
@@ -1225,6 +1231,17 @@ sub htmlarea_lang {
     return $lang;
 }
 
+# return javacsript to activate elements of .colorchooser with jpicker:
+# Caller is responsible for enclosing this in <script> tags:
+#
+sub color_picker {
+    return '
+$(document).ready(function(){
+    $.fn.jPicker.defaults.images.clientPath="/adm/jpicker/images/";
+    $(".colorchooser").jPicker({window: { position: {x: "screenCenter", y: "bottom"}}});
+});';
+}
+
 # ----------------------------------------- Script to activate only some fields
 
 sub htmlareaselectactive {
@@ -1344,6 +1361,8 @@ sub htmlareaselectactive {
 
 	});
 ';
+    $output .= &color_picker;
+
     # Code to put a due date countdown in 'duedatecountdown' span.
     # This is currently located in the breadcrumb headers.
     # note that the dueDateLayout is internatinoalized below.
@@ -1397,6 +1416,40 @@ sub htmlareaselectactive {
       });
    }
 });
+
+    /* This code describes the spellcheck options that will be used for
+       items with class 'spellchecked'.  It is necessary for those objects'
+       to explicitly request checking (e.g. onblur is a nice event for that).
+     */
+     \$(document).ready(function() {
+	 \$(".spellchecked").spellchecker({
+	   url: "/ajax/spellcheck",
+	   lang: "en",                      
+	   engine: "pspell",
+	   suggestionBoxPosition: "below",
+	   innerDocument: true
+					  });
+	 \$("textarea.spellchecked").spellchecker({
+	   url: "/ajax/spellcheck",
+	   lang: "en",                      
+	   engine: "pspell",
+	   suggestionBoxPosition: "below",
+	   innerDocument: true
+					  });
+
+			});
+
+    /* the muli colored editor can generate spellcheck with language 'none'
+       to disable spellcheck as well
+    */
+    function doSpellcheck(element, lang) {
+	if (lang != 'none') {
+ 	    \$(element).spellchecker('option', {lang: lang});
+	    \$(element).spellchecker('check');
+        }
+    }
+
+
 JAVASCRIPT
     if ($dragmath_prefix ne '') {
         $output .= '
@@ -1453,7 +1506,7 @@ sub show_return_link {
 
     unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||
-        $env{'request.uri'}=~m{^/~}) { return 1; }
+        $env{'request.uri'}=~m{^/priv/}) { return 1; }
 
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {