Merge lp:~camptocamp/openobject-addons/6.1-webkit_report-image_helper-20120719 into lp:openobject-addons/6.1

[Yannick Vaucher @ Camptocamp]

Fix and improve the helper for inserting images in webkit report

With webkit it is better to use css style for height and width than elements attributes.

Unmerged revisions

6897. By Yannick Vaucher @ Camptocamp on 2012-07-19

[FIX] webkit_report - using style in image helper instead of attributes, this allow to use metric dimensions for images + [IMP] image helper to accept other units than px

=== modified file 'report_webkit/__openerp__.py'
--- report_webkit/__openerp__.py	2012-01-31 13:36:57 +0000
+++ report_webkit/__openerp__.py	2012-07-19 15:35:24 +0000
@@ -64,8 +64,9 @@
 PDF. Version 0.9.9 or later is necessary, and can be found at http://code.google.com/p/wkhtmltopdf/
 for Linux, Mac OS X (i386) and Windows (32bits).
 
-After installing the library on the OpenERP Server machine, you need to set the
-path to the ``wkthtmltopdf`` executable file on each Company.
+After installing the library on the OpenERP Server machine, you need to set
+the path to the ``wkthtmltopdf`` executable file in a system parameter named ``webkit_path``
+in Settings -> Customization -> System Parameters
 
 If you are experiencing missing header/footer problems on Linux, be sure to
 install a "static" version of the library. The default ``wkhtmltopdf`` on

=== modified file 'report_webkit/report_helper.py'
--- report_webkit/report_helper.py	2011-12-19 16:54:40 +0000
+++ report_webkit/report_helper.py	2012-07-19 15:35:24 +0000
@@ -39,26 +39,26 @@
         self.uid = uid
         self.pool = pooler.get_pool(self.cursor.dbname)
         self.report_id = report_id
-        
-    def embed_image(self, type, img, width=0, height=0) :
+
+    def embed_image(self, type, img, width=0, height=0, unit="px") :
         "Transform a DB image into an embedded HTML image"
 
         if width :
-            width = 'width="%spx"'%(width)
+            width = 'width: %s%s;'%(width, unit)
         else :
             width = ' '
         if height :
-            height = 'height="%spx"'%(height)
+            height = 'height: %s%s;'%(height, unit)
         else :
             height = ' '
-        toreturn = '<img %s %s src="data:image/%s;base64,%s" />'%(
+        toreturn = '<img style="%s%s" src="data:image/%s;base64,%s" />'%(
             width,
             height,
             type, 
             str(img))
         return toreturn
-            
-            
+
+
     def get_logo_by_name(self, name):
         """Return logo by name"""
         header_obj = self.pool.get('ir.header_img')
@@ -74,11 +74,11 @@
 
         head = header_obj.browse(self.cursor, self.uid, header_img_id)
         return (head.img, head.type)
-            
-    def embed_logo_by_name(self, name, width=0, height=0) :
+
+    def embed_logo_by_name(self, name, width=0, height=0, unit="px") :
         """Return HTML embedded logo by name"""
         img, type = self.get_logo_by_name(name)
-        return self.embed_image(type, img, width, height)
-        
+        return self.embed_image(type, img, width, height, unit)
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: