configurator: make ConfiguratorTool_view valid HTML

- use html5 doctype - don't use i18n: tags where they are not processed - use class instead of id for elements that are repeated - remove Content-*-Type meta that are reported as invalid by nvu

configurator: make ConfiguratorTool_view valid HTML
- use html5 doctype - don't use i18n: tags where they are not processed - use class instead of id for elements that are repeated - remove Content-*-Type meta that are reported as invalid by nvu
e87a38fe · Jérome Perrin · 924823ec · e87a38fe · e87a38fe · e87a38fe
Commit e87a38fe authored Jul 20, 2020 by Jérome Perrin
4 changed files
--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/ConfiguratorTool_displayBusinessConfigurationList.zpt
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/ConfiguratorTool_displayBusinessConfigurationList.zpt
@@ -17,22 +17,20 @@
                                 bc_default_image python: bc.getResourceValue().getDefaultImageValue();
                                 bc_default_image_absolute_url python: bc.getResourceValue().getDefaultImageAbsoluteUrl();">
                <td>
-                  <div tal:attributes="id python: 'business_configuration_%s' % bc_id;
-                                       class string:box;">
+                  <div class="box" tal:attributes="id python: 'business_configuration_%s' % bc_id;">

-                    <span tal:attributes="id string:business-configuration-title" tal:content="bc_title" />
+                    <span class="business-configuration-title" tal:content="bc_title" />

                    <img tal:condition="bc_default_image"
-                         tal:attributes="src python: '%s?format=png' % bc_default_image_absolute_url" />
+                         tal:attributes="alt bc_title;
+                                         src python: '%s?format=png' % bc_default_image_absolute_url" />

-                    <span tal:condition="bc_description"
-                          tal:attributes="id string:span-business-configuration-description;
-                                          title bc_description;"
+                    <span class="span-business-configuration-description"
+                          tal:condition="bc_description"
+                          tal:attributes="title bc_description"
                          tal:content="bc_description" />

-                    <button id="dialog-submit-button"
-                            accesskey="V"
-                            tal:attributes="value python: bc.getRelativeUrl()"
+                    <button tal:attributes="value python: bc.getRelativeUrl()"
                            type="submit"
                            name="field_your_business_configuration">Configure</button>
                  </div>

--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/ConfiguratorTool_view/my_header.xml
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/ConfiguratorTool_view/my_header.xml
@@ -93,11 +93,9 @@
                    <key> <string>default</string> </key>
                    <value> <string encoding="cdata"><![CDATA[

-<h2 i18n:translate=""\n
-i18n:domain="ui"> Welcome to Configurator</h2>\n
+<h2> Welcome to Configurator</h2>\n
 \n
-<p i18n:translate=""\n
-i18n:domain="ui"> This tool will help you configure your fresh ERP5</p>
+<p> This tool will help you configure your fresh ERP5</p>

 ]]></string> </value>
                </item>

--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/wizard.css.css
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/wizard.css.css
@@ -22,7 +22,7 @@
  overflow: hidden; /* Clear floats */
 }

-.box span#business-configuration-title, span#business-configuration-title:hover {
+.box span.business-configuration-title, span.business-configuration-title:hover {
  display: block;
  background-color: transparent;
  width: 100%;
@@ -59,7 +59,7 @@
  border: 2px solid #d4e8ec;
 }

-.box span#span-business-configuration-description {
+.box span.span-business-configuration-description {
  background-color: transparent;
  font-size: 10px;
  float: left;

--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/wizard_template_erp5_xhtml_style.zpt
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/wizard_template_erp5_xhtml_style.zpt
@@ -10,7 +10,7 @@ IDEAS:
  <tal:block metal:define-macro="master">
    <tal:block>
      <tal:block metal:use-macro="here/global_definitions/macros/header_definitions" />
-      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <!DOCTYPE html>
      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
        <head>
          <base tal:attributes="href python: '%s/' % (url, )" />
@@ -21,8 +21,6 @@ IDEAS:
                tal:attributes="content python:', '.join(here.getProperty('subject_list', []) or [])" />
          <meta name="robots" content="index, follow" />
          <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-          <meta http-equiv="Content-Script-Type" content="text/javascript" />
-          <meta http-equiv="Content-Style-Type" content="text/css" />
          <title tal:define="title title | string:ERP5"
                 tal:content="python: '%s | %s' % (title, here.getPortalObject().title_or_id())"></title>
          <tal:block tal:replace="nothing">