erp5_corporate_identity: fix default logo display

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_book_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287845.91</string> </value>
+            <value> <string>ts13549930.65</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -63,6 +63,97 @@
               </tuple>
             </value>
         </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>Sun Dec 17 23:32:05 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>84280 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>5</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 Book</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>
             <key> <string>_count</string> </key>
             <value>
@@ -83,7 +174,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d8844bdc986affd45993c8e053fa2c49</string> </value>
+            <value> <string>0a22e46c8c904fdf63fa3a9f950c1eb1</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +216,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>85424</int> </value>
+            <value> <int>84280</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_book_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287872.73</string> </value>
+            <value> <string>ts13549955.97</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>99d93059566e7c74f5340da60d111bad</string> </value>
+            <value> <string>3ec043d26b5db85aa2fcc2d23b1c9801</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>168393</int> </value>
+            <value> <int>161657</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_book_input_003_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287924.62</string> </value>
+            <value> <string>ts13549975.46</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>c04badf879955e59313018414aa2fb48</string> </value>
+            <value> <string>223caf3fc2d1dcf78227c6d0f3f5dca7</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>89829</int> </value>
+            <value> <int>90286</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287659.8</string> </value>
+            <value> <string>ts13549807.6</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>fa806a39c0bc2c5317aeb7f31039f979</string> </value>
+            <value> <string>8cba833715076319884f533800b40433</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287684.82</string> </value>
+            <value> <string>ts13549824.05</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>5acdd9a2be6250012f204f51da1ed7dc</string> </value>
+            <value> <string>7e87300df444b52bf37f97b1a9b6d5cb</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>115139</int> </value>
+            <value> <int>118539</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_leaflet_input_003_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13287707.27</string> </value>
+            <value> <string>ts13549840.87</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>8f85759bb5f56e8bcb40312ffe7775f0</string> </value>
+            <value> <string>0c8785d299736f5871d4a300fef7550a</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_letter_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13289421.22</string> </value>
+            <value> <string>ts13549669.41</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d15090b5a481a44e98b67daaec3c6fda</string> </value>
+            <value> <string>9a1ca5dee4653027a63e44e1c3bce809</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_letter_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13289462.61</string> </value>
+            <value> <string>ts13549688.94</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>eeb460e6aa9b4e83fa99056d6cca1798</string> </value>
+            <value> <string>a9e35fa3d8e7919ebb2f1009cf9932db</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_letter_input_003_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13289534.2</string> </value>
+            <value> <string>ts13549707.54</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>8835e704f7c16d118f02b5d4d9f02630</string> </value>
+            <value> <string>2981c09fa086b8f782a8b305668c9af2</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>19774</int> </value>
+            <value> <int>20212</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_letter_input_004_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13289566.48</string> </value>
+            <value> <string>ts13549724.5</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>cfeba1670135c860ddbc47ccfd712c43</string> </value>
+            <value> <string>e46f8c85745cde9d11b50539b136495e</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13285781.05</string> </value>
+            <value> <string>ts13549509.79</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4a7a339939f9d794de44750ffa827adc</string> </value>
+            <value> <string>f5c54187d323797dd7a2780c586c49f6</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>375112</int> </value>
+            <value> <int>375419</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13285826.53</string> </value>
+            <value> <string>ts13549540.93</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>27bf2b4eb2c107a3c644bf437c6bf835</string> </value>
+            <value> <string>f70b9e7c7b8edc1a73e3f95fe30af496</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>377276</int> </value>
+            <value> <int>377558</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_003_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13285847.18</string> </value>
+            <value> <string>ts13549559.86</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>7b51004fc81bbd685cfcbd74cb8b4f92</string> </value>
+            <value> <string>c7d773c07002d2d01d2cda8ef1c0052b</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>377276</int> </value>
+            <value> <int>380427</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_004_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13285805.28</string> </value>
+            <value> <string>ts13549525.62</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d1309146ce359f81dcd77df1aa8b5142</string> </value>
+            <value> <string>2dda3095356a4756ddd1c9058bb03657</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>388524</int> </value>
+            <value> <int>389000</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_005_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts13285871.2</string> </value>
+            <value> <string>ts13549582.12</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>7fc7ad265a2fcef577fc0b5e1b0a3e72</string> </value>
+            <value> <string>96fedc9e14fe8e9035e34fafc4af3f14</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>390386</int> </value>
+            <value> <int>390830</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_book_input_page_1_003_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>25f53aa6b23268b961c2b4737026b9ce</string> </value>
+            <value> <string>eadb0cb0c8b74a817d73e64c01a6c13a</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_book_input_page_4_001_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>5dad3888a41713a9545742f52b61b695</string> </value>
+            <value> <string>5dfd282ddb78516ea509878c27065e33</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_book_input_page_4_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>bd6d683513072cb80bb4602483fcc06f</string> </value>
+            <value> <string>d317e0d93ec6020acd9b9c433311958d</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_book_input_page_5_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>f257e109ca30cf3c9c317095f8abcb9b</string> </value>
+            <value> <string>f8885137c806be79f56d0cffa9c3aa4c</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_book_input_page_9_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>504b712c12443268f5f7bcfcf6dc6a46</string> </value>
+            <value> <string>6db10f6aa77ec08b289005d54dd36e65</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_leaflet_input_page_0_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>f98e931fe96fca0940978f49a5b8cc33</string> </value>
+            <value> <string>b5fc74cb2c53902c831c6fcc98689708</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_letter_input_page_0_003_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>339d71201177554697a07a799be4dfce</string> </value>
+            <value> <string>ef8e944f8e27b8dba97189c4d2adb73b</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_001_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>973a3153b288634a7180829611248343</string> </value>
+            <value> <string>5056be7093ca84463b1293f1c8c1005e</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>1a62f3dd540afc198f045b4a4b2df3d1</string> </value>
+            <value> <string>f46927a0248c50816ab7fb81ed47a011</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_003_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>1a62f3dd540afc198f045b4a4b2df3d1</string> </value>
+            <value> <string>f3244723f2699880f2ed04096f193214</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_13_004_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>6b89a106a45b73704e0e266ae6c13e37</string> </value>
+            <value> <string>f8119289dc10ce3127a6314977b3cdb5</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_8_005_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>0f3978e8ed96411e315e4675ba7728c1</string> </value>
+            <value> <string>3cb8a947e344e59a91b759e02223ae99</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_book_output_expected_001_en_html.html

