tests: update expected HTML/XML produced by page templates

With zope.tal 3.6.0 - commit 26fadc4 (Increase the default value of the `wrap` argument from 60 to 1023 characters, to avoid extra whitespace and line breaks., 2011-08-20) from zopefoundation/zope.tal - page templates keep the attributes on the same line and produce slightly different output, although equivalent. This commit updates the places where we do snapshot testing to the new output. We discussed using lxml features to compare html and xml from https://lxml.de/lxmlhtml.html#running-html-doctests but because the corporate identity web pages are invalid html, it seems unsafe to rely on lxml at this point. Once corporate identity web pages are fixed this would probably be a good thing to do.

tests: update expected HTML/XML produced by page templates
With zope.tal 3.6.0 - commit 26fadc4 (Increase the default value of the `wrap` argument from 60 to 1023 characters, to avoid extra whitespace and line breaks., 2011-08-20) from zopefoundation/zope.tal - page templates keep the attributes on the same line and produce slightly different output, although equivalent. This commit updates the places where we do snapshot testing to the new output. We discussed using lxml features to compare html and xml from https://lxml.de/lxmlhtml.html#running-html-doctests but because the corporate identity web pages are invalid html, it seems unsafe to rely on lxml at this point. Once corporate identity web pages are fixed this would probably be a good thing to do.
fd247eeb · Jérome Perrin · 32c729f7 · fd247eeb · fd247eeb · fd247eeb
Commit fd247eeb authored Mar 11, 2022 by Jérome Perrin
17 changed files
--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_001_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_001_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Book</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Book" />
-          href="template_themes/themes.css?portal_skin=Book" />
    <link rel="stylesheet" href="template_css/book.css" />
    <link rel="stylesheet" href="template_css/highlight.css" />
@@ -36,10 +35,7 @@
          <tr>
            <td>
              <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img class="hack"
+                <img class="hack" onload="setImageSize(event.srcElement)" alt="" src="organisation_module/template_test_association/default_image?format=png&amp;display=small" />
-                     onload="setImageSize(event.srcElement)"
-                     src="organisation_module/template_test_association/default_image?format=png&amp;display=small"
-                     alt="" />
              </div>
            </td>
            <td>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Couscous</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Book" />
-          href="template_themes/themes.css?portal_skin=Book" />
    <link rel="stylesheet" href="template_css/book.css" />
    <link rel="stylesheet" href="template_css/highlight.css" />
@@ -36,10 +35,7 @@
          <tr>
            <td>
              <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img class="hack"
+                <img class="hack" onload="setImageSize(event.srcElement)" alt="" src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small" />
-                     onload="setImageSize(event.srcElement)"
-                     src="Template.Test.Image.Erp5.Logo?format=png&amp;display=small"
-                     alt="" />
              </div>
            </td>
            <td>
@@ -347,8 +343,7 @@
              <tr>
                <td width="9%"><a id="AD-1"></a><span>AD-1</span></td>
-                <td width="56%" style="text-align:left"><span>Claudia Hofemann Wind Energy Section, TU Delft</span><br /><a
+                <td width="56%" style="text-align:left"><span>Claudia Hofemann Wind Energy Section, TU Delft</span><br /><a href="http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf"><span>http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf</span></a></td>
-    href="http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf"><span>http://proceedings.ewea.org/annual2013/allfiles2/1287_EWEA2013presentationfinal.pdf</span></a></td>
                <td width="21%">N/A</td>
                <td width="14%">N/A</td>
              </tr>
@@ -356,8 +351,7 @@
              <tr>
                <td width="9%"><a id="AD-2"></a><span>AD-2</span></td>
-                <td width="56%" style="text-align:left"><span>Gnu</span><br /><a
+                <td width="56%" style="text-align:left"><span>Gnu</span><br /><a href="https://gnu.org"><span>https://gnu.org</span></a></td>
-    href="https://gnu.org"><span>https://gnu.org</span></a></td>
                <td width="21%">N/A</td>
                <td width="14%">N/A</td>
              </tr>
@@ -365,8 +359,7 @@
              <tr>
                <td width="9%"><a id="AD-3"></a><span>AD-3</span></td>
-                <td width="56%" style="text-align:left"><span>Google Website</span><br /><a
+                <td width="56%" style="text-align:left"><span>Google Website</span><br /><a href="https://www.google.com/"><span>https://www.google.com/</span></a></td>
-    href="https://www.google.com/"><span>https://www.google.com/</span></a></td>
                <td width="21%">Search</td>
                <td width="14%">0</td>
              </tr>
@@ -390,8 +383,7 @@
              <tr>
                <td width="9%"><a id="RD-1"></a><span>RD-1</span></td>
