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

[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

5296. 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/report_helper.py'
--- report_webkit/report_helper.py	2011-03-14 17:14:29 +0000
+++ report_webkit/report_helper.py	2012-07-19 15:20:27 +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,9 +74,9 @@
 
         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)
-        
\ No newline at end of file
+        return self.embed_image(type, img, width, height, unit)
+