@@ -29,7 +29,7 @@
           <tr>
             <td>
               <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png"
+                <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
                      alt="" />
               </div>
             </td>
@@ -52,7 +52,7 @@
               </div>
               <div>
                 <span class="ci-book-header-key">Date:</span>
-                <span class="ci-book-header-value">2017-12-14</span>
+                <span class="ci-book-header-value">1976-11-04</span>
               </div>
               <div>
                 <span class="ci-book-header-key">Page:</span>
@@ -73,13 +73,11 @@
       <p class="ci-book-cover-description">Sample description</p>
       <p class="ci-book-cover-author-list">
         
-          <span>Test Association Member</span>
-          ,
+          <span>Test Association Member</span>,
         
         
           <span> Test Author</span>
         
-        
       </p>
     </div>
   

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html

@@ -29,7 +29,7 @@
           <tr>
             <td>
               <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small"
+                <img src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small&amp;display=thumbnail"
                      alt="" />
               </div>
             </td>
@@ -52,7 +52,7 @@
               </div>
               <div>
                 <span class="ci-book-header-key">Date:</span>
-                <span class="ci-book-header-value">2017-12-14</span>
+                <span class="ci-book-header-value">1976-11-04</span>
               </div>
               <div>
                 <span class="ci-book-header-key">Page:</span>
@@ -75,7 +75,6 @@
         
           <span>Test Sender</span>
         
-        
       </p>
     </div>
   

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_book_output_expected_003_de_html.html

@@ -29,7 +29,7 @@
           <tr>
             <td>
               <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png"
+                <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
                      alt="" />
               </div>
             </td>
@@ -52,7 +52,7 @@
               </div>
               <div>
                 <span class="ci-book-header-key">Date:</span>
-                <span class="ci-book-header-value">2017-12-14</span>
+                <span class="ci-book-header-value">1976-11-04</span>
               </div>
               <div>
                 <span class="ci-book-header-key">Page:</span>
@@ -73,13 +73,11 @@
       <p class="ci-book-cover-description">Sample description</p>
       <p class="ci-book-cover-author-list">
         
-          <span>Test Association Member</span>
-          ,
+          <span>Test Association Member</span>,
         
         
           <span> Test Author</span>
         
-        
       </p>
     </div>
   

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_002_en_html.html

@@ -164,7 +164,7 @@
 	    <div class="ci-leaflet-container-left">
 	      
 	        <img alt="Logo"
-              src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png" />
+              src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail" />
 	      
 	    </div>
 	    <div class="ci-leaflet-container-center">Template.Test.Leaflet-001-en</div>

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_letter_output_expected_003_en_html.html

@@ -15,7 +15,7 @@
     <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo">
-  		      <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png"
+  		      <img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
                alt="" />
             <span></span>
           </div>

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_001_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="default_themes/themes.css" />
     <link rel="stylesheet"
           href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css" />
-    <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>
+    <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>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -36,12 +36,14 @@
           
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
-	      <div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
+	      <div class="ci-slideshow-footer-image-wrapper">
+          <img alt="" src="common_images/fallback.png" />
+        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center"></div>
 	    <div class="ci-slideshow-container-right">
 	      &copy;
-	      <span>2017</span>&nbsp;
+	      <span>1976</span>&nbsp;
         <span></span><br />
 	      <span></span>&nbsp;
 	      <span class="page"></span> | <span class="topage"></span>

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_002_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="default_themes/themes.css" />
     <link rel="stylesheet"
           href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_001_en_html/slide_css/slide.css" />
-    <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>
+    <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>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -36,12 +36,15 @@
           
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
-	      <div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
+	      <div class="ci-slideshow-footer-image-wrapper">
+          <img alt=""
+               src="Template.Test.Image.Logo.Alternativ?format=png&amp;display=small&amp;display=thumbnail" />
+        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center"></div>
 	    <div class="ci-slideshow-container-right">
 	      &copy;
-	      <span>2017</span>&nbsp;
+	      <span>1976</span>&nbsp;
         <span></span><br />
 	      <span></span>&nbsp;
 	      <span class="page"></span> | <span class="topage"></span>

bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_003_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="default_themes/themes.css" />
     <link rel="stylesheet"
           href="https://softinst73908.host.vifib.net/erp5/web_page_module/template_test_slideshow_input_002_en_html/slide_css/slide.css" />
-    <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>
+    <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>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -36,12 +36,14 @@
           
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
-	      <div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
+	      <div class="ci-slideshow-footer-image-wrapper">
+          <img alt="" src="common_images/fallback.png" />
+        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center">Some description</div>
 	    <div class="ci-slideshow-container-right">
 	      &copy;
-	      <span>2017</span>&nbsp;
+	      <span>1976</span>&nbsp;
         <span>Test Organisation</span><br />
 	      <span>Test Author, Test Recipient</span>&nbsp;
 	      <span class="page"></span> | <span class="topage"></span>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_getThemeDict.py

@@ -49,8 +49,8 @@ theme = (
   custom_theme or
   default_company_title
 )
-if theme and override_batch_mode:
-  theme = "default"
+#if theme and override_batch_mode:
+#  theme = "default"
 if theme is not None:
   logo_prefix = getCustomParameter("default_logo_prefix", None)
   theme = theme.lower()

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsBookDialog/format.xml

@@ -105,6 +105,10 @@
                           <string>pdf</string>
                           <string>pdf</string>
                         </tuple>
+                        <tuple>
+                          <string>mhtml</string>
+                          <string>mhtml</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/book_css/book.css.css

@@ -246,18 +246,16 @@
 
 /* header image dimensions */
 .ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper {
-  width: 100%;
-  height: inherit;
-  min-height: 22mm;
-  position: relative;
+  padding-top: 1mm;
+  min-height: 25mm;
+  display: inline;
+  vertical-align: middle;
 }
-.ci-book .ci-book-header img {
-  max-height: 20mm;
-  max-width: 60%;
-  padding-top: 6mm;
-  text-align: center;
+.ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper img {
+  height: auto;
+  display: inline-block;
+  width: auto;
 }
-
 /* header spec section */
 .ci-book .ci-book-header td:last-child {
   text-align: left;
@@ -812,6 +810,13 @@ html .ci-book table td p {
   text-align: left;
   text-indent: 2mm;
 }
+/* === reports === */
+.ci-book .ci-book-table .ci-book-report-cell-left {
+  text-align: left;
+}
+.ci-book .ci-book-table .ci-book-report-cell-right {
+  text-align: right;
+}
 /* === box items === */
 /* Project Breakdown/Milestone List */
 .ci-book .ci-book-box-offer,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/book_css/book.pdf.css.css

@@ -246,42 +246,16 @@
 
 /* header image dimensions */
 .ci-book .ci-book-header .ci-book-header-image-wkhtmltopdf-image-wrapper {
-  width: 100%;
-  height: inherit;
+  padding-top: 1mm;
   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;
+  display: inline;
   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 {
-  max-height: 25mm;
-  max-width: 60%;
-  padding-top: 2mm;
-  text-align: center;
-  vertical-align: middle;
+  display: inline-block;
+  width: auto;
+  height: auto;
 }
-*/
 /* header spec section */
 .ci-book .ci-book-header td:last-child {
   text-align: left;
@@ -836,6 +810,14 @@ html .ci-book table td p {
   text-align: left;
   text-indent: 2mm;
 }
+/* === reports === */
+.ci-book .ci-book-table .ci-book-report-cell-left {
+  text-align: left;
+}
+.ci-book .ci-book-table .ci-book-report-cell-right {
+  text-align: right;
+}
+
 /* === box items === */
 /* Project Breakdown/Milestone List */
 .ci-book .ci-book-box-offer,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/slide_css/slide.css.css

@@ -278,11 +278,17 @@ html .ci-slideshow .ci-slideshow-footer > div {
   width: 32%;
   vertical-align: middle;
 }
-html .ci-slideshow .ci-slideshow-header > div img,
-html .ci-slideshow .ci-slideshow-footer > div img {
-  max-height: 2.5em;
-  min-width: initial;
+.ci-slideshow-footer-image-wrapper {
+  min-height: 20mm;
+  display: inline;
+  vertical-align: middle;
 }
+.ci-slideshow-footer-image-wrapper img {
+  display: inline-block;
+  width: auto;
+  height: auto;
+}
+
 html .ci-slideshow .ci-slideshow-container-left {
   text-align: left; 
 }

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/slide_css/slide.pdf.css.css

@@ -143,14 +143,16 @@ section {
   min-height: 10mm;
   text-align: center;
 }
-.ci-slideshow-footer .ci-slideshow-container-left img {
-  display: block;
-  border: 1px solid red !important;
-  height: 50px;
+.ci-slideshow-footer .ci-slideshow-container-left .ci-slideshow-footer-image-wrapper {
+  min-height: 20mm;
+  display: inline;
+  vertical-align: middle;
+}
+.ci-slideshow-footer .ci-slideshow-container-left .ci-slideshow-footer-image-wrapper img {
+  display: inline-block;
+  width: auto;
+  height: auto;
 }
-
-
-
 .ci-slideshow-footer .ci-slideshow-container-left {
   text-align: left;
 }

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/Base_exportAsReport.py

@@ -19,6 +19,5 @@ return context.Base_viewAsReport(
   report_title=report_title,
   requirement_relative_url=requirement_relative_url,
   batch_mode=batch_mode,
-  override_revision=override_revision,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/Base_exportAsReport.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/Base_printAsReport.py

@@ -17,6 +17,5 @@ return context.Base_viewAsReport(
   report_name=report_name,
   requirement_relative_url=requirement_relative_url,
   batch_mode=batch_mode,
-  override_revision=override_revision,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/Base_printAsReport.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/Base_viewAsReport.py

@@ -12,7 +12,6 @@ MAIN FILE: generate report (book header/footer and report content)
 # document_reference:       use as document reference
 # document_title            use as document title
 # override_batch_mode       used for tests
-# override_revision         used for tests
 # ------
 # document_download:        download file directly (default None)     
 # document_save:            save file in document module (default None)
@@ -90,7 +89,6 @@ override_document_version = kw.get('document_version', None)
 override_document_reference = kw.get('document_reference', None)
 override_document_language = kw.get('document_language', None)
 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_title = kw.get('report_title', None)
@@ -124,6 +122,9 @@ doc_revision = "1"
 doc_modification_date = DateTime()
 doc_short_date = doc_modification_date.strftime('%Y-%m-%d')
 
+if override_batch_mode is not None:
+  doc_modification_date = DateTime("1976-11-04")
+  doc_revision = "1"
 if doc_language and doc_format == "pdf":
   doc.REQUEST['AcceptLanguage'].set(doc_language, 10)
 if doc_reference is blank:
@@ -161,7 +162,7 @@ if doc_format == "html":
     book_theme_css_font_list=doc_theme.get("theme_css_font_list"),
     book_theme_css_url=doc_theme.get("theme_css_url"),
     book_template_css_url=doc_theme.get("template_css_url"),
-    book_logo_url=doc_source.get("enhanced_logo_url"),
+    book_logo_url=doc_source.get("enhanced_logo_url") + '&display=thumbnail',
     book_logo_title=doc_source.get("theme_logo_description"),
     book_short_title=doc_short_title,
     book_reference=doc_reference,
@@ -208,7 +209,7 @@ if doc_format == "pdf":
     book_theme_css_font_list=doc_theme.get("theme_css_font_list"),
     book_theme_css_url=doc_theme.get("theme_css_url"),
     book_template_css_url=doc_theme.get("template_css_url"),
-    book_logo_url=doc_source.get("enhanced_logo_url"),
+    book_logo_url=doc_source.get("enhanced_logo_url") + '&display=thumbnail',
     book_logo_title=doc_source.get("theme_logo_description"),
     book_short_title=doc_short_title,
     book_reference=doc_reference,
@@ -223,7 +224,7 @@ if doc_format == "pdf":
     book_language=doc_language,
     book_theme_css_font_list=doc_theme.get("theme_css_font_list"),
     book_theme_css_url=doc_theme.get("theme_css_url"),
-    book_theme_logo_url=doc_source.get("enhanced_logo_url"),
+    book_theme_logo_url=doc_source.get("enhanced_logo_url") + '&display=thumbnail',
     book_theme_logo_alt=doc_theme.get("theme_logo_description"),
     book_template_css_url=doc_theme.get("template_css_url"),
     book_full_reference=doc_full_reference,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_createBookCover.zpt

@@ -40,8 +40,7 @@ Creates the Book cover.
       <p class="ci-book-cover-description" tal:content="python: book_description"></p>
       <p class="ci-book-cover-author-list">
         <tal:block tal:repeat="author book_source_person_title">
-          <span tal:content="author"></span>
-          <tal:block tal:condition="not: repeat/author/end">,</tal:block>
+          <span tal:content="author"></span><tal:block tal:condition="not: repeat/author/end">,</tal:block>
         </tal:block>
       </p>
     </div>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_createBookTableOfReferences.zpt

@@ -18,7 +18,7 @@ Creates the Tables of references.
                        book_abbreviation_list            python: options.get('book_abbreviation_list');
                        book_image_list                   python: options.get('book_image_list');
                        book_table_list                   python: options.get('book_table_list');">
-  <tal:block tal:condition="python: book_format == 'html'">
+  <tal:block tal:condition="python: book_format == 'html' or book_format == 'mhtml'">
     <tal:block metal:use-macro="context/WebPage_createBookTableOfReferences/macros/book_references" />
   </tal:block>
   <tal:block tal:condition="python: book_format == 'pdf'">

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_exportAsBook.py

@@ -3,6 +3,7 @@
 Export WebPage as Book
 ================================================================================
 """
+
 return context.WebPage_viewAsBook(
   override_document_description=override_document_description,
   override_document_short_title=override_document_short_title,
@@ -16,7 +17,6 @@ return context.WebPage_viewAsBook(
   document_download=document_download,
   display_svg=display_svg,
   batch_mode=batch_mode,
-  override_revision=override_revision,
   transformation=transformation,
   include_content_table=include_content_table,
   include_history_table=include_history_table,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_exportAsBook.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_printAsBook.py

@@ -16,7 +16,6 @@ return context.WebPage_viewAsBook(
   document_save=document_save,
   document_download=document_download,
   batch_mode=batch_mode,
-  override_revision=override_revision,
   display_svg=display_svg,
   transformation=transformation,
   include_content_table=include_content_table,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_printAsBook.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_book/WebPage_viewAsBook.py

@@ -17,7 +17,6 @@ MAIN FILE: generate book in different output formats
 # override_document_reference           use as document reference
 # override_logo_reference               use as document header logo
 # override_batch_mode                   used for tests
-# override_revision                     used for tests
 # ------
 # book_include_content_table            include table of content (True*)
 # book_include_history_table            include history/authors (XXX not done)
@@ -81,6 +80,13 @@ def setToNone(param):
   else:
     return param
 
+# XXX change url so convert does not fail    
+def setUrl(path):
+  if path.find("common") > -1:
+    return path
+  else:
+    return path + "&display=thumbnail"
+
 # -------------------------- Setup ---------------------------------------------
 book = context
 book_format = setToNone(kw.get('format', None)) or 'html'
@@ -110,8 +116,6 @@ override_document_version = kw.get('override_document_version', None)
 override_document_reference = kw.get('override_document_reference', None)
 override_logo_reference = kw.get('override_logo_reference', None)
 override_batch_mode = setToNone(kw.get('batch_mode', None))
-override_revision = kw.get('override_revision', None)
-
 
 # -------------------------- Document Parameters  ------------------------------
 book_form = book.REQUEST
@@ -132,10 +136,13 @@ book_language = book.getLanguage()
 book_aggregate_list = []
 book_absolute_url = book.getAbsoluteUrl()
 book_reference = (html_quote(override_document_reference) if override_document_reference else book.getReference()) or blank
-book_revision = "1" if (override_batch_mode or override_revision) else book.getRevision()
+book_revision = book.getRevision()
 book_modification_date = book.getModificationDate()
-book_short_date = book_modification_date.strftime('%Y-%m-%d')
 
+if override_batch_mode is not None:
+  book_modification_date = DateTime("1976-11-04")
+  book_revision = "1"
+book_short_date = book_modification_date.strftime('%Y-%m-%d')
 if book_language and book_format == "pdf":
   book.REQUEST['AcceptLanguage'].set(book_language, 10)
 if book_reference is None:
@@ -227,7 +234,7 @@ if book_include_reference_table is not None:
     book_image_list=book_image_list,
     book_table_list=book_table_list
   )
-  if book_format == 'html':
+  if book_format == 'html' or book_format == 'mhtml':
     book_content = book_references.encode('utf-8').strip() + book_content
   
 # table of content
@@ -255,10 +262,10 @@ for image in re.findall('(<img.*?/>)', book_content):
   )
 # ============================ Transformation ==================================    
 
-# ============================= Format: html ===================================
-if book_format == "html":
+# ========================== Format: mhtml/html ================================
+if book_format == "html" or book_format == "mhtml":
   book.REQUEST.RESPONSE.setHeader("Content-Type", "text/html;")
-  return book.WebPage_createBook(
+  book_output = book.WebPage_createBook(
     book_theme=book_theme.get("theme"),
     book_title=book_title,
     book_language=book_language,
@@ -272,7 +279,7 @@ if book_format == "html":
     book_signature_list=book_signature_list,
     book_version_list=book_version_list,
     book_distribution_list=book_distribution_list,
-    book_logo_url=book_source.get("enhanced_logo_url"),
+    book_logo_url=setUrl(book_source.get("enhanced_logo_url")),
     book_logo_title=book_theme.get("theme_logo_description"),
     book_reference=book_reference,
     book_revision=book_revision,
@@ -283,6 +290,10 @@ if book_format == "html":
     book_content=book_content,
     book_table_of_content=book_table_of_content
   )
+  if book_format == "html":
+    return book_output
+  if book_format == "mhtml":
+    return book.Base_convertHtmlToSingleFile(book_output, allow_script=True)
 
 # ============================= Format: pdf ====================================
 if book_format == "pdf":
@@ -304,7 +315,7 @@ if book_format == "pdf":
     book_language=book_language,
     book_theme_css_font_list=book_theme.get("theme_css_font_list"),
     book_theme_css_url=book_theme.get("theme_css_url"),
-    book_theme_logo_url=book_source.get("enhanced_logo_url"),
+    book_theme_logo_url=setUrl(book_source.get("enhanced_logo_url")),
     book_theme_logo_alt=book_theme.get("theme_logo_alt"),
     book_template_css_url=book_theme.get("template_css_url"),
     book_include_history=book_include_history_table,
@@ -326,7 +337,6 @@ if book_format == "pdf":
     book_template_css_url=book_theme.get("template_css_url"),
     book_content=book_content,
   )
-
   book_head = book.WebPage_createBookHeader(
     book_theme=book_theme.get("theme"),
     book_title=book_title,
@@ -334,13 +344,13 @@ if book_format == "pdf":
     book_theme_css_font_list=book_theme.get("theme_css_font_list"),
     book_theme_css_url=book_theme.get("theme_css_url"),
     book_template_css_url=book_theme.get("template_css_url"),
-    book_logo_url=book_source.get("enhanced_logo_url"),
+    book_logo_url=setUrl(book_source.get("enhanced_logo_url")),
     book_logo_title=book_theme.get("theme_logo_description"),
     book_short_title=book_short_title,
     book_reference=book_reference,
     book_revision=book_revision,
     book_version=book_version,
-    book_short_date=book_short_date,
+    book_short_date=book_short_date
   )
   
   book_foot = book.WebPage_createBookFooter(
@@ -349,7 +359,7 @@ if book_format == "pdf":
     book_language=book_language,
     book_theme_css_font_list=book_theme.get("theme_css_font_list"),
     book_theme_css_url=book_theme.get("theme_css_url"),
-    book_theme_logo_url=book_source.get("enhanced_logo_url"),
+    book_theme_logo_url=setUrl(book_source.get("enhanced_logo_url")),
     book_theme_logo_alt=book_theme.get("theme_logo_description"),
     book_template_css_url=book_theme.get("template_css_url"),
     book_full_reference=book_full_reference,
@@ -378,7 +388,7 @@ if book_format == "pdf":
     encoding="utf8",
     margin_top=40,
     margin_bottom=20,
-    toc=True,
+    toc=True if book_include_content_table is not None else False,
     before_toc_data_list=before_toc_data_list,
     xsl_style_sheet_data=b64encode(xsl_style_sheet_data),
     after_toc_data_list=after_toc_data_list,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_exportAsLeaflet.py

@@ -13,6 +13,5 @@ return context.WebPage_viewAsLeaflet(
   document_save=document_save,
   document_download=document_download,
   batch_mode=batch_mode,
-  override_time=override_time,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_exportAsLeaflet.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_printAsLeaflet.py

@@ -13,6 +13,5 @@ return context.WebPage_viewAsLeaflet(
   document_save=document_save,
   document_download=document_download,
   batch_mode=batch_mode,
-  override_time=override_time,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_printAsLeaflet.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <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>
+            <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>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_leaflet/WebPage_viewAsLeaflet.py

@@ -14,7 +14,6 @@ MAIN FILE: render two pager in different output formats
 # override_source_organisation_title used instead of follow-up organisation
 # override_source_person_title used instead of contributor
 # override_batch_mode       used for tests
-# override_time             used for tests
 # ------
 # document_downalod:        download file directly (default None)            
 # document_save:            save file in document module (default None)
@@ -69,6 +68,13 @@ def setToNone(param):
   else:
     return param
 
+# XXX change url so convert does not fail    
+def setUrl(path):
+  if path.find("common") > -1:
+    return path
+  else:
+    return path + "&display=thumbnail"
+
 # -------------------------- Setup ---------------------------------------------
 leaflet = context
 leaflet_prefix = "Leaflet."
@@ -91,8 +97,7 @@ override_source_organisation_title = kw.get(
   "override_source_organisation_title",
   None
 )
-override_batch_mode = kw.get('batch_mode', None) or False
-override_time = setToNone(kw.get('override_time', None)) or None
+override_batch_mode = setToNone(kw.get('batch_mode', None))
 
 
 # -------------------------- Document Parameters  ------------------------------
@@ -114,7 +119,7 @@ leaflet_modification_date = leaflet.getModificationDate()
 # u"©".encode("utf8")
 #leaflet_copy = 	u"\u00A9".encode('utf-8') | unicode('©', 'utf8') | '©'.encode('utf-8').strip()
 
-if override_time is not None:
+if override_batch_mode is not None:
   leaflet_date="Nov-1976"
   leaflet_year="1976"
 if leaflet_language and leaflet_format == "pdf":
@@ -235,7 +240,7 @@ if leaflet_format == "html":
     leaflet_template_css_url=leaflet_theme.get("template_css_url"),
     leaflet_organisation=leaflet_source.get("organisation_title", blank),
     leaflet_organisation_claim=leaflet_theme.get("theme_logo_description") or blank,
-    leaflet_logo_url=leaflet_source.get("enhanced_logo_url"),
+    leaflet_logo_url=setUrl(leaflet_source.get("enhanced_logo_url")),
     leaflet_copyright=leaflet_source.get("organisation_title", blank),
     leaflet_full_reference=leaflet_full_reference,
     leaflet_year=leaflet_year,
@@ -267,7 +272,7 @@ if leaflet_format == "pdf":
     leaflet_theme_css_font_list=leaflet_theme.get("theme_css_font_list"),
     leaflet_theme_css_url=leaflet_theme.get("theme_css_url"),
     leaflet_template_css_url=leaflet_theme.get("template_css_url"),
-    leaflet_logo_url=leaflet_source.get("enhanced_logo_url"),
+    leaflet_logo_url=setUrl(leaflet_source.get("enhanced_logo_url")),
     leaflet_copyright=leaflet_source.get("organisation_title", blank),
     leaflet_full_reference=leaflet_full_reference,
     leaflet_year=leaflet_year,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/Letter_viewAsLetter.py

@@ -14,7 +14,6 @@ MAIN FILE: generate letter in different output formats
 # override_destination_organisation: to use instead of event destination/null
 # override_date             to use instead of current date
 # override_batch_mode       used for tests
-# override_time             used for tests
 # ------
 # document_download:        download file directly (default None)            
 # document_save:            save file in document module (default None)
@@ -67,6 +66,13 @@ def setToNone(param):
   else:
     return param
 
+# XXX change url so convert does not fail    
+def setUrl(path):
+  if path.find("common") > -1:
+    return path
+  else:
+    return path + "&display=thumbnail"
+
 # -------------------------- Setup ---------------------------------------------
 letter = context
 letter_format = kw.get('format', 'html')
@@ -83,8 +89,7 @@ override_destination_person_title = kw.get("override_destination_person_title",
 override_destination_organisation_title = kw.get("override_destination_organisation_title", None)
 override_date = setToNone(kw.get("override_date", None))
 
-override_batch_mode = kw.get('batch_mode', False)
-override_time = setToNone(kw.get('override_time', None)) or None
+override_batch_mode = setToNone(kw.get('batch_mode', None))
 
 # -------------------------- Document Parameters  ------------------------------
 letter_form = letter.REQUEST
@@ -124,7 +129,7 @@ else:
   letter_version = "001"
   letter_reference = letter_form.get("reference")
 
-if override_time is not None:
+if override_batch_mode is not None:
   letter_modification_date = DateTime("1976-11-04")
 if letter_language and letter_format == "pdf":
   letter.REQUEST['AcceptLanguage'].set(letter_language, 10)
@@ -180,7 +185,7 @@ if letter_format == "html":
     letter_theme_css_font_list=letter_theme.get("theme_css_font_list"),
     letter_theme_css_url=letter_theme.get("theme_css_url"),
     letter_template_css_url=letter_theme.get("template_css_url"),
-    letter_theme_logo_url=letter_source.get("enhanced_logo_url"),
+    letter_theme_logo_url=setUrl(letter_source.get("enhanced_logo_url")),
     letter_theme_logo_alt=letter_theme.get("theme_logo_description"),
     letter_timestamp=letter_modification_date.strftime('%Y-%m-%d'),
     letter_destination_company=letter_destination.get("organisation_title", blank),
@@ -222,7 +227,7 @@ if letter_format == "pdf":
     letter_theme_css_font_list=letter_theme.get("theme_css_font_list"),
     letter_theme_css_url=letter_theme.get("theme_css_url"),
     letter_template_css_url=letter_theme.get("template_css_url"),
-    letter_theme_logo_url=letter_source.get("enhanced_logo_url"),
+    letter_theme_logo_url=setUrl(letter_source.get("enhanced_logo_url")),
     letter_theme_logo_alt=letter_theme.get("theme_logo_description"),
     letter_timestamp=letter_modification_date.strftime('%Y-%m-%d'),
     letter_source_city=letter_source.get("city", blank)
@@ -236,7 +241,7 @@ if letter_format == "pdf":
     letter_theme_css_font_list=letter_theme.get("theme_css_font_list"),
     letter_theme_css_url=letter_theme.get("theme_css_url"),
     letter_template_css_url=letter_theme.get("template_css_url"),
-    letter_theme_logo_url=letter_source.get("enhanced_logo_url"),
+    letter_theme_logo_url=setUrl(letter_source.get("enhanced_logo_url")),
     letter_theme_logo_alt=letter_theme.get("theme_logo_description"),
     letter_timestamp=letter_modification_date.strftime('%Y-%m-%d'),
     letter_destination_company=letter_destination.get("organisation_title", blank),

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_exportAsLetter.py

@@ -16,6 +16,5 @@ return context.Letter_viewAsLetter(
   document_save=document_save,
   document_download=document_download,
   batch_mode=batch_mode,
-  override_time=override_time,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_exportAsLetter.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>format="html", override_time=None, display_source_address=None, display_head=1, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,**kw</string> </value>
+            <value> <string>format="html", display_source_address=None, display_head=1, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_printAsLetter.py

@@ -16,6 +16,5 @@ return context.Letter_viewAsLetter(
   document_save=document_save,
   document_download=document_download,
   batch_mode=batch_mode,
-  override_time=override_time,
   **kw
 )

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_printAsLetter.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>format="pdf", override_time=None, batch_mode=False, display_source_address=None, display_svg=None,display_head=1,document_download=True, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,**kw</string> </value>
+            <value> <string>format="pdf", batch_mode=False, display_source_address=None, display_svg=None,display_head=1,document_download=True, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_createSlideshowFooter.zpt

@@ -16,7 +16,8 @@ Creates the Slideshow footer section.
                        doc_description                   python: options.get('doc_description');
                        doc_creation_year                 python: options.get('doc_creation_year');
                        doc_copyright                     python: options.get('doc_copyright');
-                       doc_author_list                   python: options.get('doc_author_list');">
+                       doc_author_list                   python: options.get('doc_author_list');
+                       doc_css                           python: options.get('doc_css');">
   <!DOCTYPE html>
   <html tal:attributes="class python: ''.join(['ci-', doc_theme, ' ci-', doc_language])">
   <head>
@@ -33,6 +34,7 @@ Creates the Slideshow footer section.
     <link rel="stylesheet" href="slide_css/zenburn.css" />
     <link rel="stylesheet" tal:attributes="href python: ''.join([doc_theme_css_url, ''])" />
     <link rel="stylesheet" tal:attributes="href python: ''.join([doc_template_css_url, ''])" />
+    <style type="text/css" tal:content="structure doc_css"></style>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -56,7 +58,9 @@ Creates the Slideshow footer section.
   <tal:block metal:define-macro="slide_footer">
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
-	      <div style="width: 50%; height: 16mm;" class="ci-slideshow-footer-logo"></div>
+	      <div class="ci-slideshow-footer-image-wrapper">
+          <img tal:attributes="src python: doc_footer_url" alt="" />
+        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center" tal:content="doc_description"></div>
 	    <div class="ci-slideshow-container-right">

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_exportAsSlideshow.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>format="html", document_download=None, document_save=None, display_note=0, display_svg=None, override_source_organisation_title=None, override_logo_reference=None, batch_mode=False, **kw</string> </value>
+            <value> <string>format="html", batch_mode=None, document_download=None, document_save=None, display_note=0, display_svg=None, override_source_organisation_title=None, override_logo_reference=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_printAsSlideshow.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>format="pdf", display_note=0,override_source_organisation_title=None,override_logo_reference=None, batch_mode=False, document_download=None, display_svg=None, document_save=None,**kw</string> </value>
+            <value> <string>format="pdf", display_note=0, batch_mode=None, override_source_organisation_title=None,override_logo_reference=None, document_download=None, display_svg=None, document_save=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_viewAsSlideshow.py

@@ -161,6 +161,13 @@ def setToNone(param):
   else:
     return param
 
+# XXX change url so convert does not fail    
+def setUrl(path):
+  if path.find("common") > -1:
+    return path
+  else:
+    return path + "&display=thumbnail"
+
 # -------------------------- Setup ---------------------------------------------
 doc = context
 doc_prefix = "Slideshow."
@@ -177,7 +184,7 @@ doc_ooo = setToNone(kw.get('flag_ooo', None))
 
 override_logo_reference = kw.get('override_logo_reference', None)
 override_source_organisation_title = kw.get("override_source_organisation_title", None)
-override_batch_mode = kw.get('batch_mode', False)
+override_batch_mode = setToNone(kw.get('batch_mode', None))
 override_source_person_title = None
 
 # ---------- backward compatability with legacy odp/sxi presentations ----------
@@ -226,6 +233,9 @@ doc_relative_url = doc.getRelativeUrl()
 doc_aggregate_list = []
 doc_modification_date = doc.getModificationDate()
 
+if override_batch_mode is not None:
+  doc_version = "001"
+  doc_creation_year = "1976"
 if doc_language and doc_format == "pdf":
   doc.REQUEST['AcceptLanguage'].set(doc_language, 10)
 if doc_reference is None:
@@ -255,14 +265,14 @@ doc_source = doc.Base_getSourceDict(
   default_bank_account_uid=getCustomParameter("default_bank_account_uid", 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;',
-    '}'
-  ])
+#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 ---------------------------------
 for image in re.findall('(<img.*?/>)', doc_content):
@@ -327,7 +337,7 @@ if doc_format == "html":
     doc_template_css_url=doc_theme.get("template_css_url"),
     doc_theme_css_font_list=doc_theme.get("theme_css_font_list"),
     doc_theme_css_url=doc_theme.get("theme_css_url"),
-    doc_footer_url=doc_source.get("enhanced_logo_url"),
+    doc_footer_url=setUrl(doc_source.get("enhanced_logo_url")),
     doc_description=doc_description,
     doc_creation_year=doc_creation_year,
     doc_copyright=doc_source.get("organisation_title", blank),
@@ -346,11 +356,12 @@ if doc_format == "pdf":
     doc_template_css_url=doc_theme.get("template_css_url"),
     doc_theme_css_font_list=doc_theme.get("theme_css_font_list"),
     doc_theme_css_url=doc_theme.get("theme_css_url"),
-    doc_footer_url=doc_source.get("enhanced_logo_url"),
+    doc_footer_url=setUrl(doc_source.get("enhanced_logo_url")),
     doc_description=doc_description,
     doc_creation_year=doc_creation_year,
     doc_copyright=doc_source.get("organisation_title", blank),
-    doc_author_list=doc_source.get("contributor_title_string")
+    doc_author_list=doc_source.get("contributor_title_string"),
+    doc_css=doc_css
   )
   doc_slideshow_cover = context.WebPage_createSlideshowCover(
     doc_format=doc_format,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_viewAsWeb.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>format="html", batch_mode=False, document_download=None, document_save=None, display_note=0, display_svg=None, override_logo_reference=None, override_source_organisation_title=None,**kw</string> </value>
+            <value> <string>format="html", batch_mode=None, document_download=None, document_save=None, display_note=0, display_svg=None, override_logo_reference=None, override_source_organisation_title=None,**kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_corporate_identity/TestTemplateItem/portal_components/test.erp5.testCorporateIdentityTemplates.py

@@ -236,7 +236,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
     test_page = getattr(self.portal.web_page_module, id1)
     expected_page = getattr(self.portal.web_page_module, id2)
     dump = getattr(self.portal, 'dump_data', None)
-    #kw["override_date"] = kw.get("override_date", test_page.getModificationDate())
+    kw["batch_mode"] = 1
 
     html = getattr(test_page, kw.get("test_method"))(portal_skin=kw.get("use_skin"), **kw)
     html = re.sub(host_url, test_url, html)
@@ -254,7 +254,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
     expected_image = getattr(self.portal.image_module, id2)
     image_source_pdf_doc = getattr(self.portal.document_module, id3)
     dump = getattr(self.portal, 'dump_data', None)
-    #kw["override_date"] = kw.get("override_date", test_page.getModificationDate())
+    kw["batch_mode"] = 1
 
     pdf_kw = dict(
       reference=test_page.getReference(),
@@ -568,8 +568,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       "template_test_letter_output_expected_001_en_html",
       **dict(
         test_method="WebPage_exportAsLetter",
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
   
@@ -588,8 +587,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       "template_test_letter_output_expected_002_en_html",
       **dict(
         test_method="WebPage_exportAsLetter",
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
 
@@ -614,8 +612,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         override_destination_person_title="Test Association Member",
         subfield_field_override_date_year="1999",
         subfield_field_override_date_month="12",
-        subfield_field_override_date_day="31",
-        override_time=1
+        subfield_field_override_date_day="31"
       )
     )
 
@@ -636,8 +633,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         test_method="WebPage_exportAsLetter",
         use_skin="Letter",
         display_head=0,
-        lang="de",
-        override_time=1
+        lang="de"
       )
     )
 
@@ -657,8 +653,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         page_number=0,
         test_method="WebPage_exportAsLetter",
         format="pdf",
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
 
@@ -680,8 +675,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         page_number=0,
         test_method="WebPage_exportAsLetter",
         format="pdf",
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
 
@@ -709,8 +703,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         override_destination_person_title="Test Association Member",
         subfield_field_override_date_year="1999",
         subfield_field_override_date_month="12",
-        subfield_field_override_date_day="31",
-        override_time=1
+        subfield_field_override_date_day="31"
       )
     )
     
@@ -733,8 +726,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         format="pdf",
         lang="de",
         display_head=0,
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
 
@@ -753,8 +745,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       **dict(
         page_number=0,
         test_method="WebPage_printAsLetter",
-        use_skin="Letter",
-        override_time=1
+        use_skin="Letter"
       )
     )
 
@@ -771,8 +762,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       "template_test_leaflet_output_expected_001_en_html",
       **dict(
         test_method="WebPage_exportAsLeaflet",
-        use_skin="Leaflet",
-        override_time=1
+        use_skin="Leaflet"
       )
     )
   
@@ -793,8 +783,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         override_source_person_title="Test Recipient",
         override_source_organisation_title="Test Association",
         override_leaflet_header_title="Couscous",
-        use_skin="Leaflet",
-        override_time=1
+        use_skin="Leaflet"
       )
     )
 
@@ -811,8 +800,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       "template_test_leaflet_output_expected_003_de_html",
       **dict(
         test_method="WebPage_exportAsLeaflet",
-        use_skin="Leaflet",
-        override_time=1
+        use_skin="Leaflet"
       )
     )
   
@@ -832,8 +820,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         page_number=1,
         format="pdf",
         test_method="WebPage_exportAsLeaflet",
-        use_skin="Leaflet",
-        override_time=1
+        use_skin="Leaflet"
       )
     )
 
@@ -857,8 +844,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         use_skin="Leaflet",
         override_source_organisation_title="Test Association",
         override_source_person_title="Test Recipient",
-        override_leaflet_header_title="Couscous",
-        override_time=1
+        override_leaflet_header_title="Couscous"
       )
     )
 
@@ -878,8 +864,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         page_number=0,
         test_method="WebPage_exportAsLeaflet",
         use_skin="Leaflet",
-        format="pdf",
-        override_time=1
+        format="pdf"
       )
     )
 
@@ -897,8 +882,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       **dict(
         page_number=1,
         test_method="WebPage_printAsLeaflet",
-        use_skin="Leaflet",
-        override_time=1
+        use_skin="Leaflet"
       )
     )
 
@@ -984,7 +968,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
       "template_test_book_input_page_4_001_en_bmp",
       "template_test_book_input_001_en_pdf",
       **dict(
-        page_number=4,
+        page_number=5,
         use_skin="Book",
         test_method="WebPage_exportAsBook",
         format="pdf",
@@ -1138,4 +1122,3 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
         override_revision=1
       )
     )
-  
\ No newline at end of file