erp5_web_js_style: factorize the tal:define

7d2df410 · Romain Courteaud · df22f981 · 7d2df410 · 7d2df410
Commit 7d2df410 authored Jun 25, 2021 by Romain Courteaud
2 changed files
--- a/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/dialog_main.zpt
+++ b/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/dialog_main.zpt
@@ -11,6 +11,7 @@
      web_site python: here.getWebSiteValue();
      web_section python: here.getWebSectionValue();
      no_style_gadget_url python: web_section.getLayoutProperty('configuration_style_gadget_url', default='');
+      favicon_url python: web_section.getLayoutProperty('configuration_favicon_url', default='');
      global_definitions_macros here/global_definitions/macros;">
      <tal:block metal:use-macro="global_definitions_macros/header_definitions" />
 <html>
@@ -21,7 +22,7 @@
  <noscript>
    <link rel="stylesheet" href="jsstyle.css">
  </noscript>
-  <tal:block tal:define="favicon_url python: web_section.getLayoutProperty('configuration_favicon_url', default='')" tal:condition="favicon_url">
+  <tal:block tal:condition="favicon_url">
    <link rel="icon" tal:attributes="href favicon_url" />
  </tal:block>
  <!-- Prevent conflicts with Web Page reference provided by erp5_web_renderjs_ui -->

--- a/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/view_main.zpt
+++ b/bt5/erp5_web_js_style/SkinTemplateItem/portal_skins/erp5_web_js_style_ui/view_main.zpt
@@ -10,6 +10,7 @@
      web_site python: here.getWebSiteValue();
      web_section python: here.getWebSectionValue();
      no_style_gadget_url python: web_section.getLayoutProperty('configuration_style_gadget_url', default='');
+      favicon_url python: web_section.getLayoutProperty('configuration_favicon_url', default='');
      global_definitions_macros here/global_definitions/macros;">
      <tal:block metal:use-macro="global_definitions_macros/header_definitions" />
 <html>
@@ -20,7 +21,7 @@
  <noscript>
    <link rel="stylesheet" href="jsstyle.css">
  </noscript>
-  <tal:block tal:define="favicon_url python: web_section.getLayoutProperty('configuration_favicon_url', default='')" tal:condition="favicon_url">
+  <tal:block tal:condition="favicon_url">
    <link rel="icon" tal:attributes="href favicon_url" />
  </tal:block>
  <!-- Prevent conflicts with Web Page reference provided by erp5_web_renderjs_ui -->