-                <td width="56%" style="text-align:left"><span>Guidance Note on Noise Assessment of Devices</span><br /><a
+                <td width="56%" style="text-align:left"><span>Guidance Note on Noise Assessment of Devices</span><br /><a href="https://www.epa.ie/pubs/advice/noise/Wind_Turbine_web.pdf"><span>https://www.epa.ie/pubs/advice/noise/Wind_Turbine_web.pdf</span></a></td>
-    href="https://www.epa.ie/pubs/advice/noise/Wind_Turbine_web.pdf"><span>https://www.epa.ie/pubs/advice/noise/Wind_Turbine_web.pdf</span></a></td>
                <td width="21%">A</td>
                <td width="14%">B</td>
              </tr>
@@ -415,8 +407,7 @@
              <tr>
                <td width="9%"><a id="AB-1"></a><span>AB-1</span></td>
-                <td width="56%" style="text-align:left"><a
+                <td width="56%" style="text-align:left"><a href="http://www.wikipedia.com/ERP"><span>ERP</span></a></td>
-    href="http://www.wikipedia.com/ERP"><span>ERP</span></a></td>
                <td width="21%" style="text-align:left">Enterprise Research Planning</td>
                <td width="14%" style="text-align:left">The process of planning the resources of an enterprise</td>
              </tr>
@@ -438,15 +429,13 @@
            <tr>
              <td width="10%"><a id="Figure-1"></a><span>Figure-1</span></td>
-              <td width="90%"
+              <td width="90%" style="text-align: left; vertical-align: top">Reach</td>
-                  style="text-align: left; vertical-align: top">Reach</td>
            </tr>
            <tr>
              <td width="10%"><a id="Figure-2"></a><span>Figure-2</span></td>
-              <td width="90%"
+              <td width="90%" style="text-align: left; vertical-align: top">Caption for this image</td>
-                  style="text-align: left; vertical-align: top">Caption for this image</td>
            </tr>
@@ -466,15 +455,13 @@
              <tr>
                <td width="10%"><a id="Table-1"></a><span>Table-1</span></td>
-                <td width="90%"
+                <td width="90%" style="text-align: left; vertical-align: top">Table description</td>
-                    style="text-align: left; vertical-align: top">Table description</td>
              </tr>
              <tr>
                <td width="10%"><a id="Table-1"></a><span>Table-1</span></td>
-                <td width="90%"
+                <td width="90%" style="text-align: left; vertical-align: top">Table description</td>
-                    style="text-align: left; vertical-align: top">Table description</td>
              </tr>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_003_de_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_003_de_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Book</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Book" />
-          href="template_themes/themes.css?portal_skin=Book" />
    <link rel="stylesheet" href="template_css/book.css" />
    <link rel="stylesheet" href="template_css/highlight.css" />
@@ -36,10 +35,7 @@
          <tr>
            <td>
              <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img class="hack"
+                <img class="hack" onload="setImageSize(event.srcElement)" alt="" src="organisation_module/template_test_association/default_image?format=png&amp;display=small" />
-                     onload="setImageSize(event.srcElement)"
-                     src="organisation_module/template_test_association/default_image?format=png&amp;display=small"
-                     alt="" />
              </div>
            </td>
            <td>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_004_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_004_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Book</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Book" />
-          href="template_themes/themes.css?portal_skin=Book" />
    <link rel="stylesheet" href="template_css/book.css" />
    <link rel="stylesheet" href="template_css/highlight.css" />
@@ -36,10 +35,7 @@
          <tr>
            <td>
              <div class="ci-book-header-image-wkhtmltopdf-image-wrapper">
-                <img class="hack"
+                <img class="hack" onload="setImageSize(event.srcElement)" alt="" src="organisation_module/template_test_association/default_image?format=png&amp;display=small" />
-                     onload="setImageSize(event.srcElement)"
-                     src="organisation_module/template_test_association/default_image?format=png&amp;display=small"
-                     alt="" />
              </div>
            </td>
            <td>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_001_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_001_en_html.html
@@ -7,8 +7,7 @@
    <meta charset="utf-8">
    <title>Template Test Leaflet</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Leaflet" />
-          href="template_themes/themes.css?portal_skin=Leaflet" />
    <link rel="stylesheet" href="template_css/leaflet.css" />
      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
@@ -202,8 +201,7 @@
 	    <div class="ci-leaflet-container-left">
 	      <div class="ci-leaflet-footer-image-wrapper">
-          <img alt="Logo"
+          <img alt="Logo" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
        </div>
 	    </div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_002_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_002_en_html.html
@@ -7,8 +7,7 @@
    <meta charset="utf-8">
    <title>Template Test Leaflet</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Leaflet" />
-          href="template_themes/themes.css?portal_skin=Leaflet" />
    <link rel="stylesheet" href="template_css/leaflet.css" />
      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") 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>
