Commit a3092603 authored by Sven Franck's avatar Sven Franck

erp5_corporate_identity: update test files

parent df12ac56
...@@ -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>ts13806290.09</string> </value> <value> <string>ts13900869.43</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>60be86e16f39223b794a6098fbc51cd6</string> </value> <value> <string>1cbe684856f892e7b5e80638f68b79bc</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13806319.93</string> </value> <value> <string>ts13900893.94</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>4d335b81355834b276543c8e04234404</string> </value> <value> <string>fe01f4c8f6079dc697a0d254f17269e8</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13806343.35</string> </value> <value> <string>ts13900912.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>6ec9eca808af89ab20af0aaec30c56cd</string> </value> <value> <string>de38dff3f0e7e3bf599bcdc4f3699b9c</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793992.53</string> </value> <value> <string>ts13900626.4</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>206595cc14fc018e77b5c3888de4727b</string> </value> <value> <string>48ef448c4ce8a2064a5b314141344c2c</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13794013.2</string> </value> <value> <string>ts13900655.86</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>2b0af9b9fa161ff6b7b18688224a11b4</string> </value> <value> <string>bc9df66f10e0fb7b4011e84b395ea170</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13794032.01</string> </value> <value> <string>ts13900679.2</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>439ea2bfa8ac1211caa980d74f9ec5e9</string> </value> <value> <string>c8679b2e86bede22cdf7014a7edb57fe</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793798.57</string> </value> <value> <string>ts13899679.86</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>1d7ed694e5e03a227a83145354809b67</string> </value> <value> <string>f1f28fee9032bc7959b716004d9a98cf</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793817.52</string> </value> <value> <string>ts13899697.99</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>64ce1f607c33ed4ea34fc6a9a8de797f</string> </value> <value> <string>fb2b40efc0e4c41105a347a35856a5b3</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793840.67</string> </value> <value> <string>ts13899716.89</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>381ebf897c45abd902374b5b1289fac6</string> </value> <value> <string>2b57fdcaf78214d0e48ab9cdf21f51e2</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793861.67</string> </value> <value> <string>ts13899737.75</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>36f5848b44d5fc0a42eadde52ce61030</string> </value> <value> <string>f2dcb19855f319bccb7504fe7808c81a</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793624.18</string> </value> <value> <string>ts13899444.92</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>a928a8efa2de422d04214d834fb80c88</string> </value> <value> <string>056bf568edbefa5d4decf78a8b16b0ac</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793659.78</string> </value> <value> <string>ts13899490.19</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>e77da726dcb244674bd8f596bc5a16da</string> </value> <value> <string>79c316af45838d8512ecaa12f3d72019</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793678.82</string> </value> <value> <string>ts13899511.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>5c0ea53e49fff1e124e5aaa510ec199a</string> </value> <value> <string>6b2e7b677f511dcd14e0bb4a1eaf7a5d</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793640.12</string> </value> <value> <string>ts13899471.91</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>a28d93ff6cf3924d17c514fd1db18e3e</string> </value> <value> <string>78dc6ace316c2c6bc802d4f2cd18b5a2</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -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>ts13793698.93</string> </value> <value> <string>ts13899537.13</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>faca27e1037583f5bd4fe579fb5959e4</string> </value> <value> <string>6bded42777378af19c195e085ef7407f</string> </value>
</item> </item>
<item> <item>
<key> <string>content_type</string> </key> <key> <string>content_type</string> </key>
......
...@@ -953,10 +953,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat ...@@ -953,10 +953,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat
<td>pdf_source</td> <td>pdf_source</td>
</tr> </tr>
<!-- pause to let the ajax request finish. now if the table was a async, queue <!-- pause to let the ajax request finish. now if the table was a async, queue
that would be nice, 3000 not enough--> that would be nice, 3/6/9000 not enough-->
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>6000</td> <td>12000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -1233,10 +1233,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat ...@@ -1233,10 +1233,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat
<td>pdf_source</td> <td>pdf_source</td>
</tr> </tr>
<!-- pause to let the ajax request finish. now if the table was a async, queue <!-- pause to let the ajax request finish. now if the table was a async, queue
that would be nice--> that would be nice, 3/6000 did not work-->
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>3000</td> <td>9000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -1493,10 +1493,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat ...@@ -1493,10 +1493,10 @@ http://seleniummaster.com/sitecontent/index.php/introduction-to-selenium-automat
<td>pdf_source</td> <td>pdf_source</td>
</tr> </tr>
<!-- pause to let the ajax request finish. now if the table was a async, queue <!-- pause to let the ajax request finish. now if the table was a async, queue
that would be nice--> that would be nice 3/6000 did not work-->
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>3000</td> <td>9000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<tr> <tr>
<td> <td>
<div class="ci-book-header-image-wkhtmltopdf-image-wrapper"> <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&amp;display=thumbnail" <img src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
alt="" /> alt="" />
</div> </div>
</td> </td>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<tr> <tr>
<td> <td>
<div class="ci-book-header-image-wkhtmltopdf-image-wrapper"> <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&amp;display=thumbnail" <img src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
alt="" /> alt="" />
</div> </div>
</td> </td>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<link rel="stylesheet" href="default_themes/themes.css" /> <link rel="stylesheet" href="default_themes/themes.css" />
<link rel="stylesheet" href="leaflet_css/leaflet.css" /> <link rel="stylesheet" href="leaflet_css/leaflet.css" />
<style type="text/css">html .ci-leaflet #left-summary:before {background: url("None") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style> <style type="text/css">html .ci-leaflet #left-summary:before {background: url("None") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("organisation_module/template_test_association/default_image?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
<script type="text/javascript"> <script type="text/javascript">
function setPlaceholdersWithUrlParameters() { function setPlaceholdersWithUrlParameters() {
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<div class="ci-leaflet-footer-image-wrapper"> <div class="ci-leaflet-footer-image-wrapper">
<img alt="Logo" <img alt="Logo"
src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail" /> src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail" />
</div> </div>
</div> </div>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="ci-letter-header"> <div class="ci-letter-header">
<div class="ci-letter-bar"> <div class="ci-letter-bar">
<div class="ci-letter-bar-logo"> <div class="ci-letter-bar-logo">
<img src="https://softinst73908.host.vifib.net/erp5/organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail" <img src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
alt="" /> alt="" />
<span></span> <span></span>
</div> </div>
......
...@@ -81,6 +81,7 @@ if override_logo_reference: ...@@ -81,6 +81,7 @@ if override_logo_reference:
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 and source_set is None: if source_logo_url is not blank and source_set is None:
# XXX: test environment fails if url with parameters are supplied
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
......
...@@ -22,6 +22,7 @@ theme_logo_alt = "Default Logo" ...@@ -22,6 +22,7 @@ theme_logo_alt = "Default Logo"
theme_logo = None theme_logo = None
theme_logo_url = None theme_logo_url = None
theme_logo_relative_url = None
theme_logo_description = blank theme_logo_description = blank
theme = ( theme = (
......
...@@ -287,6 +287,7 @@ if doc_format == "html" or doc_format == "mhtml": ...@@ -287,6 +287,7 @@ if doc_format == "html" or doc_format == "mhtml":
doc_css=doc_css, doc_css=doc_css,
doc_content=doc_content doc_content=doc_content
) )
if doc_format == "html": if doc_format == "html":
return doc.Base_finishWebPageCreation( return doc.Base_finishWebPageCreation(
doc_download=doc_download, doc_download=doc_download,
......
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