Merge lp:~camptocamp/openobject-addons/trunk-webkit_report-image_helper-20130318 into lp:openobject-addons

[Yannick Vaucher @ Camptocamp]

In image helper, fix construction of image tag and improve it to let use other units than px (better to use mm and cm for reports)

This MP is a forward port of the following:
https://code.launchpad.net/~camptocamp/openobject-addons/6.0-webkit_report-image_helper-20120719
https://code.launchpad.net/~camptocamp/openobject-addons/6.1-webkit_report-image_helper-20120719

Unmerged revisions

8632. By Yannick Vaucher @ Camptocamp on 2013-03-18

[FIX] report_webkit - 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	2013-02-25 16:06:50 +0000
+++ report_webkit/report_helper.py	2013-03-18 12:59:33 +0000
@@ -40,32 +40,32 @@
         self.pool = pooler.get_pool(self.cursor.dbname)
         self.report_id = report_id
         self.context = context
-        
-    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, 
+            type,
             str(img))
         return toreturn
-            
-            
+
+
     def get_logo_by_name(self, name):
         """Return logo by name"""
         header_obj = self.pool.get('ir.header_img')
         header_img_id = header_obj.search(
-                                            self.cursor, 
-                                            self.uid, 
+                                            self.cursor,
+                                            self.uid,
                                             [('name','=',name)]
                                         )
         if not header_img_id :
@@ -75,18 +75,17 @@
 
         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)
 
-    def embed_company_logo(self, width=0, height=0):
+    def embed_company_logo(self, width=0, height=0, unit="px"):
         cr, uid, context = self.cursor, self.uid, self.context
         my_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         logo = my_user.company_id.logo_web
-        return self.embed_image("png", logo, width, height)
+        return self.embed_image("png", logo, width, height, unit)
 
-        
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: