Merge lp:~openerp-dev/openerp-web/trunk-user-signature-ima into lp:openerp-web

[Vidhin Mehta (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-user-signature-ima]

3902. By Mahendra Barad(OpenERP) on 2014-01-24

[IMP]added ckeditor lib and replace widget html by ck editor

3903. By Mahendra Barad(OpenERP) on 2014-01-27

[IMP]improved base path

3904. By Kunal Chavda on 2014-02-05

[MERGE]with latest and resolve conflicts.

3905. By Jaysinh Shukla(OpenERP) on 2014-04-08

[MERGE]: merged with web

Unmerged revisions

3905. By Jaysinh Shukla(OpenERP) on 2014-04-08

[MERGE]: merged with web

3904. By Kunal Chavda on 2014-02-05

[MERGE]with latest and resolve conflicts.

3903. By Mahendra Barad(OpenERP) on 2014-01-27

[IMP]improved base path

3902. By Mahendra Barad(OpenERP) on 2014-01-24

[IMP]added ckeditor lib and replace widget html by ck editor

3901. By Vidhin Mehta (OpenERP) on 2014-01-16

[MERGE]Truni.

3900. By Ishwar Malvi(OpenERP) on 2014-01-03

[IMP]improved code for attachement icon in user signature.

3899. By Ishwar Malvi(OpenERP) on 2014-01-03

[MERGE]with trunk.

3898. By Ishwar Malvi(OpenERP) on 2013-12-24

[IMP]improved code to hide img_preview and submit button.

3897. By Ishwar Malvi(OpenERP) on 2013-12-23

[REM]removed unused whitespace.

3896. By Ishwar Malvi(OpenERP) on 2013-12-23

[IMP]improved code to implement security to upload only image file with size validation.

=== modified file 'addons/web/__openerp__.py'
--- addons/web/__openerp__.py	2014-03-24 09:30:38 +0000
+++ addons/web/__openerp__.py	2014-04-08 13:23:20 +0000
@@ -44,6 +44,8 @@
         "static/lib/underscore.string/lib/underscore.string.js",
         "static/lib/backbone/backbone.js",
         "static/lib/cleditor/jquery.cleditor.js",
+        "static/lib/ckeditor/ckeditor.js",
+        "static/lib/ckeditor/adapters/jquery.js",
         "static/lib/py.js/lib/py.js",
         "static/lib/select2/select2.js",
         "static/src/js/openerpframework.js",

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-04-07 16:17:28 +0000
+++ addons/web/static/src/css/base.css	2014-04-08 13:23:20 +0000
@@ -943,7 +943,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -3470,6 +3470,23 @@
     overflow: hidden !important;
   }
 }
+#upload_file {
+  margin-left: 317px;
+}
+#upload_file #ufile {
+  display: inline;
+}
+
+.oe_sign {
+  margin: 5px 5px;
+  font-size: 16px;
+}
+
+.oe_sign_hover {
+  border-bottom: solid 1.5px #999999;
+  background-color: white;
+}
+
 .ui-icon {
   width: 18px;
   height: 18px;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-04-07 16:17:28 +0000
+++ addons/web/static/src/css/base.sass	2014-04-08 13:23:20 +0000
@@ -506,7 +506,7 @@
     .oe_grey
         color: #aaa
     // Added for generic error message and customize bootstrap3 <pre>,<hr>
-    .oe_error_detail 
+    .oe_error_detail
         hr
             display: block
             -webkit-margin-before: 0.5em
@@ -642,7 +642,7 @@
         //Customize label weight according bootstrap3
         > label:not([for])
             font-weight: normal !important
-        // End of customize 
+        // End of customize
     div.ui-tabs
         padding: 3px 0px 3px 0px
     .ui-tabs-hide
@@ -1230,7 +1230,7 @@
             display: none
     // }}}
     // FormPopup {{{
-    .oe_popup_form 
+    .oe_popup_form
         .oe_formview .oe_form_pager
             display: none !important
         // Customize label weight for popup wizard appear from another wizard according bootstrap3
@@ -1264,7 +1264,7 @@
         input[type="checkbox"]
             margin: 3px 3px 3px 4px
         select
-            margin: 2px 4px 2px 0 
+            margin: 2px 4px 2px 0
         //End of customize
         &.oe_focused
             border-color: $tag-border-selected
@@ -1688,8 +1688,8 @@
         padding-left: 2px
         @include vertical-gradient(#fcfcfc, #dedede)
         > span
-            margin-left: 4px        
-        
+            margin-left: 4px
+
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -2017,7 +2017,7 @@
                 .oe_e
                     position: relative
                     top: -1px
-                    left: -9px                    
+                    left: -9px
             input.oe_form_binary_file
                 display: inline-block
                 margin-left: -85px
@@ -2752,7 +2752,7 @@
                     filter: alpha(opacity = 0)
                     border: none
                     width: 0
-                    border-right: none 
+                    border-right: none
             > .label
                 border-bottom: 1px solid #cacaca
                 background: transparent
@@ -2805,6 +2805,17 @@
             overflow: hidden !important
 // }}}
 
+// User Signature
+#upload_file
+    margin-left: 317px
+    #ufile
+        display: inline
+.oe_sign
+    margin: 5px 5px
+    font-size: 16px
+.oe_sign_hover
+    border-bottom: solid 1.5px #999
+    background-color: white
 
 // Hack for ui icon {{{
 .ui-icon

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-04-07 16:17:28 +0000
+++ addons/web/static/src/js/view_form.js	2014-04-08 13:23:20 +0000
@@ -2718,6 +2718,192 @@
     },
 });
 