@@ -202,8 +201,7 @@
 	    <div class="ci-leaflet-container-left">
 	      <div class="ci-leaflet-footer-image-wrapper">
-          <img alt="Logo"
+          <img alt="Logo" src="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>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_003_de_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_003_de_html.html
@@ -7,8 +7,7 @@
    <meta charset="utf-8">
    <title>Template Test Leaflet</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Leaflet" />
-          href="template_themes/themes.css?portal_skin=Leaflet" />
    <link rel="stylesheet" href="template_css/leaflet.css" />
      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
@@ -202,8 +201,7 @@
 	    <div class="ci-leaflet-container-left">
 	      <div class="ci-leaflet-footer-image-wrapper">
-          <img alt="Logo"
+          <img alt="Logo" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
        </div>
 	    </div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_001_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_001_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Letter</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Letter" />
-          href="template_themes/themes.css?portal_skin=Letter" />
    <link rel="stylesheet" href="template_css/letter.css" />
  </head>
  <body class="ci-letter">
@@ -15,8 +14,7 @@
    <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo ci-letter-bar-logo-without-description">
-  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
+  		      <img alt="" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               alt="" />
            <span></span>
          </div>
        <div class="ci-letter-bar-purporse"><span></span></div>
@@ -57,8 +55,7 @@
              <td></td>
-    <td class="ci-letter-destination"
+    <td class="ci-letter-destination" style="padding-left: 100px">
-        style="padding-left: 100px">
      <span> </span>
      <span> </span>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_002_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_002_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Letter</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Letter" />
-          href="template_themes/themes.css?portal_skin=Letter" />
    <link rel="stylesheet" href="template_css/letter.css" />
  </head>
  <body class="ci-letter">
@@ -15,8 +14,7 @@
    <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo ci-letter-bar-logo-without-description">
-  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
+  		      <img alt="" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               alt="" />
            <span></span>
          </div>
        <div class="ci-letter-bar-purporse"><span></span></div>
@@ -57,8 +55,7 @@
              <td></td>
-    <td class="ci-letter-destination"
+    <td class="ci-letter-destination" style="padding-left: 100px">
-        style="padding-left: 100px">
      <span>Test Organisation</span>
      <span>Test Recipient</span>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_003_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_003_en_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Letter</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Letter" />
-          href="template_themes/themes.css?portal_skin=Letter" />
    <link rel="stylesheet" href="template_css/letter.css" />
  </head>
  <body class="ci-letter">
@@ -15,8 +14,7 @@
    <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo ci-letter-bar-logo-without-description">
-  		      <img src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail"
+  		      <img alt="" src="organisation_module/template_test_association/default_image?format=png&amp;display=thumbnail" />
-               alt="" />
            <span></span>
          </div>
        <div class="ci-letter-bar-purporse"><span></span></div>
@@ -57,8 +55,7 @@
              <td></td>
-    <td class="ci-letter-destination"
+    <td class="ci-letter-destination" style="padding-left: 100px">
-        style="padding-left: 100px">
      <span>Test Association</span>
      <span>Test Association Member</span>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_004_de_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_004_de_html.html
@@ -6,8 +6,7 @@
    <meta charset="utf-8">
    <title>Template Test Letter</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Letter" />
-          href="template_themes/themes.css?portal_skin=Letter" />
    <link rel="stylesheet" href="template_css/letter.css" />
  </head>
  <body class="ci-letter">
@@ -15,8 +14,7 @@
    <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo ci-letter-bar-logo-without-description">
-  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
+  		      <img alt="" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               alt="" />
            <span></span>
          </div>
        <div class="ci-letter-bar-purporse"><span></span></div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_001_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_001_en_html.html
@@ -7,8 +7,7 @@
    <meta charset="utf-8">
    <title>Template Test Release</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Release" />
-          href="template_themes/themes.css?portal_skin=Release" />
    <link rel="stylesheet" href="template_css/release.css" />
      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}</style>
@@ -67,8 +66,7 @@
    </div>
    <h2 class="ci-press-release-subheader">Permanent Link</h2>
    <ul class="ci-press-release-contact-list">
-      <li><span class="ci-press-release-permalink"><a
+      <li><span class="ci-press-release-permalink"><a href="web_page_module/template_test_release_input_001_en_html">web_page_module/template_test_release_input_001_en_html</a></span></li>
-    href="web_page_module/template_test_release_input_001_en_html">web_page_module/template_test_release_input_001_en_html</a></span></li>
    </ul>
    <h2 class="ci-press-release-subheader">Contact</h2>
@@ -126,8 +124,7 @@
      <div class="ci-press-release-company-info">
        <div class="ci-press-release-container ci-press-release-container-left">
-            <img alt=""
+            <img alt="" src="organisation_module/template_test_association/default_image?format=png" />
-                 src="organisation_module/template_test_association/default_image?format=png" />
        </div>
        <div class="ci-press-release-container ci-press-release-container-center">
@@ -157,8 +154,7 @@
      <div class="ci-press-release-container ci-press-release-container-left">
          <div class="ci-press-release-footer-image-wrapper">
-            <img alt="Logo"
+            <img alt="Logo" src="image_module/template_test_image_logo_png?format=png" />
-                 src="image_module/template_test_image_logo_png?format=png" />
          </div>
      </div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_002_de_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_002_de_html.html
@@ -7,8 +7,7 @@
    <meta charset="utf-8">
    <title>Template Test Release</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Release" />
-          href="template_themes/themes.css?portal_skin=Release" />
    <link rel="stylesheet" href="template_css/release.css" />
      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}</style>
@@ -66,8 +65,7 @@
      <div class="ci-press-release-container ci-press-release-container-left">
          <div class="ci-press-release-footer-image-wrapper">
-            <img alt="Logo"
+            <img alt="Logo" src="image_module/template_test_image_logo_png?format=png" />
-                 src="image_module/template_test_image_logo_png?format=png" />
          </div>
      </div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_001_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_001_en_html.html
@@ -7,13 +7,11 @@
    <title>Template Test Slideshow</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-      <link rel="stylesheet"
+      <link rel="stylesheet" href="template_css/reveal.custom.css" />
-            href="template_css/reveal.custom.css" />
    <link rel="stylesheet" href="template_css/white_theme.custom.css" id="theme" />
    <link rel="stylesheet" href="template_css/zenburn.css" />
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Slide" />
-          href="template_themes/themes.css?portal_skin=Slide" />
    <link rel="stylesheet" href="template_css/slide.css" />
    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
    <script type="text/javascript">
@@ -37,8 +35,7 @@
    <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
 	      <div class="ci-slideshow-footer-image-wrapper">
-          <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
+          <img alt="logo" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               alt="logo" />
        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center"></div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_002_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_002_en_html.html
@@ -7,13 +7,11 @@
    <title>Template Test Slideshow</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-      <link rel="stylesheet"
+      <link rel="stylesheet" href="template_css/reveal.custom.css" />
-            href="template_css/reveal.custom.css" />
    <link rel="stylesheet" href="template_css/white_theme.custom.css" id="theme" />
    <link rel="stylesheet" href="template_css/zenburn.css" />
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Slide" />
-          href="template_themes/themes.css?portal_skin=Slide" />
    <link rel="stylesheet" href="template_css/slide.css" />
    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
    <script type="text/javascript">
@@ -37,8 +35,7 @@
    <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
 	      <div class="ci-slideshow-footer-image-wrapper">
-          <img src="Template.Test.Image.Logo.Alternativ?format=png&amp;display=thumbnail"
+          <img alt="logo" src="Template.Test.Image.Logo.Alternativ?format=png&amp;display=thumbnail" />
-               alt="logo" />
        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center"></div>

--- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_003_en_html.html
+++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_003_en_html.html
@@ -7,13 +7,11 @@
    <title>Template Test Slideshow</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
-      <link rel="stylesheet"
+      <link rel="stylesheet" href="template_css/reveal.custom.css" />
-            href="template_css/reveal.custom.css" />
    <link rel="stylesheet" href="template_css/white_theme.custom.css" id="theme" />
    <link rel="stylesheet" href="template_css/zenburn.css" />
-    <link rel="stylesheet"
+    <link rel="stylesheet" href="template_themes/themes.css?portal_skin=Slide" />
-          href="template_themes/themes.css?portal_skin=Slide" />
    <link rel="stylesheet" href="template_css/slide.css" />
    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
    <script type="text/javascript">
@@ -37,8 +35,7 @@
    <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
 	      <div class="ci-slideshow-footer-image-wrapper">
-          <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
+          <img alt="logo" src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
-               alt="logo" />
        </div>
 	    </div>
 	    <div class="ci-slideshow-container-center">Some description</div>

--- a/bt5/erp5_maileva_connector/TestTemplateItem/portal_components/test.erp5.testMailevaSOAPConnector.py
+++ b/bt5/erp5_maileva_connector/TestTemplateItem/portal_components/test.erp5.testMailevaSOAPConnector.py
@@ -316,8 +316,7 @@ class testMailevaSOAPConnector(ERP5TypeTestCase):
      <ns0:submit>
        <campaign Version="5.0" Application="connecteur_Maileva">
          <pjs:Requests>
-            <pjs:Request MediaType="DIGITAL"
+            <pjs:Request MediaType="DIGITAL" TrackId="test_track_id">
-                         TrackId="test_track_id">
              <pjs:Recipients>
                <pjs:Internal>
                  <pjs:Recipient Id="1">