Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
--- a/js/main_custom_color.js
+++ b/js/main_custom_color.js
@@ -6,7 +6,7 @@
 $(document).ready(function() {
    $('#li_custom_color').show();
    // Choosing another id does not work! 
-    $('#colorSelector').ColorPicker({
+    $("input[type='submit'][name='custom_color_choose']").ColorPicker({
        color: '#0000ff',
        onShow: function (colpkr) {
            $(colpkr).fadeIn(500);