Commit 304f4187 authored by Sven Franck's avatar Sven Franck

erp5_corporate_identity: add missing files, update compare files, set all...

erp5_corporate_identity: add missing files, update compare files, set all dates to arbitrary values in test
parent 53f37712
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Generate a book from the current web page.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>export_book</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Export as Book</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewExportAsBookDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Generate a leaflet from the current web page.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>export_leaflet</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Export as Leaflet</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewExportAsLeafletDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Generate a letter from the current web page.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>export_letter</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Export as Letter</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewExportAsLetterDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_print</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_print</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Print the current web page as Book PDF.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>print_book</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print As Book</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewPrintAsBookDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_print</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_print</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Print the current web page as Leaflet PDF.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>print_leaflet</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print As Leaflet</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewPrintAsLeafletDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_print</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_print</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Print the current web page as Letter PDF.</string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>print_letter</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>20.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print As Letter</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewPrintAsLetterDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -47,7 +47,6 @@ def convertDocumentByConversionServer( ...@@ -47,7 +47,6 @@ def convertDocumentByConversionServer(
self.getPortalObject().portal_preferences.getPreferredDocumentConversionServerUrl(), self.getPortalObject().portal_preferences.getPreferredDocumentConversionServerUrl(),
allow_none=True allow_none=True
) )
self.log("sven", self.getPortalObject().portal_preferences.getPreferredDocumentConversionServerUrl())
return b64decode( return b64decode(
proxy.convertFile( proxy.convertFile(
b64encode(data), b64encode(data),
......
...@@ -46,20 +46,20 @@ ...@@ -46,20 +46,20 @@
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple> <tuple>
<string>W:142, 0: Anomalous backslash in string: \'\\s\'. String constant might be missing an r prefix. (anomalous-backslash-in-string)</string> <string>W:141, 0: Anomalous backslash in string: \'\\s\'. String constant might be missing an r prefix. (anomalous-backslash-in-string)</string>
<string>W: 38, 4: Redefining built-in \'zip\' (redefined-builtin)</string> <string>W: 38, 4: Redefining built-in \'zip\' (redefined-builtin)</string>
<string>W: 77, 25: Redefining name \'trail\' from outer scope (line 155) (redefined-outer-name)</string> <string>W: 76, 25: Redefining name \'trail\' from outer scope (line 154) (redefined-outer-name)</string>
<string>W: 77, 20: Redefining name \'tags\' from outer scope (line 154) (redefined-outer-name)</string> <string>W: 76, 20: Redefining name \'tags\' from outer scope (line 153) (redefined-outer-name)</string>
<string>W:102, 28: Redefining name \'tags\' from outer scope (line 154) (redefined-outer-name)</string> <string>W:101, 28: Redefining name \'tags\' from outer scope (line 153) (redefined-outer-name)</string>
<string>W:102, 25: Redefining name \'sw\' from outer scope (line 149) (redefined-outer-name)</string> <string>W:101, 25: Redefining name \'sw\' from outer scope (line 148) (redefined-outer-name)</string>
<string>W:102, 39: Redefining name \'maxlines\' from outer scope (line 156) (redefined-outer-name)</string> <string>W:101, 39: Redefining name \'maxlines\' from outer scope (line 155) (redefined-outer-name)</string>
<string>W:102, 33: Redefining name \'trail\' from outer scope (line 155) (redefined-outer-name)</string> <string>W:101, 33: Redefining name \'trail\' from outer scope (line 154) (redefined-outer-name)</string>
<string>W:126, 37: Redefining name \'tags\' from outer scope (line 154) (redefined-outer-name)</string> <string>W:125, 37: Redefining name \'tags\' from outer scope (line 153) (redefined-outer-name)</string>
<string>W:126, 33: Redefining name \'sw\' from outer scope (line 149) (redefined-outer-name)</string> <string>W:125, 33: Redefining name \'sw\' from outer scope (line 148) (redefined-outer-name)</string>
<string>W:145, 16: Redefining name \'p\' from outer scope (line 157) (redefined-outer-name)</string> <string>W:144, 16: Redefining name \'p\' from outer scope (line 156) (redefined-outer-name)</string>
<string>W:126, 50: Redefining name \'maxlines\' from outer scope (line 156) (redefined-outer-name)</string> <string>W:125, 50: Redefining name \'maxlines\' from outer scope (line 155) (redefined-outer-name)</string>
<string>W:126, 43: Redefining name \'trail\' from outer scope (line 155) (redefined-outer-name)</string> <string>W:125, 43: Redefining name \'trail\' from outer scope (line 154) (redefined-outer-name)</string>
<string>W:126, 28: Redefining name \'txt\' from outer scope (line 150) (redefined-outer-name)</string> <string>W:125, 28: Redefining name \'txt\' from outer scope (line 149) (redefined-outer-name)</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13086926.49</string> </value> <value> <string>ts13173207.52</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>520cef47a1cfe7b1ab0918ac1497337c</string> </value> <value> <string>69244d18d3fc8c93a5e47fb84f3849c1</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>85558</int> </value> <value> <int>85424</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5567.38688.51268</string> </value> <value> <string>964.6998.20303.40328</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086926.49</float> <float>1513173207.53</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13086950.12</string> </value> <value> <string>ts13173230.15</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>5b4b48ae2acf229e487e90f909bbfd28</string> </value> <value> <string>2427e81332d988933774df961cd6a0c7</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>160122</int> </value> <value> <int>168359</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5567.64164.45772</string> </value> <value> <string>964.6998.48960.16776</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086950.13</float> <float>1513173230.15</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13086972.43</string> </value> <value> <string>ts13173252.39</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>4b55fac6b8d31ff728f7d833fd896a79</string> </value> <value> <string>583843dec1b1630f3372095575eb43b4</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>89791</int> </value> <value> <int>89829</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5568.26027.3993</string> </value> <value> <string>964.6999.35691.36471</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086972.43</float> <float>1513173252.4</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13099734.13</string> </value> <value> <string>ts13174820.87</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -63,6 +63,97 @@ ...@@ -63,6 +63,97 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_content_information</string> </key>
<value>
<dictionary>
<item>
<key> <string>ArtBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>BleedBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>CreationDate</string> </key>
<value> <string>Wed Dec 13 15:20:14 2017</string> </value>
</item>
<item>
<key> <string>Creator</string> </key>
<value> <string>wkhtmltopdf 0.12.4</string> </value>
</item>
<item>
<key> <string>CropBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Encrypted</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>File size</string> </key>
<value> <string>115075 bytes</string> </value>
</item>
<item>
<key> <string>Form</string> </key>
<value> <string>none</string> </value>
</item>
<item>
<key> <string>JavaScript</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>MediaBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Optimized</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>PDF version</string> </key>
<value> <string>1.4</string> </value>
</item>
<item>
<key> <string>Page rot</string> </key>
<value> <string>0</string> </value>
</item>
<item>
<key> <string>Page size</string> </key>
<value> <string>595 x 842 pts (A4)</string> </value>
</item>
<item>
<key> <string>Pages</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>Producer</string> </key>
<value> <string>Qt 4.8.7</string> </value>
</item>
<item>
<key> <string>Suspects</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Tagged</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Title</string> </key>
<value> <string>Template Test Leaflet</string> </value>
</item>
<item>
<key> <string>TrimBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>UserProperties</string> </key>
<value> <string>no</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_count</string> </key> <key> <string>_count</string> </key>
<value> <value>
...@@ -83,7 +174,7 @@ ...@@ -83,7 +174,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>8e05f3583b1404fc2b3c2c1abc3a9ce4</string> </value> <value> <string>c26f18152f6c90782bd3370b269dd4e7</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +216,7 @@ ...@@ -125,7 +216,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>115071</int> </value> <value> <int>115075</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +373,7 @@ ...@@ -282,7 +373,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5784.49253.4488</string> </value> <value> <string>964.7028.293.17851</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +391,7 @@ ...@@ -300,7 +391,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513099734.14</float> <float>1513174820.87</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13079037.2</string> </value> <value> <string>ts13174835.84</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -63,6 +63,97 @@ ...@@ -63,6 +63,97 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_content_information</string> </key>
<value>
<dictionary>
<item>
<key> <string>ArtBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>BleedBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>CreationDate</string> </key>
<value> <string>Wed Dec 13 15:20:33 2017</string> </value>
</item>
<item>
<key> <string>Creator</string> </key>
<value> <string>wkhtmltopdf 0.12.4</string> </value>
</item>
<item>
<key> <string>CropBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Encrypted</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>File size</string> </key>
<value> <string>115139 bytes</string> </value>
</item>
<item>
<key> <string>Form</string> </key>
<value> <string>none</string> </value>
</item>
<item>
<key> <string>JavaScript</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>MediaBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Optimized</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>PDF version</string> </key>
<value> <string>1.4</string> </value>
</item>
<item>
<key> <string>Page rot</string> </key>
<value> <string>0</string> </value>
</item>
<item>
<key> <string>Page size</string> </key>
<value> <string>595 x 842 pts (A4)</string> </value>
</item>
<item>
<key> <string>Pages</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>Producer</string> </key>
<value> <string>Qt 4.8.7</string> </value>
</item>
<item>
<key> <string>Suspects</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Tagged</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Title</string> </key>
<value> <string>Template Test Leaflet</string> </value>
</item>
<item>
<key> <string>TrimBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>UserProperties</string> </key>
<value> <string>no</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_count</string> </key> <key> <string>_count</string> </key>
<value> <value>
...@@ -83,7 +174,7 @@ ...@@ -83,7 +174,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>f8add37a3e8b489e8b5c21e7d8c84a81</string> </value> <value> <string>e8b2730e75043c0a7ed95f3bba38ab5f</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +216,7 @@ ...@@ -125,7 +216,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>115135</int> </value> <value> <int>115139</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +373,7 @@ ...@@ -282,7 +373,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.136.38063.53811</string> </value> <value> <string>964.7028.24546.14233</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +391,7 @@ ...@@ -300,7 +391,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079037.21</float> <float>1513174835.84</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13079060.61</string> </value> <value> <string>ts13174851.43</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -63,6 +63,97 @@ ...@@ -63,6 +63,97 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_content_information</string> </key>
<value>
<dictionary>
<item>
<key> <string>ArtBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>BleedBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>CreationDate</string> </key>
<value> <string>Wed Dec 13 15:20:47 2017</string> </value>
</item>
<item>
<key> <string>Creator</string> </key>
<value> <string>wkhtmltopdf 0.12.4</string> </value>
</item>
<item>
<key> <string>CropBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Encrypted</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>File size</string> </key>
<value> <string>114763 bytes</string> </value>
</item>
<item>
<key> <string>Form</string> </key>
<value> <string>none</string> </value>
</item>
<item>
<key> <string>JavaScript</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>MediaBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>Optimized</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>PDF version</string> </key>
<value> <string>1.4</string> </value>
</item>
<item>
<key> <string>Page rot</string> </key>
<value> <string>0</string> </value>
</item>
<item>
<key> <string>Page size</string> </key>
<value> <string>595 x 842 pts (A4)</string> </value>
</item>
<item>
<key> <string>Pages</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>Producer</string> </key>
<value> <string>Qt 4.8.7</string> </value>
</item>
<item>
<key> <string>Suspects</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Tagged</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Title</string> </key>
<value> <string>Template Test Leaflet</string> </value>
</item>
<item>
<key> <string>TrimBox</string> </key>
<value> <string>0.00 0.00 595.00 842.00</string> </value>
</item>
<item>
<key> <string>UserProperties</string> </key>
<value> <string>no</string> </value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_count</string> </key> <key> <string>_count</string> </key>
<value> <value>
...@@ -83,7 +174,7 @@ ...@@ -83,7 +174,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>cb26151b5c7e18d9e22c9198f7c1a9d6</string> </value> <value> <string>eab0626626607b7b4283d12190e5268d</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +216,7 @@ ...@@ -125,7 +216,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>114621</int> </value> <value> <int>114763</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +373,7 @@ ...@@ -282,7 +373,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.117.4160.48332</string> </value> <value> <string>964.7028.40991.11793</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +391,7 @@ ...@@ -300,7 +391,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079060.61</float> <float>1513174851.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13084690.37</string> </value> <value> <string>ts13175896.62</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>a4d287657642dce1324a5231cd913591</string> </value> <value> <string>7d9213a49ad7d28c5b8857d1f9831988</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>375399</int> </value> <value> <int>375112</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.3207.29696</string> </value> <value> <string>964.5771.59231.61559</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084690.39</float> <float>1513175896.63</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13084810.3</string> </value> <value> <string>ts13176006.36</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>8824fb3bf650e99f5a87588c04bb2384</string> </value> <value> <string>be2ee9c4b42e2f881442fc91072de9ab</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>376926</int> </value> <value> <int>376644</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.43346.6860</string> </value> <value> <string>964.5772.39055.40550</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084810.31</float> <float>1513176006.38</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13084870.95</string> </value> <value> <string>ts13176037.79</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>6004b1491303329de6b7a74504e424f1</string> </value> <value> <string>6956a880932f729a2a600335190eeabf</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>378264</int> </value> <value> <int>376644</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5448.3473.64256</string> </value> <value> <string>964.5772.61914.36369</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084870.98</float> <float>1513176037.8</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13084746.19</string> </value> <value> <string>ts13175935.7</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>b155aa8c818eec2469d45661492ae2b0</string> </value> <value> <string>6c0acf04d6267ddef8f7196d0b89c476</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>389059</int> </value> <value> <int>388524</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.26215.1911</string> </value> <value> <string>964.5772.21662.20872</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084746.38</float> <float>1513175935.7</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts13084939.2</string> </value> <value> <string>ts13176059.47</string> </value>
</item> </item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>fc6ed78f148e33a0a73cf6acf02254e3</string> </value> <value> <string>034930030b079355049d3e27e3f0b136</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>390315</int> </value> <value> <int>389774</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5444.36473.31795</string> </value> <value> <string>964.5773.50642.31232</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084939.22</float> <float>1513176059.48</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>6ba1280be7f9b4580da2017324754509</string> </value> <value> <string>451488c9a7eedcaff73ef39537e5d829</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5568.28024.47001</string> </value> <value> <string>964.6999.12184.63761</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086974.34</float> <float>1513173254.31</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>a2e8c3794253b1b74f6ef559602dbcb7</string> </value> <value> <string>30fda3297e9a6fb26b5af747e0b5d97a</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5567.40320.25446</string> </value> <value> <string>964.6998.22480.34952</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086928.07</float> <float>1513173210.23</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>ad5d0510d78e9ea2e36808336f9d3675</string> </value> <value> <string>05aa2ec82090c91886aaeea1aae30814</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5568.1180.38570</string> </value> <value> <string>964.6998.50873.63385</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086951.95</float> <float>1513173231.75</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>8c2e7355baa9b1c33404470fa7a62839</string> </value> <value> <string>238dfef55be0775bfe32dbe42e25f771</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5568.6602.2474</string> </value> <value> <string>964.6998.51841.16179</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086952.77</float> <float>1513173232.48</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>65ebd974686b90ddebeecf3e4235e419</string> </value> <value> <string>f5e6bed7b486c32ee4abeff34ea000c3</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5568.8284.61303</string> </value> <value> <string>964.6998.52860.3840</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086953.55</float> <float>1513173233.25</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>2f5fe46dacb1043b5847191649a8c302</string> </value> <value> <string>f98e931fe96fca0940978f49a5b8cc33</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.116.46067.34201</string> </value> <value> <string>964.7028.26264.64119</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079038.98</float> <float>1513174837.58</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>59370ff75e73aa79f4c245764801dba7</string> </value> <value> <string>1e5370f93577e890e8ad3428a2b1a313</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.117.8617.9011</string> </value> <value> <string>964.7028.42919.4437</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079063.25</float> <float>1513174853.05</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>2d1998b227b2587778ce6147baf69bfa</string> </value> <value> <string>75a6511004c08fb35a46f7cef756bb53</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.116.22477.45226</string> </value> <value> <string>964.7034.11779.24439</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079021.28</float> <float>1513174822.34</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>913a03b780fa8d06a131fcf4669fd950</string> </value> <value> <string>973a3153b288634a7180829611248343</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.7593.64341</string> </value> <value> <string>964.5771.61097.26692</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084718.88</float> <float>1513175898.12</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>cf639505f6709f51ef74d544d3b2f0f3</string> </value> <value> <string>597359f1828d7d3435a7d9b3029d71bb</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.45041.13875</string> </value> <value> <string>964.5772.40895.870</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084827.26</float> <float>1513176014.17</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>a0b20cf5893df354fbb6dbba21b83d5d</string> </value> <value> <string>597359f1828d7d3435a7d9b3029d71bb</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5448.8856.41864</string> </value> <value> <string>964.5772.63941.56627</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084876.05</float> <float>1513176040.64</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>d37d4692a045f40b0ab81ff9b1446303</string> </value> <value> <string>6b89a106a45b73704e0e266ae6c13e37</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5447.28178.61388</string> </value> <value> <string>964.5772.23274.39765</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084762.06</float> <float>1513175944.93</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <string>6bbe38dd6a8235ed74653965a994d83a</string> </value> <value> <string>c0092b40070729b70a5116798f997378</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5448.27219.29013</string> </value> <value> <string>964.5773.57837.16042</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084941.81</float> <float>1513176060.93</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Organisation" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>corporate_name</string> </key>
<value> <string>Test Association</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Test Association for template testing</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_test_association</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Organisation</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Test Association</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.20769.17232.9932</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1511195493.28</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1510152982.81</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Organisation" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>corporate_name</string> </key>
<value> <string>Test Organisation</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Test Organisation for template testing</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_test_organisation</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Organisation</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Test Organisation</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.235.13732.34679</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1508921076.11</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1508920978.57</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
<h1>Synthesis</h1>
<p>This should be the summary of the document, for example: this document
is an example of a erp5 book document. It is usable for project reports,
sale offers and sale orders. It's plain HTML and can be rendered as html (for
displaying on websites) or as pdf using the export dialog. The following options
can be activated through the export dialog:
</p>
<ul>
<li>Add table of content</li>
<li>Add table of history (version, signatures, distribution - XXX only raw)</li>
<li>Add table of references (abbreviations, referenced/applicable documents, figures, tables), applies to links in []</li>
<li>Embed (internal) documents, applies to links with references</li>
<li>Embed (internal) reports, applies to links with url parameter report</li>
</ul>
<p>After this you can write plain html and embed documents as needed. Some things to note:</p>
<h1>Headers</h1>
<p>
Make sure to number headers correctly (h1->h2->h3...). No numbering (&gt;h1&lt;1....)
is needed. Also, no html inside headers is allowed.
</p>
<h1>Links</h1>
<h2>Applicable Documents</h2>
<p>
Look like this [<a href="http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf" title="Claudia Hofemann Wind Energy Section, TU Delft">AD</a>].
Note you need to wrap in [] and add "AD", href and title. Semicolons in titles
fill the different cells in the generated table.
</p>
<h2>Referenced Documents</h2>
<p>Same as applicable documents, so [<a href="https://www.epa.ie/pubs/advice/noise/Wind_Turbine_web.pdf" title="Guidance Note on Noise Assessment of Devices;A;B;C">RD</a>],
note that doubles are counted correctly, [<a href="http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf" title="Claudia Hofemann Wind Energy Section, TU Delft">AD</a>]
and everything is auto-numbered and linked from the tables.
</p>
<h2>Abbreviations</h2>
<p>Have a similar synatx, [<a href="http://www.wikipedia.com/ERP" title="Enterprise Research Planning;The process of planning the resources of an enterprise">ERP</a>],
with the only difference being the abbreviation instead of AD/RD
</p>
<h2>Plain Links</h2>
<p>
Plain links will not be formatted, unless embedding documents/reports is active.
Embedding documents will cause internal (!) links to be replaced with the content
of the document. So, this link external link <a href="https://google.com">document</a>
will not be touched, while this one will end up as a reference [<a href="https://www.google.com/" title="Google Website;Search;0;1">AD</a>]
and this internl link (only reference) will be embedded if the option is active:
</p>
<a href="Template.Test.Book.Embeddable.Document">This link should be embedded</a>
<p>Embedded document above.</p>
<h2>Table Caption/Image Captions</h2>
<p>Tables should have caption tags after (!) the tbody tag, images should have an
alt attribute, to list them in the reference tables. Examples of both:
</p>
<table>
<thead>
<tr>
<th colspan="4">Some Table</th>
</tr>
<tr>
<th>A</th>
<th>B</th>
<th>C</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>123</td>
<td>456</td>
<td>Some text</td>
<td>More description</td>
</tr>
</tbody>
<caption>Table description</caption>
</table>
<p>There is more</p>
<table>
<thead>
<tr>
<th colspan="4">Some Table</th>
</tr>
<tr>
<th>A</th>
<th>B</th>
<th>C</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>123</td>
<td>456</td>
<td>Some text</td>
<td>More description</td>
</tr>
</tbody>
<caption>Table description</caption>
</table>
<p>And an image</p>
<p>Please don't add any formatting to a table except for the width of cells. There
is a default css applied to all tables. Finally an image:
</p>
<img src="Template.Test.Image.Office?format=png&amp;display=medium" type="image/png" alt="Caption for this image" />
<h1>Reports</h1>
<p>
Reports are not part of the standard template, so they have to be implemented indivually
in template customizations. Calling a nonexisting report will not throw an error and
only leave the link untouched.
</p>
<p> To embedding a report just create a link to the module and object (no references!,
report must be callable on the object) and specify the report name and subsequent
report parameters. For example:
</p>
<h2>Project Reports</h2>
<a href="project_module/template_test_project?report=Base_generateLineBreakdownReport&amp;display_header=2">Line Breakdown Report</a>
<br/>
<h2>Sale Order Reports</h2>
<a href="sale_order_module/template_test_sale_order?report=Base_generateCostEffortReport&amp;display_detail=detailed">Cost Effort Report</a>
<br/>
<a href="sale_order_module/template_test_sale_order?report=Base_generateDeliverableReport">Deliverable Report</a>
<br/>
<a href="sale_order_module/template_test_sale_order?report=Base_generateLineBreakdownReport">Project Breakdown</a>
<br/>
<a href="sale_order_module/template_test_sale_order?report=Base_generateRequirementCoverageReport&amp;display_comment=''">Requirement Coverage</a>
<br/>
<a href="sale_order_module/template_test_sale_order?report=Base_generateRequirementReport&amp;display_comment=''&amp;requirement_url=requirement_module/template_test_requirement_sale_order">Requirement Report</a>
<p>
These reports are part of the Nexedi corporate identity template and will be rendered
if the template is installed. Else, only the links will be visible.
</p>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Page" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Change_local_roles_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>Template.Book</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_web_page_book</string> </value>
</item>
<item>
<key> <string>isIndexable</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="PropertyGetter" module="Products.ERP5Type.Accessor.Constant"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isIndexable</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>isTemplate</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>isTemplate</string> </value>
</item>
<item>
<key> <string>_id</string> </key>
<value> <string>isTemplate</string> </value>
</item>
<item>
<key> <string>value</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>language</string> </key>
<value> <string>en</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Page</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Add Book</string> </value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>001</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>document_publication_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>processing_status_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1513110265.39</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>draft</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.5988.6912.36437</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1513111929.34</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>detect_converted_file</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_processing_state</string> </key>
<value> <string>converted</string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>0.0.0.0</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1513110265.39</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
<h1>Header Embedded Document</h1>
<p>This is the content of an embedded document loaded via reference.</p>
<h2>Header Embedded Document content Examples</h2>
<p>Some more references to include in the overall tables
[<a href="https://gnu.org" title="Gnu">AD</a>], as well another image.
</p>
<img src="Template.Test.Illustration.Reach?format=png&amp;display=medium" alt="Reach" />
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Page" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Change_local_roles_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>Template.Test.Book.Embeddable.Document</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_test_book_embeddable_document_html</string> </value>
</item>
<item>
<key> <string>language</string> </key>
<value> <string>en</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Page</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value> <string>Sample title</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Template Test Book Embeddable Document</string> </value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>001</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>document_publication_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>processing_status_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>publish</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1512817058.47</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>published</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.1073.42105.20411</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1512817239.69</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>detect_converted_file</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_processing_state</string> </key>
<value> <string>converted</string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>0.0.0.0</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1512816740.14</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086867.81</float> <float>1513173435.37</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086892.76</float> <float>1513173502.25</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png" <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
alt="" /> <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png"
alt="" />
</div>
</td> </td>
<td> <td>
<div class="ci-book-header-title">Template Test Book</div> <div class="ci-book-header-title">Template Test Book</div>
...@@ -46,11 +48,11 @@ ...@@ -46,11 +48,11 @@
</div> </div>
<div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last"> <div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last">
<span class="ci-book-header-key">Rev.:</span> <span class="ci-book-header-key">Rev.:</span>
<span class="ci-book-header-value">84</span> <span class="ci-book-header-value">1</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Date:</span> <span class="ci-book-header-key">Date:</span>
<span class="ci-book-header-value">2017-12-12</span> <span class="ci-book-header-value">2017-12-13</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Page:</span> <span class="ci-book-header-key">Page:</span>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5570.2631.13499</string> </value> <value> <string>964.6995.11547.64836</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086876.15</float> <float>1513173449.22</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small?format=png" <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
alt="" /> <img src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small"
alt="" />
</div>
</td> </td>
<td> <td>
<div class="ci-book-header-title">Couscous</div> <div class="ci-book-header-title">Couscous</div>
...@@ -46,11 +48,11 @@ ...@@ -46,11 +48,11 @@
</div> </div>
<div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last"> <div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last">
<span class="ci-book-header-key">Rev.:</span> <span class="ci-book-header-key">Rev.:</span>
<span class="ci-book-header-value">84</span> <span class="ci-book-header-value">1</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Date:</span> <span class="ci-book-header-key">Date:</span>
<span class="ci-book-header-value">2017-12-12</span> <span class="ci-book-header-value">2017-12-13</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Page:</span> <span class="ci-book-header-key">Page:</span>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5567.166.39901</string> </value> <value> <string>964.7008.58589.56934</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086889.25</float> <float>1513173467.94</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png" <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
alt="" /> <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png"
alt="" />
</div>
</td> </td>
<td> <td>
<div class="ci-book-header-title">Template Test Book</div> <div class="ci-book-header-title">Template Test Book</div>
...@@ -46,11 +48,11 @@ ...@@ -46,11 +48,11 @@
</div> </div>
<div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last"> <div class="ci-book-header-sidebyside ci-book-header-sidebyside-last ci-document-page-header-sidebyside ci-document-page-header-sidebyside-last">
<span class="ci-book-header-key">Rev.:</span> <span class="ci-book-header-key">Rev.:</span>
<span class="ci-book-header-value">17</span> <span class="ci-book-header-value">1</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Date:</span> <span class="ci-book-header-key">Date:</span>
<span class="ci-book-header-value">2017-12-12</span> <span class="ci-book-header-value">2017-12-13</span>
</div> </div>
<div> <div>
<span class="ci-book-header-key">Page:</span> <span class="ci-book-header-key">Page:</span>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5567.21610.1433</string> </value> <value> <string>964.7009.11963.8686</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513086910.76</float> <float>1513173518.52</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.5438.50603.8004</string> </value> <value> <string>964.7035.26302.21606</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513078977.78</float> <float>1513174775.88</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.115.28063.25565</string> </value> <value> <string>964.7032.50192.28023</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513078992.92</float> <float>1513174786.74</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div id="legalese"> <div id="legalese">
<p class="top"><span>&copy;</span><span>Test Organisation 2017</span> <p class="top"><span>&copy;</span><span>Test Organisation 1976</span>
</p> </p>
<p> <p>
<span>Test Organisation</span><br /> <span>Test Organisation</span><br />
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<p> <p>
<span>Printed in</span> <span>Printed in</span>
<span></span><br /> <span></span><br />
<span>2017-Nov</span><br /> <span>Nov-1976</span><br />
<span>All rights reserved</span> <span>All rights reserved</span>
</p> </p>
<p> <p>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</div> </div>
<div class="ci-leaflet-container-center">Template.Test.Leaflet-001-en</div> <div class="ci-leaflet-container-center">Template.Test.Leaflet-001-en</div>
<div class="ci-leaflet-container-right"> <div class="ci-leaflet-container-right">
<span>&copy;</span><span>2017 Test Organisation</span> <span>&copy;</span><span>1976 Test Organisation</span>
<br /> <br />
<span>Test Sender</span> <span class="page"></span> | <span class="topage"></span> <span>Test Sender</span> <span class="page"></span> | <span class="topage"></span>
</div> </div>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.65388.25773.45431</string> </value> <value> <string>964.7031.14431.39577</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513078975.2</float> <float>1513174773.44</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
</div> </div>
<div class="ci-leaflet-container-center">Template.Test.Leaflet-001-en</div> <div class="ci-leaflet-container-center">Template.Test.Leaflet-001-en</div>
<div class="ci-leaflet-container-right"> <div class="ci-leaflet-container-right">
<span>&copy;</span><span>2017 Test Association</span> <span>&copy;</span><span>1976 Test Association</span>
<br /> <br />
<span>Test Recipient</span> <span class="page"></span> | <span class="topage"></span> <span>Test Recipient</span> <span class="page"></span> | <span class="topage"></span>
</div> </div>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.65418.9338.64750</string> </value> <value> <string>964.7018.25559.40482</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513078990.09</float> <float>1513174784.12</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div id="legalese"> <div id="legalese">
<p class="top"><span>&copy;</span><span> 2017</span> <p class="top"><span>&copy;</span><span> 1976</span>
</p> </p>
<p> <p>
<span></span><br /> <span></span><br />
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<p> <p>
<span>Printed in</span> <span>Printed in</span>
<span></span><br /> <span></span><br />
<span>2017-Nov</span><br /> <span>Nov-1976</span><br />
<span>All rights reserved</span> <span>All rights reserved</span>
</p> </p>
<p> <p>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</div> </div>
<div class="ci-leaflet-container-center">Template.Test.Leaflet-002-de</div> <div class="ci-leaflet-container-center">Template.Test.Leaflet-002-de</div>
<div class="ci-leaflet-container-right"> <div class="ci-leaflet-container-right">
<span>&copy;</span><span>2017 </span> <span>&copy;</span><span>1976 </span>
<br /> <br />
<span>Test Author</span> <span class="page"></span> | <span class="topage"></span> <span>Test Author</span> <span class="page"></span> | <span class="topage"></span>
</div> </div>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.65389.40152.28859</string> </value> <value> <string>964.7033.45801.35805</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513079002.66</float> <float>1513174797.02</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
href="default_themes/themes.css?portal_skin=Slide" /> href="default_themes/themes.css?portal_skin=Slide" />
<link rel="stylesheet" <link rel="stylesheet"
href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css?portal_skin=Slide" /> href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css?portal_skin=Slide" />
<style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;}</style> <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;} .ci-slideshow-footer-logo {background: #FFF url("common_images/fallback.png") center no-repeat;background-size: 100px auto;}</style>
<script type="text/javascript"> <script type="text/javascript">
function setPlaceholdersWithUrlParameters() { function setPlaceholdersWithUrlParameters() {
var vars={}; var vars={};
...@@ -37,9 +37,7 @@ ...@@ -37,9 +37,7 @@
<div class="ci-slideshow-footer"> <div class="ci-slideshow-footer">
<div class="ci-slideshow-container-left"> <div class="ci-slideshow-container-left">
<div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
<img alt="Logo" src="common_images/fallback.png" />
</div> </div>
<div class="ci-slideshow-container-center"></div> <div class="ci-slideshow-container-center"></div>
<div class="ci-slideshow-container-right"> <div class="ci-slideshow-container-right">
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.62213.44228.42205</string> </value> <value> <string>964.5771.21247.20445</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084600.81</float> <float>1513175842.96</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
href="default_themes/themes.css?portal_skin=Slide" /> href="default_themes/themes.css?portal_skin=Slide" />
<link rel="stylesheet" <link rel="stylesheet"
href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css?portal_skin=Slide" /> href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css?portal_skin=Slide" />
<style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;}</style> <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;} .ci-slideshow-footer-logo {background: #FFF url("Template.Test.Image.Logo.Alternativ?format=png&display=small") center no-repeat;background-size: 100px auto;}</style>
<script type="text/javascript"> <script type="text/javascript">
function setPlaceholdersWithUrlParameters() { function setPlaceholdersWithUrlParameters() {
var vars={}; var vars={};
...@@ -37,10 +37,7 @@ ...@@ -37,10 +37,7 @@
<div class="ci-slideshow-footer"> <div class="ci-slideshow-footer">
<div class="ci-slideshow-container-left"> <div class="ci-slideshow-container-left">
<div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
<img alt="Logo"
src="Template.Test.Image.Logo.Alternativ?format=png&amp;display=small?format=png" />
</div> </div>
<div class="ci-slideshow-container-center"></div> <div class="ci-slideshow-container-center"></div>
<div class="ci-slideshow-container-right"> <div class="ci-slideshow-container-right">
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.63943.23444.58333</string> </value> <value> <string>964.5771.32458.28160</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084634.43</float> <float>1513175868.36</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
href="default_themes/themes.css?portal_skin=Slide" /> href="default_themes/themes.css?portal_skin=Slide" />
<link rel="stylesheet" <link rel="stylesheet"
href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_002_en_html/slide_css/slide.css?portal_skin=Slide" /> href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_002_en_html/slide_css/slide.css?portal_skin=Slide" />
<style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;}</style> <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("common_images/fallback.png") center no-repeat;background-size: auto 120px;} .ci-slideshow-footer-logo {background: #FFF url("common_images/fallback.png") center no-repeat;background-size: 100px auto;}</style>
<script type="text/javascript"> <script type="text/javascript">
function setPlaceholdersWithUrlParameters() { function setPlaceholdersWithUrlParameters() {
var vars={}; var vars={};
...@@ -37,9 +37,7 @@ ...@@ -37,9 +37,7 @@
<div class="ci-slideshow-footer"> <div class="ci-slideshow-footer">
<div class="ci-slideshow-container-left"> <div class="ci-slideshow-container-left">
<div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
<img alt="Logo" src="common_images/fallback.png" />
</div> </div>
<div class="ci-slideshow-container-center">Some description</div> <div class="ci-slideshow-container-center">Some description</div>
<div class="ci-slideshow-container-right"> <div class="ci-slideshow-container-right">
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.62222.28215.59050</string> </value> <value> <string>964.5771.40777.12629</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1513084646.51</float> <float>1513175877.42</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -39,6 +39,7 @@ if source is None: ...@@ -39,6 +39,7 @@ if source is None:
source_organisation = None source_organisation = None
source_organisation_list = [] source_organisation_list = []
source_organisation_uid = None source_organisation_uid = None
source_set = None
# source person # source person
if override_source_person_title is not None or override_source_person_title is blank: if override_source_person_title is not None or override_source_person_title is blank:
...@@ -85,9 +86,10 @@ if default_bank_account_uid is not None: ...@@ -85,9 +86,10 @@ if default_bank_account_uid is not None:
# XXX images stored on organisation (as do images in skin folders) # XXX images stored on organisation (as do images in skin folders)
if override_logo_reference: if override_logo_reference:
source_logo_url = html_quote(override_logo_reference) + "?format=png&display=small" source_logo_url = html_quote(override_logo_reference) + "?format=png&display=small"
source_set = True
if source_logo_url is None: if source_logo_url is None:
source_logo_url = source.get("logo_url", blank) source_logo_url = source.get("logo_url", blank)
if source_logo_url is not blank: if source_logo_url is not blank and source_set is None:
source_logo_url = source_logo_url + "?format=png" source_logo_url = source_logo_url + "?format=png"
if source_logo_url is blank and theme_logo_url is not None: if source_logo_url is blank and theme_logo_url is not None:
source_logo_url = theme_logo_url source_logo_url = theme_logo_url
......
...@@ -11,8 +11,8 @@ if parameter == "default_theme_css_url": ...@@ -11,8 +11,8 @@ if parameter == "default_theme_css_url":
return "default_themes/themes.css" return "default_themes/themes.css"
if parameter == "wkhtmltopdf_rendering_fix": if parameter == "wkhtmltopdf_rendering_fix":
return
""" return """
<script> <script>
(function () { (function () {
var table_list = document.body.querySelectorAll("table"), var table_list = document.body.querySelectorAll("table"),
......
...@@ -19,5 +19,6 @@ return context.Base_viewAsReport( ...@@ -19,5 +19,6 @@ return context.Base_viewAsReport(
report_title=report_title, report_title=report_title,
requirement_relative_url=requirement_relative_url, requirement_relative_url=requirement_relative_url,
batch_mode=batch_mode, batch_mode=batch_mode,
override_revision=override_revision,
**kw **kw
) )
...@@ -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=None, batch_mode=None, requirement_relative_url=None, document_save=None, document_download=None, document_language=None, document_reference=None, document_version=None, display_detail=None, display_depth=None, display_comment=None, display_header=None, report_title=None, document_title=None, report_name=None, *args,**kw</string> </value> <value> <string>format=None, override_revision=None, batch_mode=None, requirement_relative_url=None, document_save=None, document_download=None, document_language=None, document_reference=None, document_version=None, display_detail=None, display_depth=None, display_comment=None, display_header=None, report_title=None, document_title=None, report_name=None, *args,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -17,5 +17,6 @@ return context.Base_viewAsReport( ...@@ -17,5 +17,6 @@ return context.Base_viewAsReport(
report_name=report_name, report_name=report_name,
requirement_relative_url=requirement_relative_url, requirement_relative_url=requirement_relative_url,
batch_mode=batch_mode, batch_mode=batch_mode,
override_revision=override_revision,
**kw **kw
) )
...@@ -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=\'pdf\', batch_mode=None, requirement_relative_url=None, document_save=None, document_download=None, document_language=None, document_reference=None, document_version=None, display_header=None, display_detail=None, display_comment=None, display_depth=None, report_name=None, *args,**kw</string> </value> <value> <string>format=\'pdf\', override_revision=None, batch_mode=None, requirement_relative_url=None, document_save=None, document_download=None, document_language=None, document_reference=None, document_version=None, display_header=None, display_detail=None, display_comment=None, display_depth=None, report_name=None, *args,**kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -12,6 +12,7 @@ MAIN FILE: generate report (book header/footer and report content) ...@@ -12,6 +12,7 @@ MAIN FILE: generate report (book header/footer and report content)
# document_reference: use as document reference # document_reference: use as document reference
# document_title use as document title # document_title use as document title
# override_batch_mode used for tests # override_batch_mode used for tests
# override_revision used for tests
# ------ # ------
# document_download: download file directly (default None) # document_download: download file directly (default None)
# document_save: save file in document module (default None) # document_save: save file in document module (default None)
...@@ -88,7 +89,8 @@ override_document_title = kw.get('document_title', None) ...@@ -88,7 +89,8 @@ override_document_title = kw.get('document_title', None)
override_document_version = kw.get('document_version', None) override_document_version = kw.get('document_version', None)
override_document_reference = kw.get('document_reference', None) override_document_reference = kw.get('document_reference', None)
override_document_language = kw.get('document_language', None) override_document_language = kw.get('document_language', None)
override_batch_mode = kw.get('batch_mode', False) override_batch_mode = setToNone(kw.get('batch_mode', None))
override_revision = setToNone(kw.get('override_revision', None))
doc_report_name = kw.get('report_name', None) doc_report_name = kw.get('report_name', None)
doc_report_title = kw.get('report_title', None) doc_report_title = kw.get('report_title', None)
......
...@@ -54,7 +54,9 @@ Creates the Book header. ...@@ -54,7 +54,9 @@ Creates the Book header.
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img tal:attributes="src python: book_logo_url; alt python: book_logo_title"/> <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
<img tal:attributes="src python: book_logo_url; alt python: book_logo_title"/>
</div>
</td> </td>
<td> <td>
<div class="ci-book-header-title" tal:content="python: book_title"></div> <div class="ci-book-header-title" tal:content="python: book_title"></div>
......
...@@ -16,6 +16,7 @@ return context.WebPage_viewAsBook( ...@@ -16,6 +16,7 @@ return context.WebPage_viewAsBook(
document_download=document_download, document_download=document_download,
display_svg=display_svg, display_svg=display_svg,
batch_mode=batch_mode, batch_mode=batch_mode,
override_revision=override_revision,
transformation=transformation, transformation=transformation,
include_content_table=include_content_table, include_content_table=include_content_table,
include_history_table=include_history_table, include_history_table=include_history_table,
......
...@@ -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=None ,include_content_table=None,include_history_table= None,include_reference_table=None,include_linked_content=None,include_report_content=None,document_download=None,batch_mode=False,display_svg=None,document_save=None,transformation=None,override_document_description=None,override_document_short_title=None,override_document_title=None,override_document_version=None,override_logo_reference=None,override_source_organisation_title=None,override_source_person_title=None,override_document_reference=None, **kw</string> </value> <value> <string>format=None, override_revision=None, include_content_table=None,include_history_table= None,include_reference_table=None,include_linked_content=None,include_report_content=None,document_download=None,batch_mode=False,display_svg=None,document_save=None,transformation=None,override_document_description=None,override_document_short_title=None,override_document_title=None,override_document_version=None,override_logo_reference=None,override_source_organisation_title=None,override_source_person_title=None,override_document_reference=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -16,6 +16,7 @@ return context.WebPage_viewAsBook( ...@@ -16,6 +16,7 @@ return context.WebPage_viewAsBook(
document_save=document_save, document_save=document_save,
document_download=document_download, document_download=document_download,
batch_mode=batch_mode, batch_mode=batch_mode,
override_revision=override_revision,
display_svg=display_svg, display_svg=display_svg,
transformation=transformation, transformation=transformation,
include_content_table=include_content_table, include_content_table=include_content_table,
......
...@@ -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="pdf",include_content_table=None, include_history_table= None, include_reference_table=None, include_linked_content=None, include_report_content=None,display_svg=None, document_download=None, batch_mode=False, document_save=None,transformation=None,override_document_description=None,override_document_short_title=None,override_document_title=None,override_document_version=None,override_logo_reference=None,override_source_organisation_title=None,override_source_person_title=None,override_document_reference=None, **kw</string> </value> <value> <string>format="pdf",override_revision=None, include_content_table=None, include_history_table= None, include_reference_table=None, include_linked_content=None, include_report_content=None,display_svg=None, document_download=None, batch_mode=False, document_save=None,transformation=None,override_document_description=None,override_document_short_title=None,override_document_title=None,override_document_version=None,override_logo_reference=None,override_source_organisation_title=None,override_source_person_title=None,override_document_reference=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -17,6 +17,7 @@ MAIN FILE: generate book in different output formats ...@@ -17,6 +17,7 @@ MAIN FILE: generate book in different output formats
# override_document_reference use as document reference # override_document_reference use as document reference
# override_logo_reference use as document header logo # override_logo_reference use as document header logo
# override_batch_mode used for tests # override_batch_mode used for tests
# override_revision used for tests
# ------ # ------
# book_include_content_table include table of content (True*) # book_include_content_table include table of content (True*)
# book_include_history_table include history/authors (XXX not done) # book_include_history_table include history/authors (XXX not done)
...@@ -108,7 +109,9 @@ override_document_title = kw.get('override_document_title', None) ...@@ -108,7 +109,9 @@ override_document_title = kw.get('override_document_title', None)
override_document_version = kw.get('override_document_version', None) override_document_version = kw.get('override_document_version', None)
override_document_reference = kw.get('override_document_reference', None) override_document_reference = kw.get('override_document_reference', None)
override_logo_reference = kw.get('override_logo_reference', None) override_logo_reference = kw.get('override_logo_reference', None)
override_batch_mode = kw.get('batch_mode', False) override_batch_mode = setToNone(kw.get('batch_mode', None))
override_revision = kw.get('override_revision', None)
# -------------------------- Document Parameters ------------------------------ # -------------------------- Document Parameters ------------------------------
book_form = book.REQUEST book_form = book.REQUEST
...@@ -124,13 +127,12 @@ book_title = setOverrideParam(book, override_document_title, "title") ...@@ -124,13 +127,12 @@ book_title = setOverrideParam(book, override_document_title, "title")
book_short_title = setOverrideParam(book, override_document_short_title, "short_title") book_short_title = setOverrideParam(book, override_document_short_title, "short_title")
book_version = setOverrideParam(book, override_document_version, "version") book_version = setOverrideParam(book, override_document_version, "version")
book_description = setOverrideParam(book, override_document_description, "description") book_description = setOverrideParam(book, override_document_description, "description")
book_content = book.getTextContent() book_content = book.getTextContent()
book_language = book.getLanguage() book_language = book.getLanguage()
book_aggregate_list = [] book_aggregate_list = []
book_absolute_url = book.getAbsoluteUrl() book_absolute_url = book.getAbsoluteUrl()
book_reference = (html_quote(override_document_reference) if override_document_reference else book.getReference()) or blank book_reference = (html_quote(override_document_reference) if override_document_reference else book.getReference()) or blank
book_revision = book.getRevision() book_revision = "1" if (override_batch_mode or override_revision) else book.getRevision()
book_modification_date = book.getModificationDate() book_modification_date = book.getModificationDate()
book_short_date = book_modification_date.strftime('%Y-%m-%d') book_short_date = book_modification_date.strftime('%Y-%m-%d')
...@@ -340,7 +342,7 @@ if book_format == "pdf": ...@@ -340,7 +342,7 @@ if book_format == "pdf":
book_version=book_version, book_version=book_version,
book_short_date=book_short_date, book_short_date=book_short_date,
) )
book_foot = book.WebPage_createBookFooter( book_foot = book.WebPage_createBookFooter(
book_theme=book_theme.get("theme"), book_theme=book_theme.get("theme"),
book_title=book_title, book_title=book_title,
......
...@@ -245,12 +245,17 @@ ...@@ -245,12 +245,17 @@
} }
/* header image dimensions */ /* header image dimensions */
.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper {
width: 100%;
height: inherit;
min-height: 22mm;
position: relative;
}
.ci-book .ci-book-header img { .ci-book .ci-book-header img {
max-height: 25mm; max-height: 20mm;
max-width: 60%; max-width: 60%;
padding-top: 2mm; padding-top: 6mm;
text-align: center; text-align: center;
vertical-align: middle;
} }
/* header spec section */ /* header spec section */
......
...@@ -245,6 +245,35 @@ ...@@ -245,6 +245,35 @@
} }
/* header image dimensions */ /* header image dimensions */
.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper {
width: 100%;
height: inherit;
min-height: 25mm;
}
.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper img {
max-width: 60%;
min-width: 160px;
height: 16mm;
margin-top: 6mm;
text-align: center;
vertical-align: middle;
}
/*
.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper img {
max-width: 60%;
min-width: 200px;
height: 20mm;
margin-top: 6mm;
text-align: center;
vertical-align: middle;
}
.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper img {
top: 0;
right: 0;
width: 100%;
border: 1px solid orange;
}
.ci-book .ci-book-header img { .ci-book .ci-book-header img {
max-height: 25mm; max-height: 25mm;
max-width: 60%; max-width: 60%;
...@@ -252,7 +281,7 @@ ...@@ -252,7 +281,7 @@
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
*/
/* header spec section */ /* header spec section */
.ci-book .ci-book-header td:last-child { .ci-book .ci-book-header td:last-child {
text-align: left; text-align: left;
......
...@@ -13,5 +13,6 @@ return context.WebPage_viewAsLeaflet( ...@@ -13,5 +13,6 @@ return context.WebPage_viewAsLeaflet(
document_save=document_save, document_save=document_save,
document_download=document_download, document_download=document_download,
batch_mode=batch_mode, batch_mode=batch_mode,
override_time=override_time,
**kw **kw
) )
...@@ -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", override_time=None, 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>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -12,6 +12,7 @@ return context.WebPage_viewAsLeaflet( ...@@ -12,6 +12,7 @@ return context.WebPage_viewAsLeaflet(
override_leaflet_header_title=override_leaflet_header_title, override_leaflet_header_title=override_leaflet_header_title,
document_save=document_save, document_save=document_save,
document_download=document_download, document_download=document_download,
batch_mode=False, batch_mode=batch_mode,
override_time=override_time,
**kw **kw
) )
...@@ -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="pdf",display_side=1, document_download=None, batch_mode=False, document_save=None, override_leaflet_header_title=None, override_source_organisation_title=None,override_source_person_title=None, display_svg=None, **kw</string> </value> <value> <string>format="pdf", override_time=None, display_side=1, document_download=None, batch_mode=False, document_save=None, override_leaflet_header_title=None, override_source_organisation_title=None,override_source_person_title=None, display_svg=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -14,6 +14,7 @@ MAIN FILE: render two pager in different output formats ...@@ -14,6 +14,7 @@ MAIN FILE: render two pager in different output formats
# override_source_organisation_title used instead of follow-up organisation # override_source_organisation_title used instead of follow-up organisation
# override_source_person_title used instead of contributor # override_source_person_title used instead of contributor
# override_batch_mode used for tests # override_batch_mode used for tests
# override_time used for tests
# ------ # ------
# document_downalod: download file directly (default None) # document_downalod: download file directly (default None)
# document_save: save file in document module (default None) # document_save: save file in document module (default None)
...@@ -90,7 +91,8 @@ override_source_organisation_title = kw.get( ...@@ -90,7 +91,8 @@ override_source_organisation_title = kw.get(
"override_source_organisation_title", "override_source_organisation_title",
None None
) )
override_batch_mode = kw.get('batch_mode', False) override_batch_mode = kw.get('batch_mode', None) or False
override_time = setToNone(kw.get('override_time', None)) or None
# -------------------------- Document Parameters ------------------------------ # -------------------------- Document Parameters ------------------------------
...@@ -112,6 +114,9 @@ leaflet_modification_date = leaflet.getModificationDate() ...@@ -112,6 +114,9 @@ leaflet_modification_date = leaflet.getModificationDate()
# u"©".encode("utf8") # u"©".encode("utf8")
#leaflet_copy = u"\u00A9".encode('utf-8') | unicode('©', 'utf8') | '©'.encode('utf-8').strip() #leaflet_copy = u"\u00A9".encode('utf-8') | unicode('©', 'utf8') | '©'.encode('utf-8').strip()
if override_time is not None:
leaflet_date="Nov-1976"
leaflet_year="1976"
if leaflet_language and leaflet_format == "pdf": if leaflet_language and leaflet_format == "pdf":
leaflet.REQUEST['AcceptLanguage'].set(leaflet_language, 10) leaflet.REQUEST['AcceptLanguage'].set(leaflet_language, 10)
if leaflet_reference is None: if leaflet_reference is None:
......
...@@ -56,9 +56,7 @@ Creates the Slideshow footer section. ...@@ -56,9 +56,7 @@ Creates the Slideshow footer section.
<tal:block metal:define-macro="slide_footer"> <tal:block metal:define-macro="slide_footer">
<div class="ci-slideshow-footer"> <div class="ci-slideshow-footer">
<div class="ci-slideshow-container-left"> <div class="ci-slideshow-container-left">
<tal:block tal:condition="python: doc_footer_url != ''"> <div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
<img alt="Logo" tal:attributes="src python: doc_footer_url" />
</tal:block>
</div> </div>
<div class="ci-slideshow-container-center" tal:content="doc_description"></div> <div class="ci-slideshow-container-center" tal:content="doc_description"></div>
<div class="ci-slideshow-container-right"> <div class="ci-slideshow-container-right">
......
...@@ -255,6 +255,14 @@ doc_source = doc.Base_getSourceDict( ...@@ -255,6 +255,14 @@ doc_source = doc.Base_getSourceDict(
default_bank_account_uid=getCustomParameter("default_bank_account_uid", None), default_bank_account_uid=getCustomParameter("default_bank_account_uid", None),
theme_logo_url=doc_theme.get("theme_logo_url", None) theme_logo_url=doc_theme.get("theme_logo_url", None)
) )
if doc_source.get("enhanced_logo_url") is not blank:
doc_css = ''.join([
doc_css,
' .ci-slideshow-footer-logo {'
'background: #FFF url("%s") center no-repeat;' % (doc_source.get("enhanced_logo_url")),
'background-size: 100px auto;',
'}'
])
# --------------------------- Content Upgrades --------------------------------- # --------------------------- Content Upgrades ---------------------------------
for image in re.findall('(<img.*?/>)', doc_content): for image in re.findall('(<img.*?/>)', doc_content):
......
...@@ -134,16 +134,23 @@ section { ...@@ -134,16 +134,23 @@ section {
.ci-slideshow-footer { .ci-slideshow-footer {
position: static; position: static;
} }
.ci-slideshow-footer div { .ci-slideshow-footer .ci-slideshow-container-left,
.ci-slideshow-footer .ci-slideshow-container-center,
.ci-slideshow-footer .ci-slideshow-container-right {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: 32%; width: 32%;
min-height: 10mm;
text-align: center; text-align: center;
} }
.ci-slideshow-footer .ci-slideshow-container-left img { .ci-slideshow-footer .ci-slideshow-container-left img {
max-width: 120px; display: block;
height: 54px; border: 1px solid red !important;
height: 50px;
} }
.ci-slideshow-footer .ci-slideshow-container-left { .ci-slideshow-footer .ci-slideshow-container-left {
text-align: left; text-align: left;
} }
......
...@@ -36,7 +36,7 @@ import math ...@@ -36,7 +36,7 @@ import math
import re import re
host_url = r"https?://localhost(?::[0-9]+)?/[^/]+/" host_url = r"https?://localhost(?::[0-9]+)?/[^/]+/"
test_url = "https://softinst73908.host.vifib.net/" test_url = "https://softinst73908.host.vifib.net/erp5/"
def setDomainDict(script_id, script_param, script_code): def setDomainDict(script_id, script_param, script_code):
def wrapper(func): def wrapper(func):
...@@ -755,7 +755,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -755,7 +755,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
"template_test_leaflet_output_expected_001_en_html", "template_test_leaflet_output_expected_001_en_html",
**dict( **dict(
test_method="WebPage_exportAsLeaflet", test_method="WebPage_exportAsLeaflet",
use_skin="Leaflet" use_skin="Leaflet",
override_time=1
) )
) )
...@@ -776,7 +777,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -776,7 +777,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_source_person_title="Test Recipient", override_source_person_title="Test Recipient",
override_source_organisation_title="Test Association", override_source_organisation_title="Test Association",
override_leaflet_header_title="Couscous", override_leaflet_header_title="Couscous",
use_skin="Leaflet" use_skin="Leaflet",
override_time=1
) )
) )
...@@ -793,7 +795,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -793,7 +795,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
"template_test_leaflet_output_expected_003_de_html", "template_test_leaflet_output_expected_003_de_html",
**dict( **dict(
test_method="WebPage_exportAsLeaflet", test_method="WebPage_exportAsLeaflet",
use_skin="Leaflet" use_skin="Leaflet",
override_time=1
) )
) )
...@@ -813,7 +816,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -813,7 +816,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
page_number=1, page_number=1,
format="pdf", format="pdf",
test_method="WebPage_exportAsLeaflet", test_method="WebPage_exportAsLeaflet",
use_skin="Leaflet" use_skin="Leaflet",
override_time=1
) )
) )
...@@ -838,6 +842,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -838,6 +842,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_source_organisation_title="Test Association", override_source_organisation_title="Test Association",
override_source_person_title="Test Recipient", override_source_person_title="Test Recipient",
override_leaflet_header_title="Couscous", override_leaflet_header_title="Couscous",
override_time=1
) )
) )
...@@ -857,7 +862,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -857,7 +862,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
page_number=0, page_number=0,
test_method="WebPage_exportAsLeaflet", test_method="WebPage_exportAsLeaflet",
use_skin="Leaflet", use_skin="Leaflet",
format="pdf" format="pdf",
override_time=1
) )
) )
...@@ -875,7 +881,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -875,7 +881,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
**dict( **dict(
page_number=1, page_number=1,
test_method="WebPage_printAsLeaflet", test_method="WebPage_printAsLeaflet",
use_skin="Leaflet" use_skin="Leaflet",
override_time=1
) )
) )
...@@ -893,7 +900,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -893,7 +900,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
**dict( **dict(
use_skin="Book", use_skin="Book",
test_method="WebPage_exportAsBook", test_method="WebPage_exportAsBook",
include_content_table=0 include_content_table=0,
override_revision=1
) )
) )
...@@ -923,7 +931,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -923,7 +931,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_logo_reference="Template.Test.Image.Erp5.Logo", override_logo_reference="Template.Test.Image.Erp5.Logo",
override_source_organisation_title="Test Organisation", override_source_organisation_title="Test Organisation",
override_source_person_title="Test Sender", override_source_person_title="Test Sender",
override_document_version="333" override_document_version="333",
override_revision=1
) )
) )
...@@ -940,7 +949,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -940,7 +949,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
"template_test_book_output_expected_003_de_html", "template_test_book_output_expected_003_de_html",
**dict( **dict(
use_skin="Book", use_skin="Book",
test_method="WebPage_exportAsBook" test_method="WebPage_exportAsBook",
override_revision=1
) )
) )
...@@ -960,7 +970,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -960,7 +970,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
page_number=4, page_number=4,
use_skin="Book", use_skin="Book",
test_method="WebPage_exportAsBook", test_method="WebPage_exportAsBook",
format="pdf" format="pdf",
override_revision=1
) )
) )
...@@ -994,7 +1005,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -994,7 +1005,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_logo_reference="Template.Test.Image.Erp5.Logo", override_logo_reference="Template.Test.Image.Erp5.Logo",
override_source_organisation_title="Test Organisation", override_source_organisation_title="Test Organisation",
override_source_person_title="Test Sender", override_source_person_title="Test Sender",
override_document_version="333" override_document_version="333",
override_revision=1
) )
) )
...@@ -1028,7 +1040,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -1028,7 +1040,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_logo_reference="Template.Test.Image.Erp5.Logo", override_logo_reference="Template.Test.Image.Erp5.Logo",
override_source_organisation_title="Test Organisation", override_source_organisation_title="Test Organisation",
override_source_person_title="Test Sender", override_source_person_title="Test Sender",
override_document_version="333" override_document_version="333",
override_revision=1
) )
) )
...@@ -1062,7 +1075,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -1062,7 +1075,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
override_logo_reference="Template.Test.Image.Erp5.Logo", override_logo_reference="Template.Test.Image.Erp5.Logo",
override_source_organisation_title="Test Organisation", override_source_organisation_title="Test Organisation",
override_source_person_title="Test Sender", override_source_person_title="Test Sender",
override_document_version="333" override_document_version="333",
override_revision=1
) )
) )
...@@ -1082,7 +1096,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -1082,7 +1096,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
use_skin="Book", use_skin="Book",
test_method="WebPage_exportAsBook", test_method="WebPage_exportAsBook",
page_number=1, page_number=1,
format="pdf" format="pdf",
override_revision=1
) )
) )
...@@ -1102,7 +1117,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase): ...@@ -1102,7 +1117,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
use_skin="Book", use_skin="Book",
test_method="WebPage_printAsBook", test_method="WebPage_printAsBook",
page_number=1, page_number=1,
format="pdf" format="pdf",
override_revision=1
) )
) )
Web Page | export_book
Web Page | export_leaflet
Web Page | export_letter
Web Page | export_slideshow Web Page | export_slideshow
Web Page | print_book
Web Page | print_leaflet
Web Page | print_letter
Web Page | print_slideshow Web Page | print_slideshow
Web Page | view_slideshow Web Page | view_slideshow
\ No newline at end of file
organisation_module/template_test*
portal_preferences/default_site_preference/template_*
document_module/template_test_* document_module/template_test_*
image_module/template_test_image* image_module/template_test_image*
image_module/template_test_* image_module/template_test_*
......
portal_preferences/default_site_preference/template_*
\ No newline at end of file
organisation_module/template_test*
portal_preferences/default_site_preference/template_*
document_module/template_test_* document_module/template_test_*
image_module/template_test_image* image_module/template_test_image*
image_module/template_test_* image_module/template_test_*
......
document_module/template_test_* document_module/template_test_*
image_module/template_test_* image_module/template_test_*
image_module/template_test_image* image_module/template_test_image*
organisation_module/template_test*
person_module/template_test* person_module/template_test*
portal_preferences/default_site_preference/template_* portal_preferences/default_site_preference/template_*
portal_preferences/default_site_preference/template_*
web_page_module/template_test_* web_page_module/template_test_*
\ No newline at end of file
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