From 508a4cb5a3d203f3d29cfb9025a2a35d09b4d73b Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Thu, 31 Jan 2008 16:41:00 +0000
Subject: [PATCH] - add a new parameter space_between_pages that permit to
define the sapce between two pages - modify the margin-top attribute of the
page_end section, this is more logical to have the same spaces than the
space between two pages after the last page than a page height (before this
commit, a empty page space was displayed after the last page)
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18952 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Form/ScribusUtils.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/product/ERP5Form/ScribusUtils.py b/product/ERP5Form/ScribusUtils.py
index 79f92677ff..f381faf4cb 100644
--- a/product/ERP5Form/ScribusUtils.py
+++ b/product/ERP5Form/ScribusUtils.py
@@ -856,7 +856,8 @@ class ManageCSS:
, page_iterator
, page_gap
, keep_page
- , properties_page):
+ , properties_page
+ , space_between_pages):
"""
recover all CSS data relative to the current page_object (field)
and save these informations in the output dict
@@ -918,7 +919,8 @@ class ManageCSS:
str(12) + 'px'
properties_css_object_error['font-size'] = \
str(12) + 'px'
- properties_css_object_err_d['margin-left'] = str(page_width + 20 ) + 'px'
+ properties_css_object_err_d['margin-left'] = str(page_width +
+ space_between_pages ) + 'px'
properties_css_object_stand['margin-top'] = \
str((scaling_factor2 *float(properties_field['position_y']))) + 'px'
properties_css_object_error['margin-top'] = \
@@ -1146,7 +1148,8 @@ class ManageCSS:
security.declarePublic('setFinalProperties')
def setFinalProperties( self
, properties_css_dict
- , page_height):
+ , page_height
+ , space_between_pages):
"""
adding 'page_end' class to add a div at the end of the last page
in order to display the full last page under Konqueror
@@ -1155,7 +1158,7 @@ class ManageCSS:
"""
properties_css_page = {}
properties_css_page['position'] = 'relative'
- properties_css_page['margin-top'] = "%spx" % str(page_height)
+ properties_css_page['margin-top'] = "%spx" % str(space_between_pages)
properties_css_dict['head']['page_end'] = properties_css_page
return properties_css_dict
--
2.30.9