erp5_web_js_style: no need to load any javascript if no gadget is configured

2c1debe9 · Romain Courteaud · a1699b92 · 2c1debe9 · 2c1debe9
Commit 2c1debe9 authored Jul 01, 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
@@ -21,18 +21,21 @@
  <base tal:attributes="href python: '%s/' % web_section.absolute_url()" />
  <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1" />
  <title tal:content="python: here.getTranslatedTitle() or web_section.getTranslatedTitle()"></title>
-  <noscript>
-    <link rel="stylesheet" tal-attributes="href no_style_css_url">
-  </noscript>
  <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 -->
-  <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/rsvp.js'"></script>
-  <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/renderjs.js'"></script>
-  <script tal:attributes="src python: relative_url_prefix + 'jsstyle.js'"></script>
+  <tal:block tal:condition="python: no_style_gadget_url == ''">
+    <link rel="stylesheet" tal:attributes="href no_style_css_url">
+  </tal:block>
  <tal:block tal:condition="python: no_style_gadget_url != ''">
-  <link rel="prerender" tal:attributes="href no_style_gadget_url">
+    <noscript>
+      <link rel="stylesheet" tal:attributes="href no_style_css_url">
+    </noscript>
+    <!-- Prevent conflicts with Web Page reference provided by erp5_web_renderjs_ui -->
+    <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/rsvp.js'"></script>
+    <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/renderjs.js'"></script>
+    <script tal:attributes="src python: relative_url_prefix + 'jsstyle.js'"></script>
+    <link rel="prerender" tal:attributes="href no_style_gadget_url">
  </tal:block>
  </head>
  <body tal:attributes="data-nostyle-gadget-url no_style_gadget_url;

--- 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
@@ -20,18 +20,21 @@
  <base tal:attributes="href python: '%s/' % web_section.absolute_url()" />
  <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1" />
  <title tal:content="python: here.getTranslatedTitle() or web_section.getTranslatedTitle()"></title>
-  <noscript>
-    <link rel="stylesheet" tal-attributes="href no_style_css_url">
-  </noscript>
  <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 -->
-  <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/rsvp.js'"></script>
-  <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/renderjs.js'"></script>
-  <script tal:attributes="src python: relative_url_prefix + 'jsstyle.js'"></script>
+  <tal:block tal:condition="python: no_style_gadget_url == ''">
+    <link rel="stylesheet" tal:attributes="href no_style_css_url">
+  </tal:block>
  <tal:block tal:condition="python: no_style_gadget_url != ''">
-  <link rel="prerender" tal:attributes="href no_style_gadget_url">
+    <noscript>
+      <link rel="stylesheet" tal:attributes="href no_style_css_url">
+    </noscript>
+    <!-- Prevent conflicts with Web Page reference provided by erp5_web_renderjs_ui -->
+    <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/rsvp.js'"></script>
+    <script tal:attributes="src python: relative_url_prefix + 'portal_skins/erp5_xhtml_style/renderjs.js'"></script>
+    <script tal:attributes="src python: relative_url_prefix + 'jsstyle.js'"></script>
+    <link rel="prerender" tal:attributes="href no_style_gadget_url">
  </tal:block>
  </head>
  <body tal:attributes="data-nostyle-gadget-url no_style_gadget_url;