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

[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

8798. 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

8797. By Nicolas Bessi - Camptocamp on 2013-03-05

[FIX] report_webkit embed_logo_by_name multi-company support

=== modified file 'report_webkit/report_helper.py'
--- report_webkit/report_helper.py	2013-03-18 14:37:26 +0000
+++ report_webkit/report_helper.py	2013-03-18 14:37:26 +0000
@@ -4,7 +4,8 @@
 # Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
 # All Right Reserved
 #
-# Author : Nicolas Bessi (Camptocamp)
+# Authors : Nicolas Bessi (Camptocamp)
+#           Yannick Vaucher (Camptocamp)
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,19 +40,19 @@
         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, 
@@ -76,10 +77,10 @@
         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, company_id=None):
+    def embed_logo_by_name(self, name, width=0, height=0, unit="px", company_id=None):
         """Return HTML embedded logo by name"""
         img, type = self.get_logo_by_name(name, company_id=company_id)
-        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: