[Erp5-report] r20194 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar 28 13:04:02 2008
New Revision: 20194

URL: http://svn.erp5.org?rev=20194&view=rev
Log:
add a new "inline-graphic" style for graphic, with wrap="none" set so that the graphic does not wrap the text

Modified:
    erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
    erp5/trunk/bt5/erp5_odt_style/bt/revision

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=20194&r1=20193&r2=20194&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml Fri Mar 28 13:04:02 2008
@@ -212,6 +212,9 @@
       <style:table-cell-properties fo:padding=\'0.097cm\' fo:border-right=\'0.002cm solid #000000\' fo:border-top=\'none\' fo:background-color=\'#e6e6e6\' fo:border-left=\'0.002cm solid #000000\' fo:border-bottom=\'0.002cm solid #000000\'>\n
         <style:background-image/>\n
       </style:table-cell-properties>\n
+    </style:style>\n
+    <style:style style:name="inline-graphic" style:family="graphic" style:parent-style-name="Graphics">\n
+       <style:graphic-properties style:run-through="foreground" style:wrap="none" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:horizontal-pos="center" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>\n
     </style:style>\n
   </office:automatic-styles>\n
   <office:body>\n
@@ -304,7 +307,8 @@
 \n
      <text:p text:style-name=\'field-content-center\'\n
              tal:define="size python: modules[\'Products.ERP5.Document.Image\'].getSizeFromImageDisplay(field.get_value(\'image_display\'))">\n
-        <office:include_img tal:attributes="width python: (size and size[0] or 100) / 20.;\n
+        <office:include_img style="inline-graphic"\n
+                            tal:attributes="width python: (size and size[0] or 100) / 20.;\n
                                             path python: \'/\'.join(request.physicalPathFromURL(field.get_value(\'default\')));"/>\n
      </text:p>\n
     </tal:block>\n
@@ -329,7 +333,8 @@
     <tal:block tal:condition="python: field_type == \'ImageField\'">\n
      <text:p text:style-name=\'field-content\'\n
              tal:define="size python: modules[\'Products.ERP5.Document.Image\'].getSizeFromImageDisplay(field.get_value(\'image_display\'))">\n
-        <office:include_img tal:attributes="width python: (size and size[0] or 100) / 20.;\n
+        <office:include_img style="inline-graphic"\n
+                            tal:attributes="width python: (size and size[0] or 100) / 20.;\n
                                             path python: \'/\'.join(request.physicalPathFromURL(field.get_value(\'default\')));"/>\n
      </text:p>\n
     </tal:block>\n

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=20194&r1=20193&r2=20194&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Fri Mar 28 13:04:02 2008
@@ -1,1 +1,1 @@
-34
+35