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

foxr foxr at source.lon-capa.org
Wed Feb 22 05:18:27 EST 2012


foxr		Wed Feb 22 10:18:27 2012 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  bz874 Include jpicker and bind it to all colorchooser class inputs.
  Note that if you add other colorchooser class elements you need to
  post fixup the values to ensure they start with x or any other required
  leading characer as jpicker will just put the hex rgb values
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.300 loncom/interface/lonhtmlcommon.pm:1.301
--- loncom/interface/lonhtmlcommon.pm:1.300	Tue Jan  3 00:28:29 2012
+++ loncom/interface/lonhtmlcommon.pm	Wed Feb 22 10:18:26 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.300 2012/01/03 00:28:29 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.301 2012/02/22 10:18:26 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1170,6 +1170,9 @@
 <script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
 <script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
 <link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />
+<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >
+</script>
+<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
 ENDJQUERY
 	return $s;
 }
@@ -1298,7 +1301,10 @@
 			$(this).before("<div><a href=\"#\" id=\"LC_rt_"+id+"\" title=\"Enable rich text formatting (bold, italic, etc.)\" class=\"LC_enable_rt\"><b>Rich formatting »</b></a></div>");
 			$("#LC_rt_"+id).click(editorHandler);
 		});
-	});
+                $.fn.jPicker.defaults.images.clientPath="/adm/jpicker/images/";
+                $(".colorchooser").jPicker();
+
+c	});
 ';
     if ($dragmath_prefix ne '') {
         $output .= '




More information about the LON-CAPA-cvs mailing list