+/**widget for CKEditor */
+
+var ckeditor_addFunction_org = CKEDITOR.tools.addFunction;
+CKEDITOR.tools.addFunction = function(fn, scope)
+    {
+        if(scope && scope._ && scope._.attrChanges && scope._.detach)
+        {
+            var scope_reference = scope;
+            return ckeditor_addFunction_org(function()
+                {
+                    var self = this,
+                    self_arguments=arguments;
+                    setTimeout(function()
+                    {
+                        if(CKEDITOR.instances[self.editor.name])
+                        {
+                            fn.apply(self, self_arguments);
+                        }
+                    }, 0);
+                }, scope);
+        }
+        return ckeditor_addFunction_org(fn, scope);
+    };
+
+CKEDITOR.on('dialogDefinition', function(e)
+    {
+        var dialogName = e.data.name;
+        var dialogDefinition = e.data.definition;
+        if ( dialogName == 'image' ) {
+            dialogDefinition.removeContents('advanced');
+            dialogDefinition.removeContents('Link');
+            var infoTab = dialogDefinition.getContents('info');
+            infoTab.remove('ratioLock');
+            infoTab.remove('txtBorder');
+            infoTab.remove('txtHSpace');
+            infoTab.remove('txtVSpace');
+            infoTab.remove('cmbAlign');
+          };
+        _.each(e.data.definition.contents, function(element)
+            {
+                if(element.filebrowser!='uploadButton')
+                {
+                    return
+                }
+                _.each(element.elements, function(element)
+                {
+                    if(!element.onClick || element.type!='fileButton')
+                    {
+                        return
+                    }
+                    var onClick_org = element.onClick;
+                    element.onClick = function(e1)
+                    {
+                        onClick_org.apply(this, arguments);
+                        _.each(jQuery('#'+this.domId).closest('table')
+                            .find('iframe').contents().find(':file')
+                            .get(0).files,
+                            function(file)
+                            {
+                                var reader = new FileReader();
+                                reader.onload = function(load_event)
+                                {
+                                    CKEDITOR.tools.callFunction(
+                                        e.editor._.filebrowserFn,
+                                        load_event.target.result,
+                                        '');
+                                }
+                                reader.readAsDataURL(file);
+                            });
+                        return false;
+                    }
+                });
+            });
+        });
+
+function filter_html(value, ckeditor_filter, ckeditor_writer)
+    {
+        var fragment = CKEDITOR.htmlParser.fragment.fromHtml(value);
+        ckeditor_filter.applyTo(fragment);
+        ckeditor_writer.reset();
+        fragment.writeHtml(ckeditor_writer);
+        return ckeditor_writer.getHtml();
+    };
+default_ckeditor_filter = new CKEDITOR.filter(
+    {
+        '*':
+        {
+             attributes: 'href,src,style,alt,width,height,dir',
+             styles: '*',
+             classes: '*',
+         },
+         'html head title meta style body p div span a h1 h2 h3 h4 h5 img br hr table tr th td ul ol li dd dt strong pre b i': true,
+    });
+default_ckeditor_writer = new CKEDITOR.htmlParser.basicWriter();
+
+instance.web.form.FieldCKEditor = instance.web.form.FieldText.extend({
+        ckeditor_config: {
+            removePlugins: 'iframe,flash,forms,smiley,pagebreak,stylescombo',
+            filebrowserImageUploadUrl: 'dummy',
+            extraPlugins: 'filebrowser',
+            image_previewText: CKEDITOR.tools.repeat( 'Image Preview', 1 )
+        },
+        ckeditor_filter: default_ckeditor_filter,
+        ckeditor_writer: default_ckeditor_writer,
+        start: function()
+        {
+            this._super.apply(this, arguments);
+            CKEDITOR.lang.load(openerp.session.user_context.lang.split('_')[0], 'en', function() {});
+        },
+        initialize_content: function()
+        {
+            var self = this;
+            this._super.apply(this, arguments);
+            if(!this.$textarea)
+            {
+                return;
+            }
+            this.editor = CKEDITOR.replace(this.$textarea.get(0),
+                _.extend(
+                    {
+                        language: openerp.session.user_context.lang.split('_')[0],
+                        on:
+                        {
+                            'change': function()
+                            {
+                                self.store_dom_value();
+                            },
+                        },
+                    }, 
+                    this.ckeditor_config));
+        },
+        store_dom_value: function()
+        {
+            this.internal_set_value(this.editor ? this.editor.getData() : openerp.web.parse_value(this.get('value'), this));
+        },
+        filter_html: function(value)
+        {
+            return filter_html(value, this.ckeditor_filter, this.ckeditor_writer);
+        },
+        render_value: function()
+        {
+            if(this.get("effective_readonly"))
+            {
+                this.$el.html(this.filter_html(this.get('value')));
+            }
+            else
+            {
+                if(this.editor)
+                {
+                    var self = this;
+                    if(this.editor.status != 'ready')
+                    {
+                        var instanceReady = function()
+                        {
+                            self.editor.setData(self.get('value') || '');
+                            self.editor.removeListener('instanceReady', instanceReady);
+                        };
+                        this.editor.on('instanceReady', instanceReady);
+                    }
+                    else
+                    {
+                        self.editor.setData(self.get('value') || '');
+                    }
+                }
+            }
+        },
+        undelegateEvents: function()
+        {
+            this._cleanup_editor();
+            return this._super.apply(this, arguments);
+        },
+        _cleanup_editor: function()
+        {
+            if(this.editor)
+            {
+                CKEDITOR.remove(this.editor);
+                this.editor.removeAllListeners();
+                this.editor = null;
+            }
+        },
+        destroy_content: function()
+        {
+            this._cleanup_editor();
+        }
+    });
+
 /**
  * FieldTextHtml Widget
  * Intended for FieldText widgets meant to display HTML content. This
@@ -2743,7 +2929,7 @@
                 controls:   // controls to add to the toolbar
                             "bold italic underline strikethrough " +
                             "| removeformat | bullets numbering | outdent " +
-                            "indent | link unlink | source",
+                            "indent | link unlink | source | image",
                 bodyStyle:  // style to assign to document body contained within the editor
                             "margin:4px; color:#4c4c4c; font-size:13px; font-family:'Lucida Grande',Helvetica,Verdana,Arial,sans-serif; cursor:text"
             });
@@ -2759,6 +2945,14 @@
                     .click(this.on_translate);
                 this.$cleditor.$toolbar.append($img);
             }
+            if (this.options.signature){
+                var $upload_file = $('<div class="cleditorGroup"><div class="cleditorDivider"></div><div class="fa fa-picture-o oe_sign" title="Upload Image"></div></div>')
+                    .click(function(){
+                        $("#upload_file").is(":visible") ? $("#upload_file").hide() : self.on_upload_file();
+                    })
+                    .hover(function() { $(this).toggleClass("oe_sign_hover"); });
+                this.$cleditor.$toolbar.append($upload_file);
+            }
         }
     },
     render_value: function() {
@@ -2771,6 +2965,42 @@
             this.$el.html(this.get('value'));
         }
     },
+    on_upload_file: function(e) {
+        var self = this;
+        $('.cleditorToolbar').after(QWeb.render("UploadFile", {widget: this}));
+        $("#ufile").change(function(){
+            var imageType = /image.*/;
+            var max_image_size = 3 * 1024 * 1024;
+            if (this.files && this.files[0] && this.files[0].type.match(imageType)) {
+                if(this.files[0].size < max_image_size){
+                    var reader = new FileReader();
+                    reader.onload = function (e) {
+                        $('#img_preview').attr('src', e.target.result);
+                    }
+                    reader.readAsDataURL(this.files[0]);
+                    $('#upload_file').children().show();
+                 }else{
+                     self.hide_on_warning();
+                     self.do_warn(_t("Invalid image size"), _t("Image is too large to upload."), true);
+                 }
+            }else{
+                self.hide_on_warning();
+                self.do_warn(_t("Invalid file format"), _t("Upload valid image file only."), true);
+            }
+        });
+        $('#submit_ufile').click(function() {
+            $('#img_preview').appendTo($(".cleditorMain iframe").contents().find('body'));
+            self.hide_popup(this);
+        });
+    },
+    hide_popup: function(e) {
+        $(e).parent().hide();
+        $(".cleditorMain iframe").focus();
+    },
+    hide_on_warning: function(e) {
+        $('#ufile').val('');
+        $('#submit_ufile, #img_preview').hide();
+    }
 });
 
 instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
@@ -5943,7 +6173,7 @@
     'email' : 'instance.web.form.FieldEmail',
     'url' : 'instance.web.form.FieldUrl',
     'text' : 'instance.web.form.FieldText',
-    'html' : 'instance.web.form.FieldTextHtml',
+    'html' : 'instance.web.form.FieldCKEditor',
     'date' : 'instance.web.form.FieldDate',
     'datetime' : 'instance.web.form.FieldDatetime',
     'selection' : 'instance.web.form.FieldSelection',