Commit 2fddfa9e authored by Xiaowu Zhang's avatar Xiaowu Zhang

erp5_corporate_identity: improvement

display comment by default

check contributor's organisation ealier

display corporate name instead of title

display web site instead of default document

add logo field for leaflet

display value used in dialog

update css
parent 40fded3e
theme_used = context.Base_getThemeDict(css_path="template_css/book")
if theme:
return theme_used.get('theme', '')
document_description = context.REQUEST.get('override_document_description', '')
document_short_title = context.REQUEST.get('override_document_short_title', '')
document_title = context.REQUEST.get('override_document_title', '')
document_version = context.REQUEST.get('override_document_version', '')
document_reference = context.REQUEST.get('override_document_reference', '')
if title:
return document_title if document_title else context.getTitle()
if short_title:
return document_short_title if document_short_title else context.getShortTitle()
if reference:
book_reference = document_reference if document_reference else context.getReference()
if not book_reference:
book_title = document_title if document_title else context.getTitle()
book_prefix = context.portal_preferences.getPreferredCorporateIdentityTemplateBookDocumentPrefix() or "Book."
book_reference = book_prefix + book_title.replace(" ", ".")
return book_reference
if description:
return document_description if document_description else context.getDescription()
if version:
return document_version if document_version else context.getVersion()
source = context.Base_getSourceDict(
source = context.getSource(),
override_source_person_title = context.REQUEST.get('override_source_person_title', None),
override_source_organisation_title = context.REQUEST.get('override_source_organisation_title', None),
override_logo_reference=context.REQUEST.get('override_logo_reference', None),
theme_logo_url=theme_used.get("theme_logo_url", None)
)
if source_organisation:
return source.get("organisation_title", "")
if source_person:
return source.get("name", "")
if logo:
url = source.get('enhanced_logo_url', '')
return url.split('?')[0]
return ''
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>theme=False, title=False, short_title=False,reference=False,logo=False,source_organisation=False, source_person=False, version=False, description=False </string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getBookParameter</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
theme_used = context.Base_getThemeDict(css_path="template_css/leaflet", theme_reference=context.REQUEST.get('override_logo_reference', None))
if theme:
return theme_used.get('theme', '')
source = context.Base_getSourceDict(
source = context.getSource(),
override_source_person_title = context.REQUEST.get('override_source_person_title', None),
override_source_organisation_title = context.REQUEST.get('override_source_organisation_title', None),
override_logo_reference=context.REQUEST.get('override_logo_reference', None),
theme_logo_url=theme_used.get("theme_logo_url", None)
)
if sender_company:
return source.get("organisation_title", "")
if sender:
return source.get("name", "")
if logo:
url = source.get('enhanced_logo_url', '')
return url.split('?')[0]
if leaflet_header:
override_leaflet_header_title = context.REQUEST.get('override_leaflet_header_title', '')
return override_leaflet_header_title if override_leaflet_header_title else theme_used.get("theme_logo_description", "")
return ''
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>theme=False, sender_company=False, sender=False, logo=False, leaflet_header=False</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getLeafletParameter</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
theme_used = context.Base_getThemeDict(css_path="template_css/letter")
if theme:
return theme_used.get('theme', '')
letter_source = context.Base_getSourceDict(
source = context.getSource(),
override_source_person_title = context.REQUEST.get('override_source_person_title', None),
override_source_organisation_title = context.REQUEST.get('override_source_organisation_title', None),
override_logo_reference=None,
theme_logo_url=theme_used.get("theme_logo_url", None),
letter_context=True
)
if sender_company:
return letter_source.get("organisation_title", "")
if sender:
return letter_source.get("name", "")
letter_destination = context.Base_getDestinationDict(
destination=context.getDestination(),
override_destination_person_title=context.REQUEST.get('override_destination_person_title', None),
override_destination_organisation_title= context.REQUEST.get('override_destination_organisation_title', None)
)
if recipient_company:
return letter_destination.get("organisation_title", "")
if recipient:
return letter_destination.get("name", "")
return ''
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>theme=False, sender_company=False, sender=False, recipient_company=False, recipient=False</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getLetterParameter</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
theme_used = context.Base_getThemeDict(css_path="template_css/release")
if theme:
return theme_used.get('theme', '')
source = context.Base_getSourceDict(
override_source_person_title = context.REQUEST.get('override_source_person_title', None),
override_source_organisation_title = context.REQUEST.get('override_source_organisation_title', None),
theme_logo_url=theme_used.get("theme_logo_url", None)
)
if sender_company:
return source.get("organisation_title", "")
if sender:
return source.get("name", "")
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>theme=False, sender_company=False, sender=False</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getPressReleaseParameter</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
theme_used = context.Base_getThemeDict(css_path="template_css/slide")
if theme:
return theme_used.get('theme', '')
source_dict = context.Base_getSourceDict(
override_source_organisation_title=context.REQUEST.get('override_source_organisation_title', None),
override_logo_reference=context.REQUEST.get('override_logo_reference', None),
theme_logo_url=theme_used.get("theme_logo_url", None))
if logo:
url = source_dict.get('enhanced_logo_url', '')
return url.split('?')[0]
if organisation:
return source_dict.get('organisation_title', '')
return ''
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>logo=False, theme=False, organisation=False,**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSlideParameter</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -44,19 +44,39 @@ if source is None: ...@@ -44,19 +44,39 @@ if source is None:
# override # override
if override_source_organisation_title: if override_source_organisation_title:
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="override_organisation", source_data=override_source_organisation_title) source_organisation_list = context.Base_getTemplateProxyParameter(parameter="override_organisation", source_data=override_source_organisation_title)
if not source_organisation_list:
# follow up if letter_context:
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="organisation", source_data=None) or [] if not source_organisation_list and source_person_list:
if not source_organisation_list and default_company_relative_url: for source_person in source_person_list:
# default company # person 's Career Subordination Value
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="override_organisation_relative_url", source_data=default_company_relative_url) or [] organisation_candidate_list = context.Base_getTemplateProxyParameter(parameter="source", source_data=source_person.get("uid")) or []
if not source_organisation_list and source_person_list: if organisation_candidate_list:
for source_person in source_person_list: source_organisation_list = organisation_candidate_list
# person 's Career Subordination Value break
organisation_candidate_list = context.Base_getTemplateProxyParameter(parameter="source", source_data=source_person.get("uid")) or [] if not source_organisation_list:
if organisation_candidate_list: # follow up
source_organisation_list = organisation_candidate_list source_organisation_list = context.Base_getTemplateProxyParameter(parameter="organisation", source_data=None) or []
break if not source_organisation_list and default_company_relative_url:
# default company
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="override_organisation_relative_url", source_data=default_company_relative_url) or []
else:
if not source_organisation_list:
# follow up
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="organisation", source_data=None) or []
if not source_organisation_list and default_company_relative_url:
# default company
source_organisation_list = context.Base_getTemplateProxyParameter(parameter="override_organisation_relative_url", source_data=default_company_relative_url) or []
if not source_organisation_list and source_person_list:
for source_person in source_person_list:
# person 's Career Subordination Value
organisation_candidate_list = context.Base_getTemplateProxyParameter(parameter="source", source_data=source_person.get("uid")) or []
if organisation_candidate_list:
source_organisation_list = organisation_candidate_list
break
if not source_organisation_list and getattr(context, 'getSourceDecisionValue', None): if not source_organisation_list and getattr(context, 'getSourceDecisionValue', None):
source_organisation_candidate = context.getSourceDecisionValue() source_organisation_candidate = context.getSourceDecisionValue()
if source_organisation_candidate and source_organisation_candidate.getPortalType() == "Organisation": if source_organisation_candidate and source_organisation_candidate.getPortalType() == "Organisation":
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>source=None, override_logo_reference=None, override_source_person_title=None, override_source_organisation_title=None, theme_logo_url=None</string> </value> <value> <string>source=None, override_logo_reference=None, override_source_person_title=None, override_source_organisation_title=None, theme_logo_url=None, letter_context=False</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -240,10 +240,8 @@ if pass_parameter is not None and pass_source_data is not None: ...@@ -240,10 +240,8 @@ if pass_parameter is not None and pass_source_data is not None:
if pass_parameter == "override_organisation": if pass_parameter == "override_organisation":
organisation_list = portal_object.portal_catalog( organisation_list = portal_object.portal_catalog(
portal_type="Organisation", portal_type="Organisation",
#title=(''.join(["=", str(pass_source_data)])) title = '="%s"' % pass_source_data,
title=pass_source_data,
) )
organisation_list = [x for x in organisation_list if x.getTitle()==pass_source_data]
return populateOrganisationDict(organisation_list) return populateOrganisationDict(organisation_list)
# ------------ Override Sender/Recipient Organisation (URL) -------------------- # ------------ Override Sender/Recipient Organisation (URL) --------------------
......
...@@ -26,14 +26,18 @@ theme = ( ...@@ -26,14 +26,18 @@ theme = (
context.Base_getTemplateProxyParameter(parameter="theme", source_data=None) or context.Base_getTemplateProxyParameter(parameter="theme", source_data=None) or
pref.getPreferredCorporateIdentityTemplateDefaultTheme() pref.getPreferredCorporateIdentityTemplateDefaultTheme()
) )
if theme is not None: if not theme_reference and theme is not None:
theme = theme.lower() theme = theme.lower()
theme_logo_prefix = pref.getPreferredCorporateIdentityTemplateDefaultLogoPrefix() theme_logo_prefix = pref.getPreferredCorporateIdentityTemplateDefaultLogoPrefix()
if theme_logo_prefix: if theme_logo_prefix:
theme_reference = theme_logo_prefix + theme.capitalize() theme_reference = theme_logo_prefix + theme.capitalize()
theme_logo_list = context.Base_getTemplateProxyParameter(parameter="logo", source_data=theme_reference) or []
if len(theme_logo_list) > 0: if theme_reference:
theme_logo_dict = theme_logo_list[0] theme_logo_list = context.Base_getTemplateProxyParameter(parameter="logo", source_data=theme_reference) or []
if len(theme_logo_list) > 0:
theme_logo_dict = theme_logo_list[0]
theme_dict = { theme_dict = {
"theme":theme, "theme":theme,
"theme_logo_description":theme_logo_dict.get("description", blank) "theme_logo_description":theme_logo_dict.get("description", blank)
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>doc_format=None, css_path=None, skin=None</string> </value> <value> <string>doc_format=None, css_path=None, skin=None, theme_reference=None</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
organisation = context.REQUEST.get('field_your_override_destination_organisation_title', '')
if not organisation:
return True
if not context.portal_catalog(
portal_type="Organisation",
title= '="%s"' % organisation,
):
return False
return True
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_validateDestinationOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
person = context.REQUEST.get('field_your_override_destination_person_title', '')
if not person:
return True
if not context.portal_catalog(
portal_type="Person",
title= '="%s"' % person,
):
return False
return True
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_validateDestinationPerson</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
logo = context.REQUEST.get('field_your_override_logo_reference', '')
if not logo:
return True
if logo.startswith('organisation_module') or logo.startswith('image_module'):
try:
if not context.restrictedTraverse(logo):
return False
except KeyError:
return False
else:
if not context.portal_catalog(portal_type=('Image', 'Web Illustration'), reference=logo):
return False
return True
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_validateLogo</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
organisation = context.REQUEST.get('field_your_override_source_organisation_title', '')
if not organisation:
return True
if not context.portal_catalog(
portal_type="Organisation",
title= '="%s"' % organisation,
):
return False
return True
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_validateSourceOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
person = context.REQUEST.get('field_your_override_source_person_title', '')
if not person:
return True
if not context.portal_catalog(
portal_type=("Person", "Organisation"),
title= '="%s"' % person,
):
return False
return True
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_validateSourcePerson</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -105,7 +105,8 @@ letter_source = letter.Base_getSourceDict( ...@@ -105,7 +105,8 @@ letter_source = letter.Base_getSourceDict(
override_source_person_title=override_source_person_title, override_source_person_title=override_source_person_title,
override_source_organisation_title=override_source_organisation_title, override_source_organisation_title=override_source_organisation_title,
override_logo_reference=None, override_logo_reference=None,
theme_logo_url=letter_theme.get("theme_logo_url", None) theme_logo_url=letter_theme.get("theme_logo_url", None),
letter_context=True
) )
letter_destination = letter.Base_getDestinationDict( letter_destination = letter.Base_getDestinationDict(
destination=letter_destination, destination=letter_destination,
......
...@@ -44,7 +44,8 @@ pref = context.getPortalObject().portal_preferences ...@@ -44,7 +44,8 @@ pref = context.getPortalObject().portal_preferences
# ------------------ HTML cleanup/converter methods ---------------------------- # ------------------ HTML cleanup/converter methods ----------------------------
def translateText(snip): def translateText(snip):
return doc_localiser.erp5_ui.gettext(snip, lang=doc_language).encode('utf-8').strip() return context.Base_translateString(snip, lang=doc_language)
#return doc_localiser.erp5_ui.gettext(snip, lang=doc_language).encode('utf-8').strip()
# -------------------------- Setup --------------------------------------------- # -------------------------- Setup ---------------------------------------------
doc = context doc = context
......
...@@ -111,6 +111,9 @@ ...@@ -111,6 +111,9 @@
.ci-book-table-of-content { .ci-book-table-of-content {
display: block; display: block;
width: 100%; width: 100%;
/*width: auto;
margin-left:15mm;
margin-right:15mm;*/
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -154,18 +157,41 @@ ...@@ -154,18 +157,41 @@
margin-top: 24mm; margin-top: 24mm;
margin-bottom: 12%; margin-bottom: 12%;
} }
.h1-margin-15mm {
margin-right:15mm;
}
.content-margin-15mm {
width: auto !important;
margin-left:15mm;
margin-right:15mm;
padding-right: 0px !important;
}
</style> </style>
</head> </head>
<body class="ci-book-toc"> <body class="ci-book-toc">
<p class="ci-book-faux-h1" tal:content="python: options.get('book_toc_title') or ''">Table of Contents</p> <tal:block tal:condition="python: not options.get('margin_15mm')">
<div class="ci-book-table-of-content"> <p class="ci-book-faux-h1" tal:content="python: options.get('book_toc_title') or ''">Table of Contents</p>
<p class="ci-book-helper"></p> <div class="ci-book-table-of-content">
<ol> <p class="ci-book-helper"></p>
<xsl:apply-templates select="outline:item/outline:item"> <ol>
<xsl:with-param name="count" select="$count" /> <xsl:apply-templates select="outline:item/outline:item">
</xsl:apply-templates> <xsl:with-param name="count" select="$count" />
</ol> </xsl:apply-templates>
</div> </ol>
</div>
</tal:block>
<tal:block tal:condition="python: options.get('margin_15mm')">
<p class="ci-book-faux-h1 h1-margin-15mm" tal:content="python: options.get('book_toc_title') or ''">Table of Contents</p>
<div class="ci-book-table-of-content content-margin-15mm">
<p class="ci-book-helper"></p>
<ol>
<xsl:apply-templates select="outline:item/outline:item">
<xsl:with-param name="count" select="$count" />
</xsl:apply-templates>
</ol>
</div>
</tal:block>
</body> </body>
</html> </html>
</xsl:template> </xsl:template>
......
...@@ -31,16 +31,6 @@ Creates the Contract header. ...@@ -31,16 +31,6 @@ Creates the Contract header.
<link rel="stylesheet" tal:attributes="href contract_theme_css_url" /> <link rel="stylesheet" tal:attributes="href contract_theme_css_url" />
<link rel="stylesheet" tal:attributes="href contract_template_css_url" /> <link rel="stylesheet" tal:attributes="href contract_template_css_url" />
<script type="text/javascript"> <script type="text/javascript">
function setPlaceholdersWithUrlParameters() {
var vars={};
var x=window.location.search.substring(1).split('&');
for (var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
for (var i in x) {
var y = document.getElementsByClassName(x[i]);
for (var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
}
}
function setImageSize(pic) { function setImageSize(pic) {
if (pic.naturalWidth / pic.naturalHeight <= 1) { if (pic.naturalWidth / pic.naturalHeight <= 1) {
pic.style.width = "auto"; pic.style.width = "auto";
......
...@@ -6,6 +6,7 @@ Generate leaflet legalese ...@@ -6,6 +6,7 @@ Generate leaflet legalese
""" """
</tal:comment> </tal:comment>
<tal:block tal:define="leaflet_organisation python: options.get('leaflet_organisation'); <tal:block tal:define="leaflet_organisation python: options.get('leaflet_organisation');
leaflet_organisation_corporate python: options.get('leaflet_organisation_corporate');
leaflet_logo_url python: options.get('leaflet_logo_url'); leaflet_logo_url python: options.get('leaflet_logo_url');
leaflet_address python: options.get('leaflet_address'); leaflet_address python: options.get('leaflet_address');
leaflet_postal_code python: options.get('leaflet_postal_code'); leaflet_postal_code python: options.get('leaflet_postal_code');
...@@ -19,7 +20,7 @@ Generate leaflet legalese ...@@ -19,7 +20,7 @@ Generate leaflet legalese
<div id="legalese"> <div id="legalese">
<p class="top"><span>&copy;</span><span tal:content="python: ''.join([leaflet_organisation, ' ', leaflet_year])"></span></p> <p class="top"><span>&copy;</span><span tal:content="python: ''.join([leaflet_organisation, ' ', leaflet_year])"></span></p>
<p> <p>
<span tal:content="python: leaflet_organisation"></span><br /> <span tal:content="python: leaflet_organisation_corporate"></span><br />
<span tal:content="python: leaflet_address"></span><br /> <span tal:content="python: leaflet_address"></span><br />
<span tal:content="python: ''.join([leaflet_postal_code, ' ', leaflet_city])"></span><br /> <span tal:content="python: ''.join([leaflet_postal_code, ' ', leaflet_city])"></span><br />
<span tal:content="python: leaflet_country"></span><br /> <span tal:content="python: leaflet_country"></span><br />
......
...@@ -78,7 +78,11 @@ for citation in re.findall(r'\[(.*?)\]', document_content or ''): ...@@ -78,7 +78,11 @@ for citation in re.findall(r'\[(.*?)\]', document_content or ''):
citation_dict = {} citation_dict = {}
citation_dict["input"] = citation citation_dict["input"] = citation
citation_type = re.findall(match_citation_type, citation)[0] citation_type = re.findall(match_citation_type, citation)
if len(citation_type):
citation_type = citation_type[0]
else:
continue
# Those 3 parts has similar codes, leave as it so that it's easy to customize for each other # Those 3 parts has similar codes, leave as it so that it's easy to customize for each other
if citation_type == "AD": if citation_type == "AD":
if citation_href not in citation_ad_doubles: if citation_href not in citation_ad_doubles:
......
...@@ -28,10 +28,10 @@ def getReportViaFancyName(my_report_name, follow_up): ...@@ -28,10 +28,10 @@ def getReportViaFancyName(my_report_name, follow_up):
if method_call is not None: if method_call is not None:
# extra curl: Coverage report requires parameter details (1|0) # extra curl: Coverage report requires parameter details (1|0)
if coverage_name: if coverage_name:
return method_call(comment_visibility=True)[0].encode(encoding='UTF-8') return method_call(display_comment=True)[0].encode(encoding='UTF-8')
if detail_name: if detail_name:
return method_call(format='detailed',display_detail = 1)[0].encode(encoding='UTF-8') return method_call(format='detailed',display_detail = 1)[0].encode(encoding='UTF-8')
return method_call()[0].encode(encoding='UTF-8') return method_call(display_comment=True)[0].encode(encoding='UTF-8')
if doc_content.find('${WebPage_') != -1: if doc_content.find('${WebPage_') != -1:
document_required_follow_up_list = [x.getObject() for x in document.portal_catalog( document_required_follow_up_list = [x.getObject() for x in document.portal_catalog(
......
...@@ -27,6 +27,7 @@ return context.WebPage_viewAsLeaflet( ...@@ -27,6 +27,7 @@ return context.WebPage_viewAsLeaflet(
override_leaflet_header_title=override_leaflet_header_title, override_leaflet_header_title=override_leaflet_header_title,
override_source_organisation_title=override_source_organisation_title, override_source_organisation_title=override_source_organisation_title,
override_source_person_title=override_source_person_title, override_source_person_title=override_source_person_title,
override_logo_reference = override_logo_reference,
document_save=document_save, document_save=document_save,
document_download=document_download, document_download=document_download,
batch_mode=batch_mode, batch_mode=batch_mode,
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>format="html", display_side=1, document_download=None, batch_mode=False, document_save=None, display_svg=None, override_leaflet_header_title=None, override_source_organisation_title=None,override_source_person_title=None,**kw</string> </value> <value> <string>format="html", display_side=1, document_download=None, batch_mode=False, document_save=None, display_svg=None, override_leaflet_header_title=None, override_source_organisation_title=None,override_source_person_title=None, override_logo_reference=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -38,7 +38,7 @@ if doc_save or get_doc_after_save: ...@@ -38,7 +38,7 @@ if doc_save or get_doc_after_save:
document.setContentType("application/pdf") document.setContentType("application/pdf")
# setting aggregate in case context is an event # setting aggregate in case context is an event
if context.portal_type != 'Web Page' and not context.isModuleType(): if context.portal_type not in ('Web Page', 'Pay Sheet Transaction') and not context.isModuleType():
context.setAggregate(document.getRelativeUrl()) context.setAggregate(document.getRelativeUrl())
# try setting predecessor/related document to later distinguish this # try setting predecessor/related document to later distinguish this
......
...@@ -15,6 +15,7 @@ return """ ...@@ -15,6 +15,7 @@ return """
(function () { (function () {
var table_list = document.body.querySelectorAll("table"), var table_list = document.body.querySelectorAll("table"),
blockquote_list = document.body.querySelectorAll("table"), blockquote_list = document.body.querySelectorAll("table"),
gantt_list = document.body.querySelectorAll(".gantt_container"),
sheet_width_in_px, sheet_width_in_px,
div; div;
...@@ -24,7 +25,7 @@ return """ ...@@ -24,7 +25,7 @@ return """
document.body.appendChild(div); document.body.appendChild(div);
sheet_width_in_px = div.clientWidth; sheet_width_in_px = div.clientWidth;
document.body.removeChild(div); document.body.removeChild(div);
console.log(table_list)
if (table_list.length > 0) { if (table_list.length > 0) {
// Resize a table by reducing th and td font-size, // Resize a table by reducing th and td font-size,
...@@ -45,6 +46,17 @@ return """ ...@@ -45,6 +46,17 @@ return """
}); });
}); });
} }
if (gantt_list.length > 0) {
[].forEach.call(gantt_list, function (gantt) {
if (sheet_width_in_px > gantt.clientWidth) return;
var ratio_percent = Math.floor((sheet_width_in_px / gantt.clientWidth) * 100);
gantt.style.width = "100%";
[].forEach.call(gantt.children, function (e) {
e.setAttribute("style", "font-size: " + ratio_percent + "%");
});
});
}
// same for other elements // same for other elements
if (blockquote_list.length > 0) { if (blockquote_list.length > 0) {
...@@ -53,8 +65,6 @@ return """ ...@@ -53,8 +65,6 @@ return """
var ratio_percent = Math.floor((sheet_width_in_px / blockquote.clientWidth) * 100); var ratio_percent = Math.floor((sheet_width_in_px / blockquote.clientWidth) * 100);
blockquote.style.width = "100%"; blockquote.style.width = "100%";
// Select all children and affect the font-size in percent.
// The CSS should not set the font-size on the table instead of th and td
[].forEach.call(blockquote.children, function (e) { [].forEach.call(blockquote.children, function (e) {
e.setAttribute("style", "font-size: " + ratio_percent + "%"); e.setAttribute("style", "font-size: " + ratio_percent + "%");
}); });
......
...@@ -35,7 +35,6 @@ Update a book dialog with parameters manually entered ...@@ -35,7 +35,6 @@ Update a book dialog with parameters manually entered
# include_report_content embed content of report documents # include_report_content embed content of report documents
# #
# display_svg format for svg images (svg, png*) # display_svg format for svg images (svg, png*)
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
if dialog_id is not None: if dialog_id is not None:
request = container.REQUEST request = container.REQUEST
...@@ -46,14 +45,14 @@ if dialog_id is not None: ...@@ -46,14 +45,14 @@ if dialog_id is not None:
request.form['display_svg'] = display_svg request.form['display_svg'] = display_svg
request.form['document_save'] = document_save request.form['document_save'] = document_save
request.form['document_download'] = document_download request.form['document_download'] = document_download
request.form['override_document_description'] = override_document_description request.form['field_your_override_document_description'] = context.Base_getBookParameter(description=True)
request.form['override_document_short_title'] = override_document_short_title request.form['field_your_override_document_short_title'] = context.Base_getBookParameter(short_title=True)
request.form['override_document_title'] = override_document_title request.form['field_your_override_document_title'] = context.Base_getBookParameter(title=True)
request.form['override_document_version'] = override_document_version request.form['field_your_override_document_version'] = context.Base_getBookParameter(version=True)
request.form['override_logo_reference'] = override_logo_reference request.form['field_your_override_logo_reference'] = context.Base_getBookParameter(logo=True)
request.form['override_source_person_title'] = override_source_person_title request.form['field_your_override_source_person_title'] = context.Base_getBookParameter(source_person=True)
request.form['override_document_reference'] = override_document_reference request.form['field_your_override_document_reference'] = context.Base_getBookParameter(reference=True)
request.form['override_source_organisation_title'] = override_source_organisation_title request.form['field_your_override_source_organisation_title'] = context.Base_getBookParameter(source_organisation=True)
request.form['transformation'] = transformation request.form['transformation'] = transformation
request.form['include_content_table'] = include_content_table request.form['include_content_table'] = include_content_table
request.form['include_history_table'] = include_history_table request.form['include_history_table'] = include_history_table
......
...@@ -28,9 +28,10 @@ if dialog_id is not None: ...@@ -28,9 +28,10 @@ if dialog_id is not None:
request.form['portal_status_message'] = translateString('Preview updated.') request.form['portal_status_message'] = translateString('Preview updated.')
request.form['cancel_url'] = cancel_url request.form['cancel_url'] = cancel_url
request.form['portal_skin'] = portal_skin request.form['portal_skin'] = portal_skin
request.form['override_source_organisation_title'] = override_source_organisation_title request.form['field_your_override_source_organisation_title'] = context.Base_getLeafletParameter(sender_company=True)
request.form['override_source_person_title'] = override_source_person_title request.form['field_your_override_source_person_title'] = context.Base_getLeafletParameter(sender=True)
request.form['override_leaflet_header_title'] = override_leaflet_header_title request.form['field_your_override_leaflet_header_title'] = context.Base_getLeafletParameter(leaflet_header=True)
request.form['field_your_override_logo_reference'] = context.Base_getLeafletParameter(logo=True)
request.form['format'] = format request.form['format'] = format
request.form['display_svg'] = display_svg request.form['display_svg'] = display_svg
request.form['display_side'] = display_side request.form['display_side'] = display_side
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>dialog_id=None, document_download=None, cancel_url=None, document_save=None, portal_skin=None, format=None, display_side=None, display_svg=None, override_source_organisation_title=None,override_source_person_title=None, override_leaflet_header_title=None, *args,**kw</string> </value> <value> <string>dialog_id=None, document_download=None, cancel_url=None, document_save=None, portal_skin=None, format=None, display_side=None, display_svg=None, override_source_organisation_title=None,override_source_person_title=None, override_leaflet_header_title=None, override_logo_reference=None, *args,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -36,10 +36,10 @@ if dialog_id is not None: ...@@ -36,10 +36,10 @@ if dialog_id is not None:
request.form['display_svg'] = display_svg request.form['display_svg'] = display_svg
request.form['document_save'] = document_save request.form['document_save'] = document_save
request.form['document_download'] = document_download request.form['document_download'] = document_download
request.form['override_source_organisation_title'] = override_source_organisation_title request.form['field_your_override_source_organisation_title'] = context.Base_getLetterParameter(sender_company=True)
request.form['override_source_person_title'] = override_source_person_title request.form['field_your_override_source_person_title'] = context.Base_getLetterParameter(sender=True)
request.form['override_destination_organisation_title'] = override_destination_organisation_title request.form['field_your_override_destination_organisation_title'] = context.Base_getLetterParameter(recipient_company=True)
request.form['override_destination_person_title'] = override_destination_person_title request.form['field_your_override_destination_person_title'] = context.Base_getLetterParameter(recipient=True)
request.form['override_date'] = override_date request.form['override_date'] = override_date
request.form['display_head'] = display_head request.form['display_head'] = display_head
request.form['destination_position_in_letter'] = destination_position_in_letter request.form['destination_position_in_letter'] = destination_position_in_letter
......
...@@ -27,8 +27,8 @@ if dialog_id is not None: ...@@ -27,8 +27,8 @@ if dialog_id is not None:
request.form['portal_status_message'] = translateString('Preview updated.') request.form['portal_status_message'] = translateString('Preview updated.')
request.form['cancel_url'] = cancel_url request.form['cancel_url'] = cancel_url
request.form['portal_skin'] = portal_skin request.form['portal_skin'] = portal_skin
request.form['override_source_organisation_title'] = override_source_organisation_title request.form['field_your_override_source_organisation_title'] = context.Base_getPressReleaseParameter(sender_company=True)
request.form['override_source_person_title'] = override_source_person_title request.form['field_your_override_source_person_title'] = context.Base_getPressReleaseParameter(sender=True)
request.form['format'] = format request.form['format'] = format
request.form['display_svg'] = display_svg request.form['display_svg'] = display_svg
request.form['display_about'] = display_about request.form['display_about'] = display_about
......
...@@ -35,8 +35,8 @@ if dialog_id is not None: ...@@ -35,8 +35,8 @@ if dialog_id is not None:
request.form['display_svg'] = display_svg request.form['display_svg'] = display_svg
request.form['document_save'] = document_save request.form['document_save'] = document_save
request.form['document_download'] = document_download request.form['document_download'] = document_download
request.form['override_logo_reference'] = override_logo_reference request.form['field_your_override_logo_reference'] = context.Base_getSlideParameter(logo=True)
request.form['override_source_organisation_title'] = override_source_organisation_title request.form['field_your_override_source_organisation_title'] = context.Base_getSlideParameter(organisation=True)
request.form['display_note'] = display_note request.form['display_note'] = display_note
return context.Base_renderForm(dialog_id) return context.Base_renderForm(dialog_id)
...@@ -21,7 +21,7 @@ if not len(img_src): ...@@ -21,7 +21,7 @@ if not len(img_src):
return img_string # There is no image source, return as is return img_string # There is no image source, return as is
img_src = img_src[0] img_src = img_src[0]
if img_src.startswith('data:image/'): if img_src.startswith('data:image/') or img_src.startswith('data:application'):
return img_string return img_string
# START user ignoring guidelines: # START user ignoring guidelines:
......
...@@ -41,7 +41,7 @@ if isinstance(contract_content, unicode): ...@@ -41,7 +41,7 @@ if isinstance(contract_content, unicode):
contract_history_section_list = re.findall('<section.+?>.+?</section>', contract_content, re.S) contract_history_section_list = re.findall('<section.+?>.+?</section>', contract_content, re.S)
for contract_history_section in contract_history_section_list: for contract_history_section in contract_history_section_list:
contract_content = contract_content.replace(contract_history_section, '') contract_content = contract_content.replace(contract_history_section, '')
"""
for header in re.findall("<h[1-6].*</h[1-6]>", contract_content or ""): for header in re.findall("<h[1-6].*</h[1-6]>", contract_content or ""):
convert_to_h2 = True convert_to_h2 = True
for tag in ['introduction', 'annex', 'appendix']: for tag in ['introduction', 'annex', 'appendix']:
...@@ -57,7 +57,7 @@ for header in re.findall("<h[1-6].*</h[1-6]>", contract_content or ""): ...@@ -57,7 +57,7 @@ for header in re.findall("<h[1-6].*</h[1-6]>", contract_content or ""):
header, header,
header.replace(tag, 'h%s' % (int(key) + 1)) header.replace(tag, 'h%s' % (int(key) + 1))
) )
"""
# override for tests # override for tests
if override_batch_mode: if override_batch_mode:
......
...@@ -47,6 +47,7 @@ leaflet_display_side = int(kw.get('display_side') or 0) ...@@ -47,6 +47,7 @@ leaflet_display_side = int(kw.get('display_side') or 0)
override_leaflet_header_title = kw.get('override_leaflet_header_title') override_leaflet_header_title = kw.get('override_leaflet_header_title')
override_source_person_title = kw.get('override_source_person_title', None) override_source_person_title = kw.get('override_source_person_title', None)
override_source_organisation_title = kw.get("override_source_organisation_title", None) override_source_organisation_title = kw.get("override_source_organisation_title", None)
override_logo_reference = kw.get('override_logo_reference', None)
override_batch_mode = kw.get('batch_mode') override_batch_mode = kw.get('batch_mode')
...@@ -78,7 +79,7 @@ if leaflet_reference is None: ...@@ -78,7 +79,7 @@ if leaflet_reference is None:
leaflet_full_reference = '-'.join([leaflet_reference, leaflet_version, leaflet_language]) leaflet_full_reference = '-'.join([leaflet_reference, leaflet_version, leaflet_language])
# ---------------------------- Theme Parameters -------------------------------- # ---------------------------- Theme Parameters --------------------------------
leaflet_theme = leaflet.Base_getThemeDict(doc_format=leaflet_format, css_path="template_css/leaflet", skin="Leaflet") leaflet_theme = leaflet.Base_getThemeDict(doc_format=leaflet_format, css_path="template_css/leaflet", skin="Leaflet", theme_reference=override_logo_reference)
if override_leaflet_header_title and override_leaflet_header_title != blank: if override_leaflet_header_title and override_leaflet_header_title != blank:
leaflet_theme["theme_logo_description"] = html_quote(override_leaflet_header_title) leaflet_theme["theme_logo_description"] = html_quote(override_leaflet_header_title)
......
...@@ -179,7 +179,6 @@ doc_is_slideshow = getSlideList(doc_content) or None ...@@ -179,7 +179,6 @@ doc_is_slideshow = getSlideList(doc_content) or None
override_logo_reference = kw.get('override_logo_reference', None) override_logo_reference = kw.get('override_logo_reference', None)
override_source_organisation_title = kw.get("override_source_organisation_title", None) override_source_organisation_title = kw.get("override_source_organisation_title", None)
override_batch_mode = kw.get('batch_mode') override_batch_mode = kw.get('batch_mode')
override_source_person_title = None
doc_theme = doc.Base_getThemeDict(doc_format=doc_format, css_path="template_css/slide", skin="Slide") doc_theme = doc.Base_getThemeDict(doc_format=doc_format, css_path="template_css/slide", skin="Slide")
...@@ -273,12 +272,10 @@ doc_css = ''.join(['.ci-slideshow-intro.present:not(.slide-background):before {' ...@@ -273,12 +272,10 @@ doc_css = ''.join(['.ci-slideshow-intro.present:not(.slide-background):before {'
# ---------------------------------- Source ------------------------------------ # ---------------------------------- Source ------------------------------------
doc_source = doc.Base_getSourceDict( doc_source = doc.Base_getSourceDict(
override_source_person_title=override_source_person_title,
override_source_organisation_title=override_source_organisation_title, override_source_organisation_title=override_source_organisation_title,
override_logo_reference=override_logo_reference, override_logo_reference=override_logo_reference,
theme_logo_url=doc_theme.get("theme_logo_url", None) theme_logo_url=doc_theme.get("theme_logo_url", None)
) )
# --------------------------- Content Upgrades --------------------------------- # --------------------------- Content Upgrades ---------------------------------
for image in re.findall('(<img.*?/>)', doc_content): for image in re.findall('(<img.*?/>)', doc_content):
doc_content = doc_content.replace( doc_content = doc_content.replace(
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>content</string> <string>your_content</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list>
<string>override_document_description</string> <string>your_override_document_description</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,16 +76,17 @@ ...@@ -76,16 +76,17 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>format</string> <string>your_format</string>
<string>include_history_table</string> <string>your_include_history_table</string>
<string>include_content_table</string> <string>your_include_content_table</string>
<string>include_reference_table</string> <string>your_include_reference_table</string>
<string>include_linked_content</string> <string>your_include_linked_content</string>
<string>include_report_content</string> <string>your_include_report_content</string>
<string>display_svg</string> <string>your_display_svg</string>
<string>document_save</string> <string>your_document_save</string>
<string>portal_skin</string> <string>your_portal_skin</string>
<string>margin15mm</string> <string>your_margin15mm</string>
<string>your_theme</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -93,13 +94,13 @@ ...@@ -93,13 +94,13 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>override_document_title</string> <string>your_override_document_title</string>
<string>override_document_short_title</string> <string>your_override_document_short_title</string>
<string>override_document_reference</string> <string>your_override_document_reference</string>
<string>override_logo_reference</string> <string>your_override_logo_reference</string>
<string>override_source_organisation_title</string> <string>your_override_source_organisation_title</string>
<string>override_source_person_title</string> <string>your_override_source_person_title</string>
<string>override_document_version</string> <string>your_override_document_version</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>override_document_description</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Custom description to be used.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_description</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Override Document Description</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>content</string> </value> <value> <string>your_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Book&amp;override_document_description=%s&amp;override_document_short_title=%s&amp;override_document_title=%s&amp;override_document_version=%s&amp;override_logo_reference=%s&amp;override_source_organisation_title=%s&amp;override_source_person_title=%s&amp;include_content_table=%s&amp;include_history_table=%s&amp;include_reference_table=%s&amp;include_linked_content=%s&amp;include_report_content=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_document_description", ""), context.REQUEST.get("override_document_short_title", ""), context.REQUEST.get("override_document_title", ""), context.REQUEST.get("override_document_version", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_source_person_title", ""),context.REQUEST.get("include_content_table", 1), context.REQUEST.get("include_history_table", 0),context.REQUEST.get("include_reference_table", 0),context.REQUEST.get("include_linked_content", 0),context.REQUEST.get("include_report_content", 0), context.REQUEST.get("display_svg", "png")) python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Book&amp;override_document_description=%s&amp;override_document_short_title=%s&amp;override_document_title=%s&amp;override_document_version=%s&amp;override_logo_reference=%s&amp;override_source_organisation_title=%s&amp;override_source_person_title=%s&amp;override_document_reference=%s&amp;include_content_table=%s&amp;include_history_table=%s&amp;include_reference_table=%s&amp;include_linked_content=%s&amp;include_report_content=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_document_description", ""), context.REQUEST.get("override_document_short_title", ""), context.REQUEST.get("override_document_title", ""), context.REQUEST.get("override_document_version", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_source_person_title", ""),context.REQUEST.get("override_document_reference", ""),context.REQUEST.get("include_content_table", 1), context.REQUEST.get("include_history_table", 0),context.REQUEST.get("include_reference_table", 0),context.REQUEST.get("include_linked_content", 0),context.REQUEST.get("include_report_content", 0), context.REQUEST.get("display_svg", "png"))
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_svg</string> </value> <value> <string>your_display_svg</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>document_save</string> </value> <value> <string>your_document_save</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>format</string> </value> <value> <string>your_format</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>include_content_table</string> </value> <value> <string>your_include_content_table</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>include_history_table</string> </value> <value> <string>your_include_history_table</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>include_linked_content</string> </value> <value> <string>your_include_linked_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>include_reference_table</string> </value> <value> <string>your_include_reference_table</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>include_report_content</string> </value> <value> <string>your_include_report_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>margin15mm</string> </value> <value> <string>your_margin15mm</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_override_document_description</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Custom description to be used.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_description</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Document Description</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(description=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_document_reference</string> </value> <value> <string>your_override_document_reference</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -249,7 +251,7 @@ ...@@ -249,7 +251,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Document Reference</string> </value> <value> <string>Document Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +271,17 @@ ...@@ -269,4 +271,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(reference=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_document_short_title</string> </value> <value> <string>your_override_document_short_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -249,7 +251,7 @@ ...@@ -249,7 +251,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Short Title</string> </value> <value> <string>Short Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +271,17 @@ ...@@ -269,4 +271,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(short_title=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_document_title</string> </value> <value> <string>your_override_document_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -249,7 +251,7 @@ ...@@ -249,7 +251,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Title</string> </value> <value> <string>Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +271,17 @@ ...@@ -269,4 +271,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(title=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_document_version</string> </value> <value> <string>your_override_document_version</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -122,7 +124,9 @@ ...@@ -122,7 +124,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -249,7 +253,7 @@ ...@@ -249,7 +253,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Version</string> </value> <value> <string>Version</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>python: context.Base_getBookParameter(version=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(version=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_logo_reference</string> </value> <value> <string>your_override_logo_reference</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find logo</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(logo=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateLogo</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_organisation_title</string> </value> <value> <string>your_override_source_organisation_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find organisation</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -249,7 +253,7 @@ ...@@ -249,7 +253,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Publishing Organisation</string> </value> <value> <string>Publishing Organisation</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getBookParameter(source_organisation=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateSourceOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>portal_skin</string> </value> <value> <string>your_portal_skin</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<list> <list>
<string>default</string> <string>default</string>
<string>description</string> <string>description</string>
<string>enabled</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -81,6 +82,10 @@ ...@@ -81,6 +82,10 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Display table of references.</string> </value> <value> <string>Display table of references.</string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value> <value> <string>my_checkbox</string> </value>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>content</string> <string>your_content</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -74,11 +74,12 @@ ...@@ -74,11 +74,12 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>format</string> <string>your_format</string>
<string>display_side</string> <string>your_display_side</string>
<string>display_svg</string> <string>your_display_svg</string>
<string>document_save</string> <string>your_document_save</string>
<string>portal_skin</string> <string>your_portal_skin</string>
<string>your_theme</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -86,9 +87,10 @@ ...@@ -86,9 +87,10 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>override_source_organisation_title</string> <string>your_override_source_organisation_title</string>
<string>override_source_person_title</string> <string>your_override_source_person_title</string>
<string>override_leaflet_header_title</string> <string>your_override_leaflet_header_title</string>
<string>your_override_logo_reference</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>content</string> </value> <value> <string>your_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Leaflet&amp;override_source_person_title=%s&amp;override_source_organisation_title=%s&amp;display_side=%s&amp;override_leaflet_header_title=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_source_person_title", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("display_side", 1), context.REQUEST.get("override_leaflet_header_title", ""), context.REQUEST.get("display_svg", "png")) python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Leaflet&amp;override_source_person_title=%s&amp;override_source_organisation_title=%s&amp;override_logo_reference=%s&amp;display_side=%s&amp;override_leaflet_header_title=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_source_person_title", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("display_side", 1), context.REQUEST.get("override_leaflet_header_title", ""), context.REQUEST.get("display_svg", "png"))
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_side</string> </value> <value> <string>your_display_side</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_svg</string> </value> <value> <string>your_display_svg</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>document_save</string> </value> <value> <string>your_document_save</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>format</string> </value> <value> <string>your_format</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_leaflet_header_title</string> </value> <value> <string>your_override_leaflet_header_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -269,4 +271,17 @@ ...@@ -269,4 +271,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLeafletParameter(leaflet_header=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_person_title</string> </value> <value> <string>your_override_logo_reference</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find logo</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -205,7 +207,7 @@ ...@@ -205,7 +207,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Person to set as publisher.</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>display_maxwidth</string> </key> <key> <string>display_maxwidth</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -249,7 +253,7 @@ ...@@ -249,7 +253,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Override Author Title</string> </value> <value> <string>Logo Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLeafletParameter(logo=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateLogo</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_organisation_title</string> </value> <value> <string>your_override_source_organisation_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find organisation</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLeafletParameter(sender_company=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateSourceOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_person_title</string> </value> <value> <string>your_override_source_person_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find person</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLeafletParameter(sender=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateSourcePerson</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>portal_skin</string> </value> <value> <string>your_portal_skin</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>WebPage_exportAsLetter</string> </value> <value> <string>WebPage_exportAsLetter</string> </value>
</item> </item>
<item>
<key> <string>action_title</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Export this web pages as a Letter in the chosen format.</string> </value> <value> <string>Export this web pages as a Letter in the chosen format.</string> </value>
...@@ -32,7 +36,7 @@ ...@@ -32,7 +36,7 @@
</item> </item>
<item> <item>
<key> <string>enctype</string> </key> <key> <string>enctype</string> </key>
<value> <string></string> </value> <value> <string>multipart/form-data</string> </value>
</item> </item>
<item> <item>
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
...@@ -54,7 +58,7 @@ ...@@ -54,7 +58,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>content</string> <string>your_content</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -74,13 +78,14 @@ ...@@ -74,13 +78,14 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>format</string> <string>your_format</string>
<string>portal_skin</string> <string>your_portal_skin</string>
<string>display_head</string> <string>your_display_head</string>
<string>letter_header_margin_to_top</string> <string>your_letter_header_margin_to_top</string>
<string>display_sender_company_above_recipient</string> <string>your_display_sender_company_above_recipient</string>
<string>display_svg</string> <string>your_display_svg</string>
<string>document_save</string> <string>your_document_save</string>
<string>your_theme</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -88,13 +93,13 @@ ...@@ -88,13 +93,13 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>override_source_organisation_title</string> <string>your_override_source_organisation_title</string>
<string>override_source_person_title</string> <string>your_override_source_person_title</string>
<string>override_destination_organisation_title</string> <string>your_override_destination_organisation_title</string>
<string>override_destination_person_title</string> <string>your_override_destination_person_title</string>
<string>destination_position_in_letter</string> <string>your_destination_position_in_letter</string>
<string>destination_position_padding_left</string> <string>your_destination_position_padding_left</string>
<string>override_date</string> <string>your_override_date</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>content</string> </value> <value> <string>your_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>destination_position_in_letter</string> </value> <value> <string>your_destination_position_in_letter</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>destination_position_padding_left</string> </value> <value> <string>your_destination_position_padding_left</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_head</string> </value> <value> <string>your_display_head</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_sender_company_above_recipient</string> </value> <value> <string>your_display_sender_company_above_recipient</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>display_svg</string> </value> <value> <string>your_display_svg</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>document_save</string> </value> <value> <string>your_document_save</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>format</string> </value> <value> <string>your_format</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>letter_header_margin_to_top</string> </value> <value> <string>your_letter_header_margin_to_top</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_date</string> </value> <value> <string>your_override_date</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_destination_organisation_title</string> </value> <value> <string>your_override_destination_organisation_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find organisation</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLetterParameter(recipient_company=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateDestinationOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_destination_person_title</string> </value> <value> <string>your_override_destination_person_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find person</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLetterParameter(recipient=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateDestinationPerson</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_organisation_title</string> </value> <value> <string>your_override_source_organisation_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find organisation</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLetterParameter(sender_company=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateSourceOrganisation</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>override_source_person_title</string> </value> <value> <string>your_override_source_person_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>Can\'t find person</string> </value>
</item> </item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -225,7 +227,9 @@ ...@@ -225,7 +227,9 @@
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
...@@ -269,4 +273,30 @@ ...@@ -269,4 +273,30 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.Base_getLetterParameter(sender=True)</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateSourcePerson</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>portal_skin</string> </value> <value> <string>your_portal_skin</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>content</string> <string>your_content</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -74,11 +74,12 @@ ...@@ -74,11 +74,12 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>format</string> <string>your_format</string>
<string>display_svg</string> <string>your_display_svg</string>
<string>display_about</string> <string>your_display_about</string>
<string>document_save</string> <string>your_document_save</string>
<string>portal_skin</string> <string>your_portal_skin</string>
<string>your_theme</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -86,8 +87,8 @@ ...@@ -86,8 +87,8 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>override_source_organisation_title</string> <string>your_override_source_organisation_title</string>
<string>override_source_person_title</string> <string>your_override_source_person_title</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>content</string> </value> <value> <string>your_content</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment