erp5_corporate_identity_test: add UI tests

bt5/erp5_corporate_identity/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml

@@ -19,4 +19,8 @@
   <skin_folder>erp5_corporate_identity_slide</skin_folder>
   <skin_selection>Slide</skin_selection>
  </skin_folder_selection>
+ <skin_folder_selection>
+  <skin_folder>erp5_xhtml_style</skin_folder>
+  <skin_selection>Book,Leaflet,Letter,Release,Report,Slide</skin_selection>
+ </skin_folder_selection>
 </registered_skin_selection>
\ No newline at end of file

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

@@ -13,7 +13,7 @@ blank = ''
 # -------------------------------  Set Theme -----------------------------------
 # XXX images in portal_skins folders don't convert with ?params. Only format
 # is kept in Base_convertHtmlToSingleFile
-pdf = ".pdf" if doc_format == "pdf" else blank
+pdf = ".pdf.css" if doc_format == "pdf" else ".css"
 css = "default_theme_css_url"
 font = "default_theme_font_css_url_list"
 param = "?format=png"
@@ -43,8 +43,11 @@ theme_dict["theme_logo_description"] = theme_logo_dict.get("description", blank)
 theme_dict["theme_logo_url"] = context.Base_getTemplateParameter("fallback_image")
 if theme_logo_dict.get("relative_url", None) is not None:
   theme_dict["theme_logo_url"] = theme_logo_dict.get("relative_url") + param
-theme_dict["template_css_url"] = css_path + pdf + ".css"
+theme_dict["template_css_url"] = css_path + pdf
 theme_dict["fallback_img_url"] = context.Base_getTemplateParameter("fallback_image") or blank
-theme_dict["theme_css_font_list"] = context.Base_getTemplateParameter(font) or []
+theme_dict["theme_css_font_list"] = []
+theme_font_list = context.Base_getTemplateParameter(font) or []
+for font in theme_font_list:
+  theme_dict["theme_css_font_list"].append(font + pdf)
 theme_dict["theme_css_url"] = context.Base_getTemplateParameter(css) or context.Base_getTemplateParameter(css) or blank
 return theme_dict

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_getRenderJSExtraPreviewParameterList.py

+"""
+================================================================================
+Return parameters to correctly display the RenderJS gadget
+================================================================================
+"""
+# parameters
+# ------------------------------------------------------------------------------
+# context_url:                   relative url of the context calling this script
+
+return [('editor', 'pdf'), ('portal_type', context.Letter_getPredecessor(context_url=context_url).getPortalType()), ('maximize', True)]

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_getRenderJSExtraPreviewParameterList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>context_url=None</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Letter_getRenderJSExtraPreviewParameterList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewPreview/content.xml

@@ -11,8 +11,7 @@
             <value>
               <list>
                 <string>default</string>
-                <string>description</string>
-                <string>gadget_url</string>
+                <string>renderjs_extra</string>
                 <string>title</string>
               </list>
             </value>
@@ -57,10 +56,6 @@
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -70,7 +65,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>gadget_url</string> </key>
+                    <key> <string>renderjs_extra</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -90,21 +85,19 @@
                     <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_iframe_gadget_field</string> </value>
+                    <value> <string>my_view_mode_text_content</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>gadget_url</string> </key>
-                    <value> <string></string> </value>
+                    <key> <string>renderjs_extra</string> </key>
+                    <value>
+                      <list/>
+                    </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>
@@ -124,7 +117,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: context.Letter_getPredecessor(context_url=context.getRelativeUrl()).getData().encode("base64")</string> </value>
+            <value> <string>python: context.Letter_getPredecessor(context_url=context.getRelativeUrl()).absolute_url()+\'/getData\'</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -137,7 +130,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: field.restrictedTraverse(\'pdf_js/pdfjs.gadget.html\').absolute_url() + "?auto_focus=1"</string> </value>
+            <value> <string>python: context.Letter_getRenderJSExtraPreviewParameterList(context_url=context.getRelativeUrl())</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createBookTableOfHistory.zpt

@@ -148,7 +148,7 @@ Creates the Book sections (version, authors, etc).
                 <td width="15%">001</td>
                 <td width="20%">20xx-xx-xx</td>
                 <td width="15%">All</td>
-                <td width="55%" style="text-align: left">Added example content, corrections.</td>
+                <td width="55%" style="text-align: right">Added example content, corrections.</td>
               </tr>
             </tal:block>
           </tbody>

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_finishPdfCreation.py

@@ -33,6 +33,7 @@ if doc_save:
       source_reference=''.join([doc_reference, '.pdf']),
       file=doc_pdf_file
     )
+    document.setContentType("application/pdf")
 
     # setting aggregate in case context is an event
     if context.portal_type != 'Web Page':

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

@@ -41,7 +41,7 @@ blank = ''
 
 # ------------------ HTML cleanup/converter methods ----------------------------
 def translateText(snip):
-  return book_localiser.erp5_ui.gettext(snip, lang=book_language).encode('utf-8').strip()
+  return book_localiser.erp5_ui.gettext(snip, lang=book_language).encode('UTF-8').strip()
 
 # -------------------------- Setup ---------------------------------------------
 book = context
@@ -84,6 +84,13 @@ book_version = html_quote(override_document_version) if override_document_versio
 book_description = html_quote(override_document_description) if override_document_description else book.getDescription()
 book_title = html_quote(override_document_title) if override_document_title else book.getTitle()
 
+# unicode
+if isinstance(book_content, unicode):
+  book_content = book_content.encode("UTF-8")
+
+# backcompat
+book_history_section_list = re.findall('<section*?>.+?</section>', book_content, re.S)
+
 # override for tests
 if override_batch_mode:
   book_modification_date = DateTime("1976-11-04")
@@ -122,7 +129,7 @@ book_table_list = []
 book_table_of_content = blank
 
 # backcompat
-book_content.replace("${WebPage_insertTableOfReferences}", blank)
+book_content = book_content.replace("${WebPage_insertTableOfReferences}", blank)
 
 # XXX: not done
 if book_include_history_table:
@@ -178,8 +185,15 @@ if book_include_reference_table:
     book_image_list=book_image_list,
     book_table_list=book_table_list
   )
-  if book_format == 'html' or book_format == 'mhtml':
-    book_content = book_references.encode('utf-8').strip() + book_content
+  #if book_format == 'html' or book_format == 'mhtml':
+  #  book_references = book_references.encode('UTF-8').strip()
+
+  # backcompat for manual history tables at the beginning of documents
+  # NOTE: assumes <section>s are not used elsewhere!
+  if len(book_history_section_list) > 0:
+    book_content = book_content.replace(book_history_section_list[-1], (book_history_section_list[-1] + book_references.encode('UTF-8').strip()))
+  else:
+    book_content = book_references.encode('UTF-8').strip() + book_content
 
 # table of content has to be created manually to run over everything that
 # should be indexed in the toc
@@ -188,7 +202,7 @@ if book_include_content_table:
   if book_format == "pdf":
     book_table_of_content = book.WebPage_createBookXslTableOfContent(
       book_toc_title=book_translated_toc_title
-    ).encode('utf-8').strip()
+    ).encode('UTF-8').strip()
   elif book_format == "html":
     book_content, book_table_of_content = book.WebPage_createTableOfContent(
       doc_content=book_content,
@@ -209,6 +223,7 @@ for image in re.findall('(<img.*?/>)', book_content):
 
 # ========================== Format: mhtml/html ================================
 if book_format == "html" or book_format == "mhtml":
+  context.REQUEST.RESPONSE.setHeader("Content-Type", "text/html; charset=utf-8")
   book_output = book.WebPage_createBook(
     book_theme=book_theme.get("theme"),
     book_title=book_title,
@@ -252,7 +267,6 @@ if book_format == "html" or book_format == "mhtml":
     )
 
   if book_format == "mhtml":
-    context.REQUEST.RESPONSE.setHeader("Content-Type", "text/html;")
     return book.Base_convertHtmlToSingleFile(book_output, allow_script=True)
 
 # ============================= Format: pdf ====================================
@@ -284,7 +298,7 @@ if book_format == "pdf":
     book_distribution_list=book_distribution_list,
   )
 
-  # book_references created above
+  # book_references created and added above
 
   book_content = book.WebPage_createBookContent(
     book_format=book_format,
@@ -338,10 +352,10 @@ if book_format == "pdf":
     before_toc_data_list.append(
       b64encode(book.Base_convertHtmlToSingleFile(book_history, allow_script=True))
     )
-  if book_include_reference_table:
-    after_toc_data_list.append(
-      b64encode(book.Base_convertHtmlToSingleFile(book_references, allow_script=True))
-    )
+  #if book_include_reference_table:
+  #  after_toc_data_list.append(
+  #    b64encode(book.Base_convertHtmlToSingleFile(book_references, allow_script=True))
+  #  )
   xsl_style_sheet_data = book_table_of_content
   embedded_html_data = book.Base_convertHtmlToSingleFile(book_content, allow_script=True)
   footer_embedded_html_data = book.Base_convertHtmlToSingleFile(book_foot, allow_script=True)

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebSite_getThemeBasedProperty.py

+"""
+================================================================================
+(Backcompat) Retrieve theme parameter for Website css
+================================================================================
+"""
+# XXX Keep until a new website template is available, the old erp5_ci_web needs
+# to keep working. This method fetches the parameters required. Remove once no
+# longer needed.
+
+# parameters   (* default)
+# ------------------------------------------------------------------------------
+# parameter:                   parameter to retriev
+# proxy:                       proxy role is required to access parameter
+# source_uid:                  uid to use when requiring parameter value
+
+page = context
+
+if parameter is not None:
+  page_theme = page.Base_getThemeDict(doc_format="html", css_path="template_css/web")
+  page_source = page.Base_getSourceDict(theme_logo_url=page_theme.get('theme_logo_url'))
+  if parameter == "Theme":
+    return page_theme.get("theme")
+  if parameter == "default_themes_css_url":
+    return page_theme.get("theme_css_url")
+  if parameter == "site_publisher":
+    return page_source.get('organisation_title') or ''
+
+return "XXX could not retrieve %s" % (parameter or " undefined parameter")

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebSite_getThemeBasedProperty.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>parameter=None, proxy=None, source_uid=None</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getThemeBasedProperty</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Backcompat</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

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

@@ -428,6 +428,15 @@
 .ci-book p + table td a {
   display: block;
 }
+/* opinionated align for content tables, overwrite in html if required */
+.ci-book a + table tbody tr td:first-child,
+.ci-book a + table tbody tr th:first-child {
+  text-align: center;
+}
+.ci-book a + table tbody tr td:not(:first-child),
+.ci-book a + table tbody tr th:not(:first-child) {
+  text-align: right;
+}
 
 /* table formatting */
 .ci-book table {
@@ -754,7 +763,9 @@ html .ci-book table td p {
   padding-top: 2mm;
   padding-bottom: 2mm;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul {
+.ci-book .ci-book-distribution-list tbody tr td ul,
+/* backcompat */
+.ci-book section tbody tr td ul {
   vertical-align: top;
   margin-left: 0;
   padding-left: 0;
@@ -763,14 +774,18 @@ html .ci-book table td p {
   padding-top: 5mm;
   padding-bottom: 5mm;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul li {
+.ci-book .ci-book-distribution-list tbody tr td ul li,
+/* backcompat */
+.ci-book section tbody tr td ul li {
   padding: 0;
   list-style: none;
   text-indent: 0;
   line-height: 18pt;
   text-align: left;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul li:before {
+.ci-book .ci-book-distribution-list tbody tr td ul li:before,
+/* backcompat */
+.ci-book section tbody tr td ul li:before {
   content: "■";
   padding-right: 8px;
   vertical-align: middle;
@@ -783,9 +798,20 @@ html .ci-book table td p {
   box-sizing: border-box;
   display: inline-block;
 }
+/* backcompat */
+.ci-book section tbody tr td ul li span,
+.ci-book section tbody tr td ul li div,
+.ci-book section tbody tr td ul li p {
+  display: inline-block;
+  width: 46%;
+}
 .ci-book .ci-book-distribution-list tbody tr td ul li,
 .ci-book .ci-book-distribution-list tbody tr td ul div,
-.ci-book .ci-book-distribution-list tbody tr td ul span {
+.ci-book .ci-book-distribution-list tbody tr td ul span,
+/* backcompat */
+.ci-book section tbody tr td ul li,
+.ci-book section tbody tr td ul div,
+.ci-book section tbody tr td ul span {
   vertical-align: middle;
 }
 /* Version List */

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

@@ -421,6 +421,15 @@
   padding: 0 2mm;
   text-align: center;
 }
+/* opinionated align for content tables, overwrite in html if required */
+.ci-book a + table tbody tr td:first-child,
+.ci-book a + table tbody tr th:first-child {
+  text-align: center;
+}
+.ci-book a + table tbody tr td:not(:first-child),
+.ci-book a + table tbody tr th:not(:first-child) {
+  text-align: right;
+}
 .ci-book table thead tr th p {
   color: black !important;
 }
@@ -758,23 +767,29 @@ html .ci-book table td p {
   padding-top: 2mm;
   padding-bottom: 2mm;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul {
+.ci-book .ci-book-distribution-list tbody tr td ul,
+/* backcompat */
+.ci-book section tbody tr td ul {
   vertical-align: top;
   margin-left: 0;
   padding-left: 0;
   display: inline-block;
-  width: 49%;
+  width: 47%;
   padding-top: 5mm;
   padding-bottom: 5mm;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul li {
+.ci-book .ci-book-distribution-list tbody tr td ul li,
+/* backcompat */
+.ci-book section tbody tr td ul li {
   padding: 0;
   list-style: none;
   text-indent: 0;
   line-height: 18pt;
   text-align: left;
 }
-.ci-book .ci-book-distribution-list tbody tr td ul li:before {
+.ci-book .ci-book-distribution-list tbody tr td ul li:before,
+/* backcompat */
+.ci-book section tbody tr td ul li:before {
   content: "■";
   padding-right: 8px;
   vertical-align: middle;
@@ -787,9 +802,20 @@ html .ci-book table td p {
   box-sizing: border-box;
   display: inline-block;
 }
+/* backcompat */
+.ci-book section tbody tr td ul li span,
+.ci-book section tbody tr td ul li div,
+.ci-book section tbody tr td ul li p {
+  display: inline-block;
+}
 .ci-book .ci-book-distribution-list tbody tr td ul li,
 .ci-book .ci-book-distribution-list tbody tr td ul div,
-.ci-book .ci-book-distribution-list tbody tr td ul span {
+.ci-book .ci-book-distribution-list tbody tr td ul span,
+/* backcompat */
+.ci-book section tbody tr td ul li,
+.ci-book section tbody tr td ul div,
+.ci-book section tbody tr td ul span,
+.ci-book section tbody tr td ul p {
   vertical-align: middle;
 }
 /* Version List */

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

@@ -11,7 +11,8 @@ html {
 
 /* === font size === */
 .ci-slideshow h1,
-.ci-slideshow h2 {
+.ci-slideshow h2,
+.ci-slideshow-handout .ci-slideshow-handout-header {
   font-size: 42px;
 }
 .ci-slideshow h1 ~ *:not(h2),
@@ -28,19 +29,25 @@ html {
 .ci-slideshow code {
   font-size: 20px;
 }
+.ci-slideshow-handout section section pre,
+.ci-slideshow-handout section section code {
+  font-size: 5mm;
+}
 .ci-slideshow-handout h1,
 .ci-slideshow-handout h2 {
   font-size: 24px;
 }
+.ci-slideshow .ci-slideshow-intro:before {
+  font-size: 28px;
+}
 .ci-slideshow-handout ul li,
 .ci-slideshow-handout ul li a,
 .ci-slideshow-handout div p {
   font-size: 24px;
 }
-.ci-slideshow .ci-slideshow-intro:before {
-  font-size: 28px;
-}
-.ci-slideshow-handout details {
+.ci-slideshow-handout details,
+.ci-slideshow-handout details ul li,
+.ci-slideshow-handout details ul li a {
   font-size: 20px;
 }
 .ci-slideshow-footer div,
@@ -195,10 +202,12 @@ section {
   width: auto;
 }
 /* code */
-html .ci-slideshow code {
+html .ci-slideshow code,
+html .ci-slideshow-handout code {
   background-color: #eee;
 }
-html .ci-slideshow pre {
+html .ci-slideshow pre,
+html .ci-slideshow-handout pre {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
@@ -222,6 +231,15 @@ html .ci-slideshow pre {
   display: inline-block;
   margin-top: 10%;
 }
+.ci-slideshow section ul ul,
+.ci-slideshow section ul ol,
+.ci-slideshow section ol ul,
+.ci-slideshow section ol ol {
+  padding: 0;
+  margin: 0;
+  margin-left: 4%;
+  margin-top: 1%;
+}
 .ci-slideshow section details ul,
 .ci-slideshow section details ol {
   display: block
@@ -490,7 +508,7 @@ html .ci-slideshow section img + img:last-child {
 .ci-slideshow-handout,
 .ci-slideshow-handout h1,
 .ci-slideshow-handout details {
-  color: #969696;
+  color: #000; /* JP can't read #969696; */
 }
 .ci-slideshow-handout section section ul,
 .ci-slideshow-handout section section ol {

bt5/erp5_corporate_identity/bt/template_registered_skin_selection_list

@@ -4,3 +4,9 @@ erp5_corporate_identity_leaflet | Leaflet
 erp5_corporate_identity_letter | Letter
 erp5_corporate_identity_release | Release
 erp5_corporate_identity_slide | Slide
+erp5_xhtml_style | Book
+erp5_xhtml_style | Leaflet
+erp5_xhtml_style | Letter
+erp5_xhtml_style | Release
+erp5_xhtml_style | Report
+erp5_xhtml_style | Slide
\ No newline at end of file

bt5/erp5_corporate_identity_test/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>ts23973667.4</string> </value>
+            <value> <string>ts28818112.51</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>bb2054b607ee9817f218e15e52789e29</string> </value>
+            <value> <string>3521a0724f55d83b02da77987d086c17</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>86901</int> </value>
+            <value> <int>108153</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/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>ts23973691.25</string> </value>
+            <value> <string>ts28818148.81</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>4c7c69526342683cdd01eb8c580e2dd1</string> </value>
+            <value> <string>a0ce9582f7c99820f6f14b3278be4166</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>161904</int> </value>
+            <value> <int>180285</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/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>ts23973710.89</string> </value>
+            <value> <string>ts28818185.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>090b6879eb49e5182c1101363a9018c8</string> </value>
+            <value> <string>2a62c7336be2e26f88121148d3753af5</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219940.57</string> </value>
+            <value> <string>ts28793492.71</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>e081a527a4a14481a854b204dfb9e69f</string> </value>
+            <value> <string>9d769a9126156dec2c1abaea8e831309</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219963.95</string> </value>
+            <value> <string>ts28793535.06</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>527ab92a98ac5c36c06c3b421e0e80cb</string> </value>
+            <value> <string>50533d58c881785e959dac0abf7edea7</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219998.56</string> </value>
+            <value> <string>ts28793562.83</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>7aeb14dddc4606daf750e8e5d5b364f9</string> </value>
+            <value> <string>51e0e212c20bd112c07bb99b7ad58d68</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219736.6</string> </value>
+            <value> <string>ts28793785.32</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>af71e66beb6943dd195610dd9a7d490f</string> </value>
+            <value> <string>962518be8d584e7d3eba04a641c4f415</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219753.19</string> </value>
+            <value> <string>ts28793805.71</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>41e3ace41fba409cd960a8033195f24b</string> </value>
+            <value> <string>6fb54895e66d500afbdadef7dff60b4d</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219777.67</string> </value>
+            <value> <string>ts28793846.92</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>7825bf344ed5c4c48b36fd0f010d868d</string> </value>
+            <value> <string>942b2344e8b6ac86aa6577c931866998</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts24219796.65</string> </value>
+            <value> <string>ts28793867.29</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>83f44808946bd7de4b403b4647d3d281</string> </value>
+            <value> <string>5990ddcff7022659a9872b95df5e47d4</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_005_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts24219848.05</string> </value>
+            <value> <string>ts28882626.08</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>1f4ddeeaea584acb7ded363458f4f156</string> </value>
+            <value> <string>79a3d8b38376c4e101137656d4a28dcd</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_006_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts24219871.79</string> </value>
+            <value> <string>ts28882547.32</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>9077e814ba6792079b84d2e21d1820bc</string> </value>
+            <value> <string>0999833df18e7433a0639d5c728b2ef4</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_release_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts24220068.43</string> </value>
+            <value> <string>ts28793940.04</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>b056cab4e707f24ad4538899929b6cbd</string> </value>
+            <value> <string>41bbc3e9d011d7a7cac9a84d2f4b14d6</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_release_input_002_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts24220090.65</string> </value>
+            <value> <string>ts28793968.68</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>fe10e65e99bbede9c04fa45fdf1a1165</string> </value>
+            <value> <string>c1ae66d5d3849d4e018cc093a8ecd079</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts23978445.11</string> </value>
+            <value> <string>ts28796891.17</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>3879ec0b0c1f58c41ccc3626e44c9b7a</string> </value>
+            <value> <string>c566e3c9adb8cf7e23e6de714d527efe</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts23978485.91</string> </value>
+            <value> <string>ts28796968.67</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>c46b41ab18fcd6902af839662acf0914</string> </value>
+            <value> <string>e7b357b0b0c08656696e52510120efd1</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts23978507.58</string> </value>
+            <value> <string>ts28797008.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>3085fbe4d726274917ee1bbf99c143c6</string> </value>
+            <value> <string>70a57c0723069395546e29825d9a5176</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>ts23978467.48</string> </value>
+            <value> <string>ts28796928.44</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>71bcd0c501c0c172233b85d61eddf9c8</string> </value>
+            <value> <string>274c1d5153a216b28c603cbe86e17942</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>377618</int> </value>
+            <value> <int>377473</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/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>ts23978532.86</string> </value>
+            <value> <string>ts28797054.07</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,11 +83,11 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>37cafef1d815c7dcc22ff218298f3757</string> </value>
+            <value> <string>8743d85788c04220a3c7ab55538d1467</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>application/unknown</string> </value>
+            <value> <string>application/pdf</string> </value>
         </item>
         <item>
             <key> <string>default_reference</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>381449</int> </value>
+            <value> <int>381275</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_book_input_page_10_002_en_bmp.xml

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

bt5/erp5_corporate_identity_test/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>44cd41a98bcace059855dbd43ca00082</string> </value>
+            <value> <string>231780bc3ee170b538da62e734177a40</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>aea99e06b679d35dc50b86fc964a66d3</string> </value>
+            <value> <string>4a92af525f76b275d4d73a8ead62d4f0</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/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>29a2c357be83b6e22ab7e3cc46d7d4fd</string> </value>
+            <value> <string>6f73555274e70c9a2f41ee6738d3e8e3</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_6_004_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>baa58e79cb47cac9acd69e92f9ff4194</string> </value>
+            <value> <string>b663eec882823e2c8df1c55e77bf9510</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_7_005_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>33dd061d418f33c442a25181e77f6165</string> </value>
+            <value> <string>125dda705d2c7c8942345bf6f5dd3eaa</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_input_001_en_html.html

+<section>
+<table>
+	<thead>
+		<tr>
+			<th colspan="4">签收单</th>
+		</tr>
+		<tr>
+			<th>姓名</th>
+			<th>职位<br />
+			公司</th>
+			<th>签名</th>
+			<th>日期</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td><strong>John Doe</strong></td>
+			<td>总经理, 讯空间大数据科技</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td><b>Jane Donaghue</b></td>
+			<td>销售副总裁</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		<tr>
+			<td><strong>Foo Man Chu</strong></td>
+			<td>CEO, Kontrabass</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+	</tbody>
+</table>
+</section>
+
+<section>
+<table>
+	<thead>
+		<tr>
+			<th>分发列表</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+			<ul>
+				<li>
+				<p>John Doe</p>
+				<p>CEO, 讯空间大数据科技</p>
+				</li>
+				<li>
+				<p>Jane Donaghue</p>
+				</li>
+			</ul>
+			<ul>
+				<li>
+				<p>Foo Man Chu</p>
+				<p>CEO, Kontrabass</p>
+				</li>
+			</ul>
+			</td>
+		</tr>
+	</tbody>
+</table>
+</section>
+
+<section>
+<table>
+	<thead>
+		<tr>
+			<th colspan="4">版本列表</th>
+		</tr>
+		<tr>
+			<th>版本</th>
+			<th>日期</th>
+			<th>页数</th>
+			<th>编辑描述</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>001</td>
+			<td>2018-5-15</td>
+			<td>全页</td>
+			<td>创建内容</td>
+		</tr>
+		<tr>
+			<td>002</td>
+			<td>2018-5-28</td>
+			<td>附录四</td>
+			<td>添加附录四</td>
+		</tr>
+		<tr>
+			<td>003</td>
+			<td>2018-6-1</td>
+			<td>全页</td>
+			<td>修改和完善</td>
+		</tr>
+	</tbody>
+</table>
+</section>
+${WebPage_insertTableOfReferences}
 <h1>Synthese</h1> 
 <p>This document is a high level overview measures taken by Foo for Bar project. </p> 
 <p>
@@ -98,7 +202,7 @@ which should not be touched.
   			<td>123</td>
   			<td>456</td>
   			<td>Some text</td>
-  			<td>More description</td>
+  			<td style="text-align: center">More description</td>
   		</tr>
   	</tbody>
   	<caption>Table description</caption>

bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Folder" module="OFS.Folder"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>50.0</float> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_corporate_identity_test</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/Zuite_setupTemplateTest.py

+"""
+================================================================================
+Tear down preferences set for template test
+================================================================================
+"""
+# parameters   (* default)
+# ------------------------------------------------------------------------------
+
+# inspired by erp5_user_tutorial_ui_test
+portal = context.getPortalObject()
+zuite_preference_id = "zuite_erp5_ui_test_preference"
+isTransitionPossible = portal.portal_workflow.isTransitionPossible
+
+preference = getattr(portal.portal_preferences, zuite_preference_id, None)
+if preference is None:
+  preference = context.portal_preferences.newContent(
+    portal_type="Preference",
+    id=zuite_preference_id
+  )
+  if isTransitionPossible(preference, "enable"):
+    preference.enable()
+
+preference.setPreferredTextEditor("text_area")
+preference.setPreferredSourceCodeEditor("text_area")
+portal.portal_caches.clearAllCache()
+return "Ok"

bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/xxxZuite_setSkipSave.py

+"""
+================================================================================
+Add this script to custom skin selection to update test comparison files
+================================================================================
+"""
+# parameters   (* default)
+# ------------------------------------------------------------------------------
+return True

bt5/erp5_corporate_identity_test/TestTemplateItem/portal_components/test.erp5.testCorporateIdentityTemplateList.py

 ##############################################################################
 #
-# Copyright (c) 2002-2017 Nexedi SA and Contributors. All Rights Reserved.
+# Copyright (c) 2002-2018 Nexedi SA and Contributors. All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
@@ -212,7 +212,7 @@ class TestCorporateIdentityTemplateList(ERP5TypeTestCase):
     if dump:
       expected_page.edit(text_content=html)
       self.tic()
-    self.assertEquals(html, expected_page.getData())
+    self.assertEquals(html.encode('UTF-8'), expected_page.getData())
 
   def runPdfTestPattern(self, id1, id2, id3, **kw):